QQuickState: replace some Java-style iterators with C++11 ranged-for loops

More succinct, less code generated, and Java-style iterators will be deprecated
at some point in the future.

Change-Id: I17b9369669e7c494083f09c26ec3e7f06917f13d
Reviewed-by: Lars Knoll <[email protected]>

2 files changed, 8 insertions, 26 deletions

diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp
index 473539ab2c..0d62960de9 100644
--- a/src/quick/util/qquickstate.cpp
+++ b/src/quick/util/qquickstate.cpp
@@ -372,10 +372,7 @@ bool QQuickState::containsPropertyInRevertList(QObject *target, const QString &n
     Q_D(const QQuickState);
 
     if (isStateActive()) {
-        QListIterator<QQuickSimpleAction> revertListIterator(d->revertList);
-
-        while (revertListIterator.hasNext()) {
-            const QQuickSimpleAction &simpleAction = revertListIterator.next();
+        for (const QQuickSimpleAction &simpleAction : d->revertList) {
             if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name)
                 return true;
         }
@@ -389,10 +386,7 @@ bool QQuickState::changeValueInRevertList(QObject *target, const QString &name,
     Q_D(QQuickState);
 
     if (isStateActive()) {
-        QMutableListIterator<QQuickSimpleAction> revertListIterator(d->revertList);
-
-        while (revertListIterator.hasNext()) {
-            QQuickSimpleAction &simpleAction = revertListIterator.next();
+        for (QQuickSimpleAction &simpleAction : d->revertList) {
             if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name) {
                     simpleAction.setValue(revertValue);
                     return true;
@@ -408,10 +402,7 @@ bool QQuickState::changeBindingInRevertList(QObject *target, const QString &name
     Q_D(QQuickState);
 
     if (isStateActive()) {
-        QMutableListIterator<QQuickSimpleAction> revertListIterator(d->revertList);
-
-        while (revertListIterator.hasNext()) {
-            QQuickSimpleAction &simpleAction = revertListIterator.next();
+        for (QQuickSimpleAction &simpleAction : d->revertList) {
             if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name) {
                 simpleAction.setBinding(binding);
                 return true;
@@ -485,9 +476,7 @@ void QQuickState::addEntriesToRevertList(const QList<QQuickStateAction> &actionL
         QList<QQuickSimpleAction> simpleActionList;
         simpleActionList.reserve(actionList.count());
 
-        QListIterator<QQuickStateAction> actionListIterator(actionList);
-        while(actionListIterator.hasNext()) {
-            const QQuickStateAction &action = actionListIterator.next();
+        for (const QQuickStateAction &action : actionList) {
             QQuickSimpleAction simpleAction(action);
             action.property.write(action.toValue);
             if (action.toBinding)
@@ -505,10 +494,7 @@ QVariant QQuickState::valueInRevertList(QObject *target, const QString &name) co
     Q_D(const QQuickState);
 
     if (isStateActive()) {
-        QListIterator<QQuickSimpleAction> revertListIterator(d->revertList);
-
-        while (revertListIterator.hasNext()) {
-            const QQuickSimpleAction &simpleAction = revertListIterator.next();
+        for (const QQuickSimpleAction &simpleAction : d->revertList) {
             if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name)
                 return simpleAction.value();
         }
@@ -522,10 +508,7 @@ QQmlAbstractBinding *QQuickState::bindingInRevertList(QObject *target, const QSt
     Q_D(const QQuickState);
 
     if (isStateActive()) {
-        QListIterator<QQuickSimpleAction> revertListIterator(d->revertList);
-
-        while (revertListIterator.hasNext()) {
-            const QQuickSimpleAction &simpleAction = revertListIterator.next();
+        for (const QQuickSimpleAction &simpleAction : d->revertList) {
             if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name)
                 return simpleAction.binding();
         }
diff --git a/src/quick/util/qquickstate_p_p.h b/src/quick/util/qquickstate_p_p.h
index 70d6f1d185..2fa5321165 100644
--- a/src/quick/util/qquickstate_p_p.h
+++ b/src/quick/util/qquickstate_p_p.h
@@ -232,9 +232,8 @@ public:
     }
     static void operations_clear(QQmlListProperty<QQuickStateOperation> *prop) {
         QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data);
-        QMutableListIterator<OperationGuard> listIterator(*list);
-        while(listIterator.hasNext())
-            listIterator.next()->setState(nullptr);
+        for (auto &e : *list)
+            e->setState(nullptr);
         list->clear();
     }
     static int operations_count(QQmlListProperty<QQuickStateOperation> *prop) {