X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.h;h=7028b29e9fb31cdc182b5396ba2e7fa7f9ba75b8;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hp=3123519b9dcb6e5778d1e78f39302674a1afbb9d;hpb=945745012eb57cefa1ef457daf48cfffa99f9ec2;p=pulseview.git

diff --git a/pv/view/signal.h b/pv/view/signal.h
index 3123519..7028b29 100644
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -21,7 +21,7 @@
 #ifndef PULSEVIEW_PV_VIEW_SIGNAL_H
 #define PULSEVIEW_PV_VIEW_SIGNAL_H
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <QComboBox>
 #include <QWidgetAction>
@@ -30,7 +30,9 @@
 
 #include "trace.h"
 
-struct sr_probe;
+namespace sigrok {
+	class Channel;
+}
 
 namespace pv {
 
@@ -38,10 +40,6 @@ namespace data {
 class SignalData;
 }
 
-namespace device {
-class DevInst;
-}
-
 namespace view {
 
 class Signal : public Trace
@@ -49,8 +47,7 @@ class Signal : public Trace
 	Q_OBJECT
 
 protected:
-	Signal(boost::shared_ptr<pv::device::DevInst> dev_inst,
-		const sr_probe *const probe);
+	Signal(std::shared_ptr<sigrok::Channel> channel);
 
 public:
 	/**
@@ -58,7 +55,7 @@ public:
 	 */
 	void set_name(QString name);
 
-	virtual boost::shared_ptr<pv::data::SignalData> data() const = 0;
+	virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
 
 	/**
 	 * Returns true if the trace is visible and enabled.
@@ -67,7 +64,7 @@ public:
 
 	void enable(bool enable = true);
 
-	const sr_probe* probe() const;
+	std::shared_ptr<sigrok::Channel> channel() const;
 
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
@@ -75,12 +72,11 @@ public:
 
 	void delete_pressed();
 
-private slots:
+private Q_SLOTS:
 	void on_disable();
 
 protected:
-	boost::shared_ptr<pv::device::DevInst> _dev_inst;
-	const sr_probe *const _probe;
+	std::shared_ptr<sigrok::Channel> _channel;
 
 	QComboBox *_name_widget;
 	bool _updating_name_widget;