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

diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp
index b1c256ac..e7d82fd7 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++)
-		if ((*i).end_sample() > start_sample &&
-			(*i).start_sample() < end_sample)
-			dest.push_back(*i);
+	for (const auto & annotation : annotations_)
+		if (annotation.end_sample() > start_sample &&
+			annotation.start_sample() <= end_sample)
+			dest.push_back(annotation);
 }
 
 void RowData::push_annotation(const Annotation &a)
 {
-	_annotations.push_back(a);
+	annotations_.push_back(a);
 }
 
 } // decode