X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=1e1d600d329d5a010a9231aa047ebfcbef885f9d;hb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff;hp=3499baf22205cb1d0338f8d77d8645ab7d437cbd;hpb=1138e9359d88d51ed610f2e0bd007c021b9e59bb;p=pulseview.git

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 3499baf..1e1d600 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -25,12 +25,12 @@
 
 #include "decoderstack.hpp"
 
+#include <pv/data/decode/annotation.hpp>
+#include <pv/data/decode/decoder.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
-#include <pv/data/decode/decoder.hpp>
-#include <pv/data/decode/annotation.hpp>
 #include <pv/session.hpp>
-#include <pv/view/logicsignal.hpp>
+#include <pv/views/trace/logicsignal.hpp>
 
 using std::lock_guard;
 using std::mutex;
@@ -40,8 +40,6 @@ using std::make_pair;
 using std::max;
 using std::min;
 using std::list;
-using std::map;
-using std::pair;
 using std::shared_ptr;
 using std::make_shared;
 using std::vector;
@@ -418,14 +416,14 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 		row_iter = d->rows_.find((*r).second);
 	else {
 		// Failing that, use the decoder as a key
-		row_iter = d->rows_.find(Row(decc));	
+		row_iter = d->rows_.find(Row(decc));
 	}
 
 	assert(row_iter != d->rows_.end());
 	if (row_iter == d->rows_.end()) {
 		qDebug() << "Unexpected annotation: decoder = " << decc <<
 			", format = " << a.format();
-		assert(0);
+		assert(false);
 		return;
 	}