1 files changed, 12 insertions, 9 deletions
diff --git a/src/controls/qquickstyle.cpp b/src/controls/qquickstyle.cpp
index 0ca6558e..320148c3 100644
--- a/src/controls/qquickstyle.cpp
+++ b/src/controls/qquickstyle.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 static QQuickStyle *attachedStyle(const QMetaObject *type, QObject *object, bool create = false)
 {
     if (!object)
-        return Q_NULLPTR;
+        return nullptr;
     int idx = -1;
     return qobject_cast<QQuickStyle *>(qmlAttachedPropertiesObject(&idx, object, type, create));
 }
@@ -55,7 +55,7 @@ static QQuickStyle *attachedStyle(const QMetaObject *type, QObject *object, bool
 static QQuickStyle *findParentStyle(const QMetaObject *type, QObject *parent)
 {
     if (!parent)
-        return Q_NULLPTR;
+        return nullptr;
 
     QQuickStyle *style = attachedStyle(type, parent);
     if (style)
@@ -97,7 +97,7 @@ static QQuickStyle *findParentStyle(const QMetaObject *type, QObject *parent)
         return style;
     }
 
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 static QList<QQuickStyle *> findChildStyles(const QMetaObject *type, QObject *object)
@@ -109,7 +109,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);
@@ -127,7 +128,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;
@@ -135,7 +137,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)
@@ -162,7 +165,7 @@ QQuickStyle::~QQuickStyle()
     if (item)
         QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Parent);
 
-    setParentStyle(Q_NULLPTR);
+    setParentStyle(nullptr);
 }
 
 QSharedPointer<QSettings> QQuickStyle::settings(const QString &group)
@@ -214,8 +217,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);
 }