X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.hpp;h=aab5119c4b94596071cc01a4c7ddeb4bf439c580;hb=9431e2d3d256f3602c3637847a8ec3ad3fdcd590;hp=edc27bee4dfa52947477980622e137863aaa14f2;hpb=86d4b8e3e52a422fe3a6956d6bbef27f1859717b;p=pulseview.git

diff --git a/pv/data/decode/annotation.hpp b/pv/data/decode/annotation.hpp
index edc27bee..aab5119c 100644
--- a/pv/data/decode/annotation.hpp
+++ b/pv/data/decode/annotation.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
-#define PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
+#ifndef PULSEVIEW_PV_DATA_DECODE_ANNOTATION_HPP
+#define PULSEVIEW_PV_DATA_DECODE_ANNOTATION_HPP
 
 #include <cstdint>
 #include <vector>
@@ -26,6 +26,8 @@
 #include <QColor>
 #include <QString>
 
+#include "pv/data/decode/row.hpp"
+
 using std::vector;
 
 struct srd_proto_data;
@@ -34,17 +36,13 @@ namespace pv {
 namespace data {
 namespace decode {
 
-class Row;
 class RowData;
 
 class Annotation
 {
-public:
-	typedef uint32_t Class;
-
 public:
 	Annotation(uint64_t start_sample, uint64_t end_sample,
-		const vector<QString>* texts, Class ann_class_id, const RowData *data);
+		const vector<QString>* texts, uint32_t ann_class_id, const RowData *data);
 	Annotation(Annotation&& a);
 	Annotation& operator=(Annotation&& a);
 
@@ -55,7 +53,7 @@ public:
 	uint64_t end_sample() const;
 	uint64_t length() const;
 
-	Class ann_class_id() const;
+	uint32_t ann_class_id() const;
 	const QString ann_class_name() const;
 	const QString ann_class_description() const;
 
@@ -74,7 +72,7 @@ private:
 	uint64_t start_sample_;
 	uint64_t end_sample_;
 	const vector<QString>* texts_;
-	Class ann_class_id_;
+	uint32_t ann_class_id_;
 	const RowData* data_;
 };
 
@@ -82,4 +80,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
+#endif // PULSEVIEW_PV_DATA_DECODE_ANNOTATION_HPP