Eradicate some easy Java-style iterators

Java-style iterators are scheduled for deprecation, or at the very
least banned from use in Qt code. There are two more complicated ones
left in the code for a later commit.

Change-Id: I0c843ddcf2c67793b56ab99a219d36a0694c7b09
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
 

3 files changed, 11 insertions, 22 deletions

diff --git a/src/designer/src/lib/shared/formwindowbase.cpp b/src/designer/src/lib/shared/formwindowbase.cpp
index 82d8cba60..ab3fcfbb0 100644
--- a/src/designer/src/lib/shared/formwindowbase.cpp
+++ b/src/designer/src/lib/shared/formwindowbase.cpp
@@ -223,12 +223,10 @@ void FormWindowBase::reloadProperties()
 {
     pixmapCache()->clear();
     iconCache()->clear();
-    QMapIterator<QDesignerPropertySheet *, QMap<int, bool> > itSheet(m_d->m_reloadableResources);
-    while (itSheet.hasNext()) {
-        QDesignerPropertySheet *sheet = itSheet.next().key();
-        QMapIterator<int, bool> itIndex(itSheet.value());
-        while (itIndex.hasNext()) {
-            const int index = itIndex.next().key();
+    for (auto it = m_d->m_reloadableResources.cbegin(), end = m_d->m_reloadableResources.cend(); it != end; ++it) {
+        QDesignerPropertySheet *sheet = it.key();
+        for (auto jt = it.value().begin(), end = it.value().end(); jt != end; ++jt) {
+            const int index = jt.key();
             const QVariant newValue = sheet->property(index);
             if (qobject_cast<QLabel *>(sheet->object()) && sheet->propertyName(index) == QStringLiteral("text")) {
                 const PropertySheetStringValue newString = qvariant_cast<PropertySheetStringValue>(newValue);
@@ -263,9 +261,7 @@ void FormWindowBase::reloadProperties()
             toolBox->setCurrentIndex(current);
         }
     }
-    QMapIterator<QDesignerPropertySheet *, QObject *> itSh(m_d->m_reloadablePropertySheets);
-    while (itSh.hasNext()) {
-        QObject *object = itSh.next().value();
+    for (QObject *object : qAsConst(m_d->m_reloadablePropertySheets)) {
         reloadIconResources(iconCache(), object);
     }
 }
diff --git a/src/qdoc/qmlvisitor.cpp b/src/qdoc/qmlvisitor.cpp
index e41a544f2..042ff67e3 100644
--- a/src/qdoc/qmlvisitor.cpp
+++ b/src/qdoc/qmlvisitor.cpp
@@ -80,12 +80,9 @@ QmlDocVisitor::~QmlDocVisitor()
  */
 QQmlJS::AST::SourceLocation QmlDocVisitor::precedingComment(quint32 offset) const
 {
-    QListIterator<QQmlJS::AST::SourceLocation> it(engine->comments());
-    it.toBack();
-
-    while (it.hasPrevious()) {
-
-        QQmlJS::AST::SourceLocation loc = it.previous();
+    const auto comments = engine->comments();
+    for (auto it = comments.rbegin(), end = comments.rend(); it != end; ++it) {
+        QQmlJS::AST::SourceLocation loc = *it;
 
         if (loc.begin() <= lastEndOffset) {
             // Return if we reach the end of the preceding structure.
diff --git a/src/shared/qtgradienteditor/qtgradientwidget.cpp b/src/shared/qtgradienteditor/qtgradientwidget.cpp
index 08e83419e..9db1b82e6 100644
--- a/src/shared/qtgradienteditor/qtgradientwidget.cpp
+++ b/src/shared/qtgradienteditor/qtgradientwidget.cpp
@@ -203,11 +203,9 @@ void QtGradientWidgetPrivate::setupDrag(QtGradientStop *stop, int x)
     int viewportX = qRound(toViewport(stop->position()));
     m_dragOffset = x - viewportX;
 
-    QList<QtGradientStop *> stops = m_stops;
+    const QList<QtGradientStop *> stops = m_stops;
     m_stops.clear();
-    QListIterator<QtGradientStop *> itStop(stops);
-    while (itStop.hasNext()) {
-        QtGradientStop *s = itStop.next();
+    for (QtGradientStop *s : stops) {
         if (m_model->isSelected(s) || s == stop) {
             m_dragStops[s] = s->position() - stop->position();
             m_stops.append(s);
@@ -215,9 +213,7 @@ void QtGradientWidgetPrivate::setupDrag(QtGradientStop *stop, int x)
             m_dragOriginal[s->position()] = s->color();
         }
     }
-    itStop.toFront();
-    while (itStop.hasNext()) {
-        QtGradientStop *s = itStop.next();
+    for (QtGradientStop *s : stops) {
         if (!m_model->isSelected(s))
             m_stops.append(s);
     }