Qml utils: replace 'foreach' with 'range for'

Change-Id: I7ac19305ffa1f7e8cd98419f4700aa34f53b24dc
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

3 files changed, 13 insertions, 7 deletions

diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp
index 5fc2444b7c..b9d312d41f 100644
--- a/src/qml/util/qqmladaptormodel.cpp
+++ b/src/qml/util/qqmladaptormodel.cpp
@@ -146,7 +146,7 @@ public:
         bool changed = roles.isEmpty() && !watchedRoles.isEmpty();
         if (!changed && !watchedRoles.isEmpty() && watchedRoleIds.isEmpty()) {
             QList<int> roleIds;
-            foreach (const QByteArray &r, watchedRoles) {
+            for (const QByteArray &r : watchedRoles) {
                 QHash<QByteArray, int>::const_iterator it = roleNames.find(r);
                 if (it != roleNames.end())
                     roleIds << it.value();
@@ -190,7 +190,7 @@ public:
         VDMModelDelegateDataType *dataType = const_cast<VDMModelDelegateDataType *>(this);
 
         dataType->watchedRoleIds.clear();
-        foreach (const QByteArray &oldRole, oldRoles)
+        for (const QByteArray &oldRole : oldRoles)
             dataType->watchedRoles.removeOne(oldRole);
         dataType->watchedRoles += newRoles;
     }
diff --git a/src/qml/util/qqmlchangeset.cpp b/src/qml/util/qqmlchangeset.cpp
index 088ac5e8c0..79e3332331 100644
--- a/src/qml/util/qqmlchangeset.cpp
+++ b/src/qml/util/qqmlchangeset.cpp
@@ -558,9 +558,15 @@ void QQmlChangeSet::change(QVector<Change> *changes)
 QDebug operator <<(QDebug debug, const QQmlChangeSet &set)
 {
     debug.nospace() << "QQmlChangeSet(";
-    foreach (const QQmlChangeSet::Change &remove, set.removes()) debug << remove;
-    foreach (const QQmlChangeSet::Change &insert, set.inserts()) debug << insert;
-    foreach (const QQmlChangeSet::Change &change, set.changes()) debug << change;
+    const QVector<QQmlChangeSet::Change> &removes = set.removes();
+    for (const QQmlChangeSet::Change &remove : removes)
+        debug << remove;
+    const QVector<QQmlChangeSet::Change> &inserts = set.inserts();
+    for (const QQmlChangeSet::Change &insert : inserts)
+        debug << insert;
+    const QVector<QQmlChangeSet::Change> &changes = set.changes();
+    for (const QQmlChangeSet::Change &change : changes)
+        debug << change;
     return debug.nospace() << ')';
 }
 
diff --git a/src/qml/util/qqmllistcompositor.cpp b/src/qml/util/qqmllistcompositor.cpp
index 4cfdf77b2a..05a4eaac39 100644
--- a/src/qml/util/qqmllistcompositor.cpp
+++ b/src/qml/util/qqmllistcompositor.cpp
@@ -964,7 +964,7 @@ void QQmlListCompositor::listItemsInserted(
             it.incrementIndexes(it->count);
             continue;
         }
-        foreach (const QQmlChangeSet::Change &insertion, insertions) {
+        for (const QQmlChangeSet::Change &insertion : insertions) {
             int offset = insertion.index - it->index;
             if ((offset > 0 && offset < it->count)
                     || (offset == 0 && it->prepend())
@@ -1301,7 +1301,7 @@ void QQmlListCompositor::listItemsChanged(
         } else if (!it->inGroup()) {
             continue;
         }
-        foreach (const QQmlChangeSet::Change &change, changes) {
+        for (const QQmlChangeSet::Change &change : changes) {
             const int offset = change.index - it->index;
             if (offset + change.count > 0 && offset < it->count) {
                 const int changeOffset = qMax(0, offset);