Controls: replace foreach with range-based for

Change-Id: I3ad37008e2cdcde62efecfb5e2ec2373026c4439
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

2 files changed, 9 insertions, 6 deletions

diff --git a/src/controls/qquickstyle.cpp b/src/controls/qquickstyle.cpp
index 58563954..6de4c7a2 100644
--- a/src/controls/qquickstyle.cpp
+++ b/src/controls/qquickstyle.cpp
@@ -104,7 +104,8 @@ static QList<QQuickStyle *> findChildStyles(const QMetaObject *type, QObject *ob
         if (QQuickWindow *window = qobject_cast<QQuickWindow *>(object)) {
             item = window->contentItem();
 
-            foreach (QObject *child, window->children()) {
+            const auto windowChildren = window->children();
+            for (QObject *child : windowChildren) {
                 QQuickWindow *childWindow = qobject_cast<QQuickWindow *>(child);
                 if (childWindow) {
                     QQuickStyle *style = attachedStyle(type, childWindow);
@@ -122,7 +123,8 @@ static QList<QQuickStyle *> findChildStyles(const QMetaObject *type, QObject *ob
     }
 
     if (item) {
-        foreach (QQuickItem *child, item->childItems()) {
+        const auto childItems = item->childItems();
+        for (QQuickItem *child : childItems) {
             QQuickStyle *style = attachedStyle(type, child);
             if (style)
                 children += style;
@@ -130,7 +132,8 @@ static QList<QQuickStyle *> findChildStyles(const QMetaObject *type, QObject *ob
                 children += findChildStyles(type, child);
         }
 
-        foreach (QObject *child, item->children()) {
+        const auto itemChildren = item->children();
+        for (QObject *child : itemChildren) {
             if (!qobject_cast<QQuickItem *>(child)) {
                 QQuickStyle *style = attachedStyle(type, child);
                 if (style)
@@ -207,8 +210,8 @@ void QQuickStyle::init()
     if (parentStyle)
         setParentStyle(parentStyle);
 
-    QList<QQuickStyle *> children = findChildStyles(metaObject(), parent());
-    foreach (QQuickStyle *child, children)
+    const QList<QQuickStyle *> children = findChildStyles(metaObject(), parent());
+    for (QQuickStyle *child : children)
         child->setParentStyle(this);
 }
 
diff --git a/src/controls/qquickstyleselector.cpp b/src/controls/qquickstyleselector.cpp
index 6779836c..3be5eb3d 100644
--- a/src/controls/qquickstyleselector.cpp
+++ b/src/controls/qquickstyleselector.cpp
@@ -113,7 +113,7 @@ static QString selectionHelper(const QString &path, const QString &fileName, con
     */
     Q_ASSERT(path.isEmpty() || path.endsWith(QLatin1Char('/')));
 
-    foreach (const QString &s, selectors) {
+    for (const QString &s : selectors) {
         QString prospectiveBase = path + s + QLatin1Char('/');
         QStringList remainingSelectors = selectors;
         remainingSelectors.removeAll(s);