X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.cpp;h=9402e707503e63772c9c18a39d5ea98415ed433e;hb=c4dd1e4ee295c4fc6bc3db0feaf826df4807cc91;hp=87da27cf5ce9d724e214f880f625a67eadc2c49a;hpb=1aef69f9792d8c032269afd6cfb2122b125aea4d;p=pulseview.git diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp index 87da27c..9402e70 100644 --- a/pv/data/decode/rowdata.cpp +++ b/pv/data/decode/rowdata.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "rowdata.h" +#include "rowdata.hpp" using std::vector; @@ -32,17 +32,16 @@ RowData::RowData() uint64_t RowData::get_max_sample() const { - if (_annotations.empty()) + if (annotations_.empty()) return 0; - return _annotations.back().end_sample(); + return annotations_.back().end_sample(); } void RowData::get_annotation_subset( vector &dest, uint64_t start_sample, uint64_t end_sample) const { - for (vector::const_iterator i = _annotations.begin(); - i != _annotations.end(); i++) + for (auto i = annotations_.cbegin(); i != annotations_.cend(); i++) if ((*i).end_sample() > start_sample && (*i).start_sample() <= end_sample) dest.push_back(*i); @@ -50,7 +49,7 @@ void RowData::get_annotation_subset( void RowData::push_annotation(const Annotation &a) { - _annotations.push_back(a); + annotations_.push_back(a); } } // decode