projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 fa0d488de35a3b7c55b64b3fed91efe38faccdc4..13380c2dfb9d6999bcb23e4fb040aed39a0cd127 100644
(file)
--- a/
pv/popups/probes.cpp
+++ b/
pv/popups/probes.cpp
@@
-20,11
+20,16
@@
#include <map>
#include <map>
+#include <boost/foreach.hpp>
+
+#include <QCheckBox>
#include <QFormLayout>
#include <QGridLayout>
#include <QFormLayout>
#include <QGridLayout>
+#include <QLabel>
#include "probes.h"
#include "probes.h"
+#include <pv/device/devinst.h>
#include <pv/prop/binding/deviceoptions.h>
#include <pv/sigsession.h>
#include <pv/view/signal.h>
#include <pv/prop/binding/deviceoptions.h>
#include <pv/sigsession.h>
#include <pv/view/signal.h>
@@
-52,7
+57,9
@@
Probes::Probes(SigSession &session, QWidget *parent) :
// Create the layout
setLayout(&_layout);
// 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
assert(sdi);
// Collect a set of signals