X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.cpp;h=b0517ae69ef9c6a13eefc4bad41efeea08b7d9a0;hb=f46e495ef1db0a4e522462ac18260f2151fa2b89;hp=6a30921e71deec541a7e8e929bcdf13e8ead1fa4;hpb=06e810f29b6e9e3fe8ba8aba5d3823375da9bbb2;p=pulseview.git diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp index 6a30921e..b0517ae6 100644 --- a/pv/data/decode/annotation.cpp +++ b/pv/data/decode/annotation.cpp @@ -22,9 +22,9 @@ extern "C" { #include } -#include "annotation.h" +#include -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++; } }