X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.h;h=34a307c919dca35ef7bccd35761ac4003cbf5169;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hp=99e470dba6951b26e26f30f8128b9804fe3b3bfb;hpb=767281c8881e4ed35607cbff4b270dfd55d0ef67;p=pulseview.git

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index 99e470d..34a307c 100644
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -18,12 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_LOGICSIGNAL_H
-#define PULSEVIEW_PV_LOGICSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
 
 #include "signal.h"
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 class QToolBar;
 
@@ -49,12 +49,15 @@ private:
 	static const QColor SignalColours[10];
 
 public:
-	LogicSignal(pv::SigSession &session, const sr_probe *const probe,
-		boost::shared_ptr<pv::data::Logic> data);
+	LogicSignal(std::shared_ptr<pv::device::DevInst> dev_inst,
+		const sr_channel *const probe,
+		std::shared_ptr<pv::data::Logic> data);
 
 	virtual ~LogicSignal();
 
-	boost::shared_ptr<pv::data::Logic> data() const;
+	std::shared_ptr<pv::data::SignalData> data() const;
+
+	std::shared_ptr<pv::data::Logic> logic_data() const;
 
 	/**
 	 * Paints the background layer of the signal with a QPainter
@@ -99,7 +102,7 @@ private slots:
 	void on_trigger_change();
 
 private:
-	boost::shared_ptr<pv::data::Logic> _data;
+	std::shared_ptr<pv::data::Logic> _data;
 
 	QToolBar *_trigger_bar;
 	QAction *_trigger_none;
@@ -113,4 +116,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H