X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fdeviceoptions.cpp;h=bdc0ab23ed48366353fc14c0b01daaa899d1fbdd;hp=353dfcfedfe941df0ded87663eae7bf28bc2913d;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hpb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79

diff --git a/pv/popups/deviceoptions.cpp b/pv/popups/deviceoptions.cpp
index 353dfcfe..bdc0ab23 100644
--- a/pv/popups/deviceoptions.cpp
+++ b/pv/popups/deviceoptions.cpp
@@ -25,26 +25,29 @@
 
 #include <pv/prop/property.h>
 
-using boost::shared_ptr;
+#include <libsigrok/libsigrok.hpp>
+
+using std::shared_ptr;
+
+using sigrok::Device;
 
 namespace pv {
 namespace popups {
 
-DeviceOptions::DeviceOptions(shared_ptr<device::DevInst> dev_inst,
-	QWidget *parent) :
+DeviceOptions::DeviceOptions(shared_ptr<Device> 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