projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not attempt to decode when required probes have not been specified
[pulseview.git]
/
pv
/
data
/
decode
/
annotation.cpp
diff --git
a/pv/data/decode/annotation.cpp
b/pv/data/decode/annotation.cpp
index 6a30921e71deec541a7e8e929bcdf13e8ead1fa4..b0517ae69ef9c6a13eefc4bad41efeea08b7d9a0 100644
(file)
--- a/
pv/data/decode/annotation.cpp
+++ b/
pv/data/decode/annotation.cpp
@@
-22,9
+22,9
@@
extern "C" {
#include <libsigrokdecode/libsigrokdecode.h>
}
#include <libsigrokdecode/libsigrokdecode.h>
}
-#include
"annotation.h"
+#include
<vector>
-using namespace std;
+#include "annotation.h"
namespace pv {
namespace data {
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) {
const char *const *annotations = (char**)pda->ann_text;
while(*annotations) {
- _annotations.push_back(QString(*annotations));
+ _annotations.push_back(QString
::fromUtf8
(*annotations));
annotations++;
}
}
annotations++;
}
}