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

diff --git a/pv/view/signal.h b/pv/view/signal.h
index a8642d2..7cf08b2 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,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,7 +49,8 @@ class Signal : public Trace
 	Q_OBJECT
 
 protected:
-	Signal(boost::shared_ptr<pv::DevInst> dev_inst, sr_probe *const probe);
+	Signal(std::shared_ptr<pv::device::DevInst> dev_inst,
+		const sr_channel *const channel);
 
 public:
 	/**
@@ -55,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.
@@ -64,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);
 
@@ -72,12 +75,14 @@ public:
 
 	void delete_pressed();
 
-private slots:
+	bool eventFilter(QObject *obj, QEvent *evt);
+
+private Q_SLOTS:
 	void on_disable();
 
 protected:
-	boost::shared_ptr<pv::DevInst> _dev_inst;
-	sr_probe *const _probe;
+	std::shared_ptr<pv::device::DevInst> _dev_inst;
+	const sr_channel *const _channel;
 
 	QComboBox *_name_widget;
 	bool _updating_name_widget;