]> sigrok.org Git - pulseview.git/blobdiff - pv/data/decode/annotation.cpp
Removed undefined Annotation::set_row and set_pd_index
[pulseview.git] / pv / data / decode / annotation.cpp
index 6a30921e71deec541a7e8e929bcdf13e8ead1fa4..b0517ae69ef9c6a13eefc4bad41efeea08b7d9a0 100644 (file)
@@ -22,9 +22,9 @@ extern "C" {
 #include <libsigrokdecode/libsigrokdecode.h>
 }
 
-#include "annotation.h"
+#include <vector>
 
-using namespace std;
+#include "annotation.h"
 
 namespace pv {
 namespace data {
@@ -43,7 +43,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++;
        }
 }