X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fpopups%2Fdeviceoptions.cpp;h=df9113679d2d5ddddd67c169778ea4820166cddc;hb=b5d20c6d003d853ad0828d15b365988519e73e88;hp=353dfcfedfe941df0ded87663eae7bf28bc2913d;hpb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79;p=pulseview.git
diff --git a/pv/popups/deviceoptions.cpp b/pv/popups/deviceoptions.cpp
index 353dfcf..df91136 100644
--- a/pv/popups/deviceoptions.cpp
+++ b/pv/popups/deviceoptions.cpp
@@ -14,37 +14,39 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
-#include "deviceoptions.h"
+#include "deviceoptions.hpp"
#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),
- _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()
+pv::binding::Device& DeviceOptions::binding()
{
- return _binding;
+ return binding_;
}
} // namespace popups