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 ac7c2b78f3c3eb0245e77e3d6dc248e47264e801..13055fc0e8cdee6c27e9d99b233064876f52e170 100644 (file)
--- a/pv/popups/deviceoptions.cpp
+++ b/pv/popups/deviceoptions.cpp
@@ -27,22 +27,27 @@
 
 #include <pv/prop/property.h>
 
 
 #include <pv/prop/property.h>
 

-using namespace boost;
-using namespace std;
+using boost::shared_ptr;

 
 namespace pv {
 namespace popups {
 
 
 namespace pv {
 namespace popups {
 

-DeviceOptions::DeviceOptions(sr_dev_inst *sdi, QWidget *parent) :
+DeviceOptions::DeviceOptions(shared_ptr<device::DevInst> dev_inst,
+       QWidget *parent) :

        Popup(parent),
        Popup(parent),

-       _sdi(sdi),
+       _dev_inst(dev_inst),

        _layout(this),
        _layout(this),

-       _binding(sdi)
+       _binding(dev_inst)

 {
        setLayout(&_layout);
 
        _layout.addWidget(_binding.get_property_form(this, true));
 }
 
 {
        setLayout(&_layout);
 
        _layout.addWidget(_binding.get_property_form(this, true));
 }
 

+pv::prop::binding::DeviceOptions& DeviceOptions::binding()
+{
+       return _binding;
+}
+

 } // namespace popups
 } // namespace pv
 } // namespace popups
 } // namespace pv