X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fdeviceoptions.cpp;h=bdc0ab23ed48366353fc14c0b01daaa899d1fbdd;hp=7e1be20d52d5ca4dd7b14835387f960590c75b82;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hpb=19adbc2c342b190161ec1223377a3619974b91f7 diff --git a/pv/popups/deviceoptions.cpp b/pv/popups/deviceoptions.cpp index 7e1be20d..bdc0ab23 100644 --- a/pv/popups/deviceoptions.cpp +++ b/pv/popups/deviceoptions.cpp @@ -20,32 +20,34 @@ #include "deviceoptions.h" -#include - #include #include #include -using boost::shared_ptr; +#include + +using std::shared_ptr; + +using sigrok::Device; namespace pv { namespace popups { -DeviceOptions::DeviceOptions(shared_ptr dev_inst, QWidget *parent) : +DeviceOptions::DeviceOptions(shared_ptr device, QWidget *parent) : Popup(parent), - _dev_inst(dev_inst), - _layout(this), - _binding(dev_inst) + device_(device), + layout_(this), + binding_(device) { - setLayout(&_layout); + setLayout(&layout_); - _layout.addWidget(_binding.get_property_form(this, true)); + layout_.addWidget(binding_.get_property_form(this, true)); } pv::prop::binding::DeviceOptions& DeviceOptions::binding() { - return _binding; + return binding_; } } // namespace popups