X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.cpp;h=83074e00d566c290ff0a3dafa2b8a8288671de00;hb=efdec55aec1a137460fa362a381ed1904182bfed;hp=b4ccd64d087cb882a4819618a4e30f0ca9ca1593;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;p=pulseview.git

diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp
index b4ccd64..83074e0 100644
--- a/pv/data/decode/rowdata.cpp
+++ b/pv/data/decode/rowdata.cpp
@@ -14,11 +14,10 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rowdata.h"
+#include "rowdata.hpp"
 
 using std::vector;
 
@@ -41,10 +40,10 @@ void RowData::get_annotation_subset(
 	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)