projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalBase: Make sure PDs are restarted when conv options change
[pulseview.git]
/
pv
/
data
/
decode
/
annotation.hpp
diff --git
a/pv/data/decode/annotation.hpp
b/pv/data/decode/annotation.hpp
index 7e62cea1f6d07cf6c78d9b26ee961599ed15fc19..42a291a2134a5d7eb439b6a2c7dda7ffcac1238d 100644
(file)
--- a/
pv/data/decode/annotation.hpp
+++ b/
pv/data/decode/annotation.hpp
@@
-20,10
+20,13
@@
#ifndef PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
#define PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
#ifndef PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
#define PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
-#include <stdint.h>
+#include <cstdint>
+#include <vector>
#include <QString>
#include <QString>
+using std::vector;
+
struct srd_proto_data;
namespace pv {
struct srd_proto_data;
namespace pv {
@@
-38,13
+41,13
@@
public:
uint64_t start_sample() const;
uint64_t end_sample() const;
int format() const;
uint64_t start_sample() const;
uint64_t end_sample() const;
int format() const;
- const
std::
vector<QString>& annotations() const;
+ const vector<QString>& annotations() const;
private:
uint64_t start_sample_;
uint64_t end_sample_;
int format_;
private:
uint64_t start_sample_;
uint64_t end_sample_;
int format_;
-
std::
vector<QString> annotations_;
+ vector<QString> annotations_;
};
} // namespace decode
};
} // namespace decode