X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.h;h=32d181772fce2ce2c48e571d50573608e7d6018f;hb=4871ed92f2d9e6e514223383ba16e6ad78c81161;hp=25b671f4217af8e71b0b5a8314849ae31bf79a9a;hpb=e183f4e328db8bb134652254ba9bf0707dc16c66;p=pulseview.git

diff --git a/pv/view/signal.h b/pv/view/signal.h
index 25b671f..32d1817 100644
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -30,16 +30,18 @@
 
 #include "trace.h"
 
-struct sr_probe;
+struct sr_channel;
 
 namespace pv {
 
-class DevInst;
-
 namespace data {
 class SignalData;
 }
 
+namespace device {
+class DevInst;
+}
+
 namespace view {
 
 class Signal : public Trace
@@ -47,8 +49,8 @@ class Signal : public Trace
 	Q_OBJECT
 
 protected:
-	Signal(boost::shared_ptr<pv::DevInst> dev_inst,
-		const sr_probe *const probe);
+	Signal(boost::shared_ptr<pv::device::DevInst> dev_inst,
+		const sr_channel *const probe);
 
 public:
 	/**
@@ -65,7 +67,7 @@ public:
 
 	void enable(bool enable = true);
 
-	const sr_probe* probe() const;
+	const sr_channel* probe() const;
 
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
@@ -77,8 +79,8 @@ private slots:
 	void on_disable();
 
 protected:
-	boost::shared_ptr<pv::DevInst> _dev_inst;
-	const sr_probe *const _probe;
+	boost::shared_ptr<pv::device::DevInst> _dev_inst;
+	const sr_channel *const _probe;
 
 	QComboBox *_name_widget;
 	bool _updating_name_widget;