X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.h;h=7cf08b2913503c1e3d89c5f0aa78d3226ff8b96e;hb=6ac6242b25cfbd4df14abe7580adc9d0f4cffe43;hp=bdbd27a35f1b9554cde55dd75b1a441f0b1619b8;hpb=9a0cd293620ae082a46ee5f2e53bf700301f9c87;p=pulseview.git

diff --git a/pv/view/signal.h b/pv/view/signal.h
index bdbd27a..7cf08b2 100644
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -21,23 +21,27 @@
 #ifndef PULSEVIEW_PV_VIEW_SIGNAL_H
 #define PULSEVIEW_PV_VIEW_SIGNAL_H
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <QComboBox>
 #include <QWidgetAction>
 
 #include <stdint.h>
 
-#include <libsigrok/libsigrok.h>
-
 #include "trace.h"
 
+struct sr_channel;
+
 namespace pv {
 
 namespace data {
 class SignalData;
 }
 
+namespace device {
+class DevInst;
+}
+
 namespace view {
 
 class Signal : public Trace
@@ -45,7 +49,8 @@ class Signal : public Trace
 	Q_OBJECT
 
 protected:
-	Signal(pv::SigSession &session, sr_probe *const probe);
+	Signal(std::shared_ptr<pv::device::DevInst> dev_inst,
+		const sr_channel *const channel);
 
 public:
 	/**
@@ -53,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.
@@ -62,7 +67,7 @@ public:
 
 	void enable(bool enable = true);
 
-	const sr_probe* probe() const;
+	const sr_channel* channel() const;
 
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
@@ -70,11 +75,14 @@ public:
 
 	void delete_pressed();
 
-private slots:
+	bool eventFilter(QObject *obj, QEvent *evt);
+
+private Q_SLOTS:
 	void on_disable();
 
 protected:
-	sr_probe *const _probe;
+	std::shared_ptr<pv::device::DevInst> _dev_inst;
+	const sr_channel *const _channel;
 
 	QComboBox *_name_widget;
 	bool _updating_name_widget;