X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.cpp;h=6287edce70f60fccd12ee13313cbeb0b6e7671d7;hb=7a01bd3654ed046216308fa64edfd79be7cd525f;hp=573fefaffa8c0829bc1440e362203d15dc5065b5;hpb=3f53457656c72dc870f603677843613b708b4ea1;p=pulseview.git

diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp
index 573fefa..6287edc 100644
--- a/pv/data/decode/annotation.cpp
+++ b/pv/data/decode/annotation.cpp
@@ -22,61 +22,51 @@ extern "C" {
 #include <libsigrokdecode/libsigrokdecode.h>
 }
 
+#include <cassert>
 #include <vector>
 
-#include "annotation.h"
+#include "annotation.hpp"
 
 namespace pv {
 namespace data {
 namespace decode {
 
 Annotation::Annotation(const srd_proto_data *const pdata) :
-	_start_sample(pdata->start_sample),
-	_end_sample(pdata->end_sample)
+	start_sample_(pdata->start_sample),
+	end_sample_(pdata->end_sample)
 {
 	assert(pdata);
 	const srd_proto_data_annotation *const pda =
 		(const srd_proto_data_annotation*)pdata->data;
 	assert(pda);
 
-	_format = pda->ann_format;
-	_row = 0;
+	format_ = pda->ann_class;
 
 	const char *const *annotations = (char**)pda->ann_text;
 	while(*annotations) {
-		_annotations.push_back(QString::fromUtf8(*annotations));
+		annotations_.push_back(QString::fromUtf8(*annotations));
 		annotations++;
 	}
 }
 
 uint64_t Annotation::start_sample() const
 {
-	return _start_sample;
+	return start_sample_;
 }
 
 uint64_t Annotation::end_sample() const
 {
-	return _end_sample;
+	return end_sample_;
 }
 
 int Annotation::format() const
 {
-	return _format;
-}
-
-int Annotation::row() const
-{
-	return _row;
+	return format_;
 }
 
 const std::vector<QString>& Annotation::annotations() const
 {
-	return _annotations;
-}
-
-void Annotation::set_row(int row)
-{
-	_row = row;
+	return annotations_;
 }
 
 } // namespace decode