Rename 'probe' to 'channel' (libsigrokdecode change).

[pulseview.git] / pv / popups / deviceoptions.cpp

diff --git a/pv/popups/deviceoptions.cpp b/pv/popups/deviceoptions.cpp
index c864865f4c854cea3ae96f8cec14286720c1cd35..13055fc0e8cdee6c27e9d99b233064876f52e170 100644 (file)
--- a/pv/popups/deviceoptions.cpp
+++ b/pv/popups/deviceoptions.cpp
@@ -27,26 +27,26 @@
 
 #include <pv/prop/property.h>
 
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
 
 namespace pv {
 namespace popups {
 
-DeviceOptions::DeviceOptions(sr_dev_inst *sdi, QWidget *parent) :
+DeviceOptions::DeviceOptions(shared_ptr<device::DevInst> dev_inst,
+       QWidget *parent) :
        Popup(parent),
-       _sdi(sdi),
+       _dev_inst(dev_inst),
        _layout(this),
-       _binding(sdi)
+       _binding(dev_inst)
 {
        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