Eradicate Java-style iterators and mark the module free of them

Java-style iterators are scheduled to be deprecated, or at the very
least banned from use in Qt's own implementation.

Change-Id: I6a1aeceb22dfa13c4ed7443296455b60abed7d67
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp
index d130cc1f8e..c106528f45 100644
--- a/src/quick/util/qquickstate.cpp
+++ b/src/quick/util/qquickstate.cpp
@@ -418,10 +418,8 @@ bool QQuickState::removeEntryFromRevertList(QObject *target, const QString &name
     Q_D(QQuickState);
 
     if (isStateActive()) {
-        QMutableListIterator<QQuickSimpleAction> revertListIterator(d->revertList);
-
-        while (revertListIterator.hasNext()) {
-            QQuickSimpleAction &simpleAction = revertListIterator.next();
+        for (auto it = d->revertList.begin(), end = d->revertList.end(); it != end; ++it) {
+            QQuickSimpleAction &simpleAction = *it;
             if (simpleAction.property().object() == target && simpleAction.property().name() == name) {
                 QQmlPropertyPrivate::removeBinding(simpleAction.property());
 
@@ -429,7 +427,7 @@ bool QQuickState::removeEntryFromRevertList(QObject *target, const QString &name
                 if (simpleAction.binding())
                     QQmlPropertyPrivate::setBinding(simpleAction.binding());
 
-                revertListIterator.remove();
+                d->revertList.erase(it);
                 return true;
             }
         }