X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fpopups%2Fdeviceoptions.cpp;h=3d069f799e1f40f9a6066148804c9e73f687109c;hb=d260d425863efa6d80a5a5f3d920373a6d159aef;hp=13055fc0e8cdee6c27e9d99b233064876f52e170;hpb=945745012eb57cefa1ef457daf48cfffa99f9ec2;p=pulseview.git diff --git a/pv/popups/deviceoptions.cpp b/pv/popups/deviceoptions.cpp index 13055fc0..3d069f79 100644 --- a/pv/popups/deviceoptions.cpp +++ b/pv/popups/deviceoptions.cpp @@ -20,24 +20,25 @@ #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), + _device(device), _layout(this), - _binding(dev_inst) + _binding(device) { setLayout(&_layout);