projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set PopupToolButton::_popup to NULL at construction
[pulseview.git]
/
pv
/
view
/
signal.h
diff --git
a/pv/view/signal.h
b/pv/view/signal.h
index a8642d244240f501fc39632318218d319f9047eb..3123519b9dcb6e5778d1e78f39302674a1afbb9d 100644
(file)
--- a/
pv/view/signal.h
+++ b/
pv/view/signal.h
@@
-34,12
+34,14
@@
struct sr_probe;
namespace pv {
namespace pv {
-class DevInst;
-
namespace data {
class SignalData;
}
namespace data {
class SignalData;
}
+namespace device {
+class DevInst;
+}
+
namespace view {
class Signal : public Trace
namespace view {
class Signal : public Trace
@@
-47,7
+49,8
@@
class Signal : public Trace
Q_OBJECT
protected:
Q_OBJECT
protected:
- Signal(boost::shared_ptr<pv::DevInst> dev_inst, sr_probe *const probe);
+ Signal(boost::shared_ptr<pv::device::DevInst> dev_inst,
+ const sr_probe *const probe);
public:
/**
public:
/**
@@
-76,8
+79,8
@@
private slots:
void on_disable();
protected:
void on_disable();
protected:
- boost::shared_ptr<pv::DevInst> _dev_inst;
- sr_probe *const _probe;
+ boost::shared_ptr<pv::
device::
DevInst> _dev_inst;
+
const
sr_probe *const _probe;
QComboBox *_name_widget;
bool _updating_name_widget;
QComboBox *_name_widget;
bool _updating_name_widget;