From f2ba71dd55736fc2ff1d817c19d5295d70b49c07 Mon Sep 17 00:00:00 2001
From: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
Date: Tue, 16 Aug 2016 17:19:29 +0300
Subject: QQuickPathView: port some loops to 'range for'

The 'range for' works with pointer increments and
the generated code is less, so we save some text size.

Change-Id: I66a2827c9a342d9453a52028d3ec76a91a19a606
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 src/quick/items/qquickpathview.cpp | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'src/quick/items/qquickpathview.cpp')

diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp
index 0d047bc882..ef6a45b014 100644
--- a/src/quick/items/qquickpathview.cpp
+++ b/src/quick/items/qquickpathview.cpp
@@ -244,10 +244,9 @@ void QQuickPathViewPrivate::clear()
         releaseItem(currentItem);
         currentItem = 0;
     }
-    for (int i=0; i<items.count(); i++){
-        QQuickItem *p = items.at(i);
+    for (QQuickItem *p : qAsConst(items))
         releaseItem(p);
-    }
+
     if (requestedIndex >= 0) {
         if (model)
             model->cancel(requestedIndex);
@@ -417,12 +416,9 @@ void QQuickPathViewPrivate::setHighlightPosition(qreal pos)
 void QQuickPathView::pathUpdated()
 {
     Q_D(QQuickPathView);
-    QList<QQuickItem*>::iterator it = d->items.begin();
-    while (it != d->items.end()) {
-        QQuickItem *item = *it;
+    for (QQuickItem *item : qAsConst(d->items)) {
         if (QQuickPathViewAttached *att = d->attached(item))
             att->m_percent = -1;
-        ++it;
     }
     refill();
 }
@@ -1521,8 +1517,7 @@ int QQuickPathView::indexAt(qreal x, qreal y) const
     if (!d->isValid())
         return -1;
 
-    for (int idx = 0; idx < d->items.count(); ++idx) {
-        QQuickItem *item = d->items.at(idx);
+    for (QQuickItem *item : d->items) {
         QPointF p = item->mapFromItem(this, QPointF(x, y));
         if (item->contains(p))
             return d->model->indexOf(item, 0);
@@ -1545,8 +1540,7 @@ QQuickItem *QQuickPathView::itemAt(qreal x, qreal y) const
     if (!d->isValid())
         return 0;
 
-    for (int idx = 0; idx < d->items.count(); ++idx) {
-        QQuickItem *item = d->items.at(idx);
+    for (QQuickItem *item : d->items) {
         QPointF p = item->mapFromItem(this, QPointF(x, y));
         if (item->contains(p))
             return item;
-- 
cgit v1.2.3