Moved DevInst into the pv::device namespace

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

diff --git a/pv/popups/probes.cpp b/pv/popups/probes.cpp
index 3fffec310fa79378c233a333aa27f52349accd66..13380c2dfb9d6999bcb23e4fb040aed39a0cd127 100644 (file)
--- a/pv/popups/probes.cpp
+++ b/pv/popups/probes.cpp
@@ -20,11 +20,16 @@
 
 #include <map>
 
+#include <boost/foreach.hpp>
+
+#include <QCheckBox>
 #include <QFormLayout>
 #include <QGridLayout>
+#include <QLabel>
 
 #include "probes.h"
 
+#include <pv/device/devinst.h>
 #include <pv/prop/binding/deviceoptions.h>
 #include <pv/sigsession.h>
 #include <pv/view/signal.h>
@@ -44,17 +49,17 @@ namespace popups {
 Probes::Probes(SigSession &session, QWidget *parent) :
        Popup(parent),
        _session(session),
-       _layout(this),
        _updating_probes(false),
-       _probes_bar(this),
-       _enable_all_probes(this),
-       _disable_all_probes(this),
+       _enable_all_probes(tr("Enable All"), this),
+       _disable_all_probes(tr("Disable All"), this),
        _check_box_mapper(this)
 {
        // Create the layout
        setLayout(&_layout);
 
-       sr_dev_inst *const sdi = _session.get_device();
+       shared_ptr<device::DevInst> dev_inst = _session.get_device();
+       assert(dev_inst);
+       const sr_dev_inst *const sdi = dev_inst->dev_inst();
        assert(sdi);
 
        // Collect a set of signals
@@ -111,13 +116,14 @@ Probes::Probes(SigSession &session, QWidget *parent) :
        connect(&_disable_all_probes, SIGNAL(clicked()),
                this, SLOT(disable_all_probes()));
 
-       _enable_all_probes.setText(tr("Enable All"));
-       _probes_bar.addWidget(&_enable_all_probes);
+       _enable_all_probes.setFlat(true);
+       _disable_all_probes.setFlat(true);
 
-       _disable_all_probes.setText(tr("Disable All"));
-       _probes_bar.addWidget(&_disable_all_probes);
+       _buttons_bar.addWidget(&_enable_all_probes);
+       _buttons_bar.addWidget(&_disable_all_probes);
+       _buttons_bar.addStretch(1);
 
-       _layout.addRow(&_probes_bar);
+       _layout.addRow(&_buttons_bar);
 
        // Connect the check-box signal mapper
        connect(&_check_box_mapper, SIGNAL(mapped(QWidget*)),