X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.cpp;h=9a165803fe2381fa7d0d2a40459d1199b26cd1bf;hb=f32905530347e1020d5ce7959123cf797c9a4829;hp=16895851a2c4401432a3e028ef658f94118b363e;hpb=fc3e73d0730e032c6c8d49dd80ff8a3620674ebc;p=pulseview.git diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp index 1689585..9a16580 100644 --- a/pv/data/decode/annotation.cpp +++ b/pv/data/decode/annotation.cpp @@ -25,48 +25,48 @@ extern "C" { #include #include -#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_class; + format_ = pda->ann_class; const char *const *annotations = (char**)pda->ann_text; - while(*annotations) { - _annotations.push_back(QString::fromUtf8(*annotations)); + while (*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; + return format_; } const std::vector& Annotation::annotations() const { - return _annotations; + return annotations_; } } // namespace decode