Fix #1542 by providing std::hash<QString> implementation as needed

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

diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp
index 0012acd4523ecfc7339a5a30809ab78de2ddef57..e763302ec41acb26548cc4b71be5a41f39c93505 100644 (file)
--- a/pv/data/decode/rowdata.hpp
+++ b/pv/data/decode/rowdata.hpp
@@ -20,13 +20,29 @@
 #ifndef PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
 #define PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
 
+#include <unordered_map>
 #include <vector>
 
+#include <QtGlobal>
+#include <QHash>
+#include <QString>
+
 #include <libsigrokdecode/libsigrokdecode.h>
 
 #include <pv/data/decode/annotation.hpp>
 
-using std::vector;
+using std::deque;
+using std::unordered_map;
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+namespace std {
+  template<> struct hash<QString> {
+    std::size_t operator()(const QString& s) const noexcept {
+      return (size_t) qHash(s);
+    }
+  };
+}
+#endif
 
 namespace pv {
 namespace data {
@@ -39,7 +55,8 @@ class RowData
 public:
        RowData(Row* row);
 
-public:
+       const Row* row() const;
+
        uint64_t get_max_sample() const;
 
        uint64_t get_annotation_count() const;
@@ -49,15 +66,18 @@ public:
         * Note: The annotations are unsorted and only annotations that fully
         * fit into the sample range are considered.
         */
-       void get_annotation_subset(
-               vector<pv::data::decode::Annotation> &dest,
+       void get_annotation_subset(deque<const pv::data::decode::Annotation*> &dest,
                uint64_t start_sample, uint64_t end_sample) const;
 
-       void emplace_annotation(srd_proto_data *pdata);
+       const deque<Annotation>& annotations() const;
+
+       const Annotation* emplace_annotation(srd_proto_data *pdata);
 
 private:
-       vector<Annotation> annotations_;
-       const Row* row_;
+       deque<Annotation> annotations_;
+       unordered_map<QString, vector<QString> > ann_texts_;  // unordered_map since pointers must not change
+       Row* row_;
+       uint64_t prev_ann_start_sample_;
 };
 
 }  // namespace decode