Use range-based for loops more often.

[pulseview.git] / pv / data / decode / rowdata.cpp

diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp
index b4ccd64d087cb882a4819618a4e30f0ca9ca1593..e7d82fd72c5a77713980f1f7e6c69b714a4c59cb 100644 (file)
--- 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
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 

-#include "rowdata.h"
+#include "rowdata.hpp"

 
 using std::vector;
 
 
 using std::vector;
 


@@ -41,10 +41,10 @@ void RowData::get_annotation_subset(
        vector<pv::data::decode::Annotation> &dest,
        uint64_t start_sample, uint64_t end_sample) const
 {
        vector<pv::data::decode::Annotation> &dest,
        uint64_t start_sample, uint64_t end_sample) const
 {

-       for (auto i = annotations_.cbegin(); i != annotations_.cend(); 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)
 }
 
 void RowData::push_annotation(const Annotation &a)