X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.hpp;h=cfa5e5e982e54746f79cac80c15062af7cd3f66b;hb=761f8302350c52f2cf357f49e1084e7101c70497;hp=a107e0efeed7426584cbded2169ca639ffc47288;hpb=f228f00ed2c11ce4c9c36e0b758132a075e251da;p=pulseview.git

diff --git a/pv/data/decode/annotation.hpp b/pv/data/decode/annotation.hpp
index a107e0ef..cfa5e5e9 100644
--- a/pv/data/decode/annotation.hpp
+++ b/pv/data/decode/annotation.hpp
@@ -33,24 +33,36 @@ namespace pv {
 namespace data {
 namespace decode {
 
+class Row;
+
 class Annotation
 {
 public:
 	typedef uint32_t Class;
 
 public:
-	Annotation(const srd_proto_data *const pdata);
+	Annotation(const srd_proto_data *const pdata, const Row *row);
+	Annotation(Annotation&& a);
+	Annotation& operator=(Annotation&& a);
+	~Annotation();
 
 	uint64_t start_sample() const;
 	uint64_t end_sample() const;
-	Class ann_class() const;
-	const vector<QString>& annotations() const;
+
+	Class ann_class_id() const;
+	const QString ann_class_name() const;
+
+	const vector<QString>* annotations() const;
+	const Row* row() const;
+
+	bool operator<(const Annotation &other) const;
 
 private:
 	uint64_t start_sample_;
 	uint64_t end_sample_;
-	Class ann_class_;
-	vector<QString> annotations_;
+	vector<QString>* annotations_;
+	const Row *row_;
+	Class ann_class_id_;
 };
 
 } // namespace decode