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

diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp
index 6a30921..f403b6e 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 {
@@ -43,7 +44,7 @@ Annotation::Annotation(const srd_proto_data *const pdata) :
 
 	const char *const *annotations = (char**)pda->ann_text;
 	while(*annotations) {
-		_annotations.push_back(QString(*annotations));
+		_annotations.push_back(QString::fromUtf8(*annotations));
 		annotations++;
 	}
 }