X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=48b400d1081d843bff33859ae0b5c6570adecd3c;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hp=61f79a8c8351e8574ceabf779324f8d733195a96;hpb=e183f4e328db8bb134652254ba9bf0707dc16c66;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 61f79a8..48b400d 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -32,9 +32,9 @@
 #include "signal.h"
 #include "view.h"
 
-#include <pv/devinst.h>
+#include <pv/device/devinst.h>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 namespace pv {
 namespace view {
@@ -56,8 +56,8 @@ const char *const ProbeNames[] = {
 	"SCL"
 };
 
-Signal::Signal(shared_ptr<pv::DevInst> dev_inst,
-	const sr_probe *const probe) :
+Signal::Signal(shared_ptr<pv::device::DevInst> dev_inst,
+	const sr_channel *const probe) :
 	Trace(probe->name),
 	_dev_inst(dev_inst),
 	_probe(probe),
@@ -86,7 +86,7 @@ void Signal::enable(bool enable)
 	visibility_changed();
 }
 
-const sr_probe* Signal::probe() const
+const sr_channel* Signal::probe() const
 {
 	return _probe;
 }