X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.cpp;h=9402e707503e63772c9c18a39d5ea98415ed433e;hb=69e33a1b71599bbe35176ef7a77b58793a7d6ca2;hp=b1c256acb414878b574995f01f878b7a1298d591;hpb=21ea5e700fdde6a6eb2c0969649fcb1d8ea6d283;p=pulseview.git

diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp
index b1c256ac..9402e707 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,25 +32,24 @@ 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<pv::data::decode::Annotation> &dest,
 	uint64_t start_sample, uint64_t end_sample) const
 {
-	for (vector<Annotation>::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)
+			(*i).start_sample() <= end_sample)
 			dest.push_back(*i);
 }
 
 void RowData::push_annotation(const Annotation &a)
 {
-	_annotations.push_back(a);
+	annotations_.push_back(a);
 }
 
 } // decode