X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.cpp;h=16895851a2c4401432a3e028ef658f94118b363e;hb=fc3e73d0730e032c6c8d49dd80ff8a3620674ebc;hp=6a30921e71deec541a7e8e929bcdf13e8ead1fa4;hpb=06e810f29b6e9e3fe8ba8aba5d3823375da9bbb2;p=pulseview.git

diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp
index 6a30921..1689585 100644
--- a/pv/data/decode/annotation.cpp
+++ b/pv/data/decode/annotation.cpp
@@ -22,9 +22,10 @@ extern "C" {
 #include <libsigrokdecode/libsigrokdecode.h>
 }
 
-#include "annotation.h"
+#include <cassert>
+#include <vector>
 
-using namespace std;
+#include "annotation.h"
 
 namespace pv {
 namespace data {
@@ -39,11 +40,11 @@ Annotation::Annotation(const srd_proto_data *const pdata) :
 		(const srd_proto_data_annotation*)pdata->data;
 	assert(pda);
 
-	_format = pda->ann_format;
+	_format = pda->ann_class;
 
 	const char *const *annotations = (char**)pda->ann_text;
 	while(*annotations) {
-		_annotations.push_back(QString(*annotations));
+		_annotations.push_back(QString::fromUtf8(*annotations));
 		annotations++;
 	}
 }