Minor decode refactorizations

[pulseview.git] / pv / data / decode / annotation.hpp

diff --git a/pv/data/decode/annotation.hpp b/pv/data/decode/annotation.hpp
index 8b91c4f47e066605e307ed0301fbd1871d59436d..1bb9ad34c046a215321d6e276b3ddea6bb453106 100644 (file)
--- a/pv/data/decode/annotation.hpp
+++ b/pv/data/decode/annotation.hpp
@@ -42,11 +42,14 @@ public:
 
 public:
        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 vector<QString>* annotations() const;
        const Row* row() const;
 
        bool operator<(const Annotation &other) const;
@@ -54,9 +57,9 @@ public:
 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