X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fdeviceoptions.cpp;h=3d069f799e1f40f9a6066148804c9e73f687109c;hp=c864865f4c854cea3ae96f8cec14286720c1cd35;hb=d260d425863efa6d80a5a5f3d920373a6d159aef;hpb=51d4a9ab96a6bf64a1fcd1700e7e174498d4c118 diff --git a/pv/popups/deviceoptions.cpp b/pv/popups/deviceoptions.cpp index c864865f..3d069f79 100644 --- a/pv/popups/deviceoptions.cpp +++ b/pv/popups/deviceoptions.cpp @@ -20,33 +20,34 @@ #include "deviceoptions.h" -#include - #include #include #include -using namespace boost; -using namespace std; +#include + +using std::shared_ptr; + +using sigrok::Device; namespace pv { namespace popups { -DeviceOptions::DeviceOptions(sr_dev_inst *sdi, QWidget *parent) : +DeviceOptions::DeviceOptions(shared_ptr device, QWidget *parent) : Popup(parent), - _sdi(sdi), + _device(device), _layout(this), - _binding(sdi) + _binding(device) { setLayout(&_layout); - _layout.addWidget(_binding.get_property_form(this)); + _layout.addWidget(_binding.get_property_form(this, true)); } -void DeviceOptions::closeEvent(QCloseEvent*) +pv::prop::binding::DeviceOptions& DeviceOptions::binding() { - _binding.commit(); + return _binding; } } // namespace popups