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

diff --git a/pv/view/signal.h b/pv/view/signal.h
index 32d1817..b3b591b 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,18 +30,18 @@
 
 #include "trace.h"
 
-struct sr_channel;
+namespace sigrok {
+	class Channel;
+}
 
 namespace pv {
 
+class SigSession;
+
 namespace data {
 class SignalData;
 }
 
-namespace device {
-class DevInst;
-}
-
 namespace view {
 
 class Signal : public Trace
@@ -49,8 +49,8 @@ class Signal : public Trace
 	Q_OBJECT
 
 protected:
-	Signal(boost::shared_ptr<pv::device::DevInst> dev_inst,
-		const sr_channel *const probe);
+	Signal(pv::SigSession &session,
+		std::shared_ptr<sigrok::Channel> channel);
 
 public:
 	/**
@@ -58,7 +58,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 +67,7 @@ public:
 
 	void enable(bool enable = true);
 
-	const sr_channel* probe() const;
+	std::shared_ptr<sigrok::Channel> channel() const;
 
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
@@ -75,15 +75,15 @@ public:
 
 	void delete_pressed();
 
-private slots:
+private Q_SLOTS:
 	void on_disable();
 
 protected:
-	boost::shared_ptr<pv::device::DevInst> _dev_inst;
-	const sr_channel *const _probe;
+	pv::SigSession &session_;
+	std::shared_ptr<sigrok::Channel> channel_;
 
-	QComboBox *_name_widget;
-	bool _updating_name_widget;
+	QComboBox *name_widget_;
+	bool updating_name_widget_;
 };
 
 } // namespace view