Rename QQuickStyleAttached to QQuickAttachedObject

This is becoming a generic recursive attached object type that can be
used for palettes too, which are planned to be used for the upcoming
image-based style.

Change-Id: I693d307ea16e73540ec9519b2ab18a314ff44272
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

7 files changed, 118 insertions, 118 deletions

diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index 94dfa80d..08d88ec7 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -426,7 +426,7 @@ static QQuickMaterialStyle::Theme effectiveTheme(QQuickMaterialStyle::Theme them
     return theme;
 }
 
-QQuickMaterialStyle::QQuickMaterialStyle(QObject *parent) : QQuickStyleAttached(parent),
+QQuickMaterialStyle::QQuickMaterialStyle(QObject *parent) : QQuickAttachedObject(parent),
     m_explicitTheme(false),
     m_explicitPrimary(false),
     m_explicitAccent(false),
@@ -498,8 +498,8 @@ void QQuickMaterialStyle::inheritTheme(Theme theme)
 
 void QQuickMaterialStyle::propagateTheme()
 {
-    const auto styles = childStyles();
-    for (QQuickStyleAttached *child : styles) {
+    const auto styles = attachedChildren();
+    for (QQuickAttachedObject *child : styles) {
         QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child);
         if (material)
             material->inheritTheme(m_theme);
@@ -512,7 +512,7 @@ void QQuickMaterialStyle::resetTheme()
         return;
 
     m_explicitTheme = false;
-    QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(parentStyle());
+    QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(attachedParent());
     inheritTheme(material ? material->theme() : globalTheme);
 }
 
@@ -553,8 +553,8 @@ void QQuickMaterialStyle::inheritPrimary(uint primary, bool custom)
 
 void QQuickMaterialStyle::propagatePrimary()
 {
-    const auto styles = childStyles();
-    for (QQuickStyleAttached *child : styles) {
+    const auto styles = attachedChildren();
+    for (QQuickAttachedObject *child : styles) {
         QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child);
         if (material)
             material->inheritPrimary(m_primary, m_customPrimary);
@@ -568,7 +568,7 @@ void QQuickMaterialStyle::resetPrimary()
 
     m_customPrimary = false;
     m_explicitPrimary = false;
-    QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(parentStyle());
+    QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(attachedParent());
     if (material)
         inheritPrimary(material->m_primary, material->m_customPrimary);
     else
@@ -612,8 +612,8 @@ void QQuickMaterialStyle::inheritAccent(uint accent, bool custom)
 
 void QQuickMaterialStyle::propagateAccent()
 {
-    const auto styles = childStyles();
-    for (QQuickStyleAttached *child : styles) {
+    const auto styles = attachedChildren();
+    for (QQuickAttachedObject *child : styles) {
         QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child);
         if (material)
             material->inheritAccent(m_accent, m_customAccent);
@@ -627,7 +627,7 @@ void QQuickMaterialStyle::resetAccent()
 
     m_customAccent = false;
     m_explicitAccent = false;
-    QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(parentStyle());
+    QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(attachedParent());
     if (material)
         inheritAccent(material->m_accent, material->m_customAccent);
     else
@@ -677,8 +677,8 @@ void QQuickMaterialStyle::inheritForeground(uint foreground, bool custom, bool h
 
 void QQuickMaterialStyle::propagateForeground()
 {
-    const auto styles = childStyles();
-    for (QQuickStyleAttached *child : styles) {
+    const auto styles = attachedChildren();
+    for (QQuickAttachedObject *child : styles) {
         QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child);
         if (material)
             material->inheritForeground(m_foreground, m_customForeground, m_hasForeground);
@@ -693,7 +693,7 @@ void QQuickMaterialStyle::resetForeground()
     m_hasForeground = false;
     m_customForeground = false;
     m_explicitForeground = false;
-    QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(parentStyle());
+    QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(attachedParent());
     inheritForeground(material ? material->m_foreground : globalForeground, true, material ? material->m_hasForeground : false);
 }
 
@@ -736,8 +736,8 @@ void QQuickMaterialStyle::inheritBackground(uint background, bool custom, bool h
 
 void QQuickMaterialStyle::propagateBackground()
 {
-    const auto styles = childStyles();
-    for (QQuickStyleAttached *child : styles) {
+    const auto styles = attachedChildren();
+    for (QQuickAttachedObject *child : styles) {
         QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child);
         if (material)
             material->inheritBackground(m_background, m_customBackground, m_hasBackground);
@@ -752,7 +752,7 @@ void QQuickMaterialStyle::resetBackground()
     m_hasBackground = false;
     m_customBackground = false;
     m_explicitBackground = false;
-    QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(parentStyle());
+    QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(attachedParent());
     inheritBackground(material ? material->m_background : globalBackground, true, material ? material->m_hasBackground : false);
 }
 
@@ -1135,7 +1135,7 @@ QColor QQuickMaterialStyle::shade(const QColor &color, Shade shade) const
     }
 }
 
-void QQuickMaterialStyle::parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent)
+void QQuickMaterialStyle::attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent)
 {
     Q_UNUSED(oldParent);
     QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(newParent);
@@ -1246,7 +1246,7 @@ void QQuickMaterialStyle::init()
         globalsInitialized = true;
     }
 
-    QQuickStyleAttached::init(); // TODO: lazy init?
+    QQuickAttachedObject::init(); // TODO: lazy init?
 }
 
 bool QQuickMaterialStyle::variantToRgba(const QVariant &var, const char *name, QRgb *rgba, bool *custom) const
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h
index bb494697..2374eefb 100644
--- a/src/imports/controls/material/qquickmaterialstyle_p.h
+++ b/src/imports/controls/material/qquickmaterialstyle_p.h
@@ -49,11 +49,11 @@
 //
 
 #include <QtGui/qcolor.h>
-#include <QtQuickControls2/private/qquickstyleattached_p.h>
+#include <QtQuickControls2/private/qquickattachedobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickMaterialStyle : public QQuickStyleAttached
+class QQuickMaterialStyle : public QQuickAttachedObject
 {
     Q_OBJECT
     Q_PROPERTY(Theme theme READ theme WRITE setTheme RESET resetTheme NOTIFY themeChanged FINAL)
@@ -236,7 +236,7 @@ Q_SIGNALS:
     void paletteChanged();
 
 protected:
-    void parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent) override;
+    void attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent) override;
 
 private:
     void init();
diff --git a/src/imports/controls/universal/qquickuniversalstyle.cpp b/src/imports/controls/universal/qquickuniversalstyle.cpp
index 8afb4e29..157d5ddb 100644
--- a/src/imports/controls/universal/qquickuniversalstyle.cpp
+++ b/src/imports/controls/universal/qquickuniversalstyle.cpp
@@ -151,7 +151,7 @@ static QRgb GlobalBackground = qquickuniversal_light_color(QQuickUniversalStyle:
 static bool HasGlobalForeground = false;
 static bool HasGlobalBackground = false;
 
-QQuickUniversalStyle::QQuickUniversalStyle(QObject *parent) : QQuickStyleAttached(parent),
+QQuickUniversalStyle::QQuickUniversalStyle(QObject *parent) : QQuickAttachedObject(parent),
     m_explicitTheme(false), m_explicitAccent(false), m_explicitForeground(false), m_explicitBackground(false),
     m_hasForeground(HasGlobalForeground), m_hasBackground(HasGlobalBackground), m_theme(GlobalTheme),
     m_accent(GlobalAccent), m_foreground(GlobalForeground), m_background(GlobalBackground)
@@ -199,8 +199,8 @@ void QQuickUniversalStyle::inheritTheme(Theme theme)
 
 void QQuickUniversalStyle::propagateTheme()
 {
-    const auto styles = childStyles();
-    for (QQuickStyleAttached *child : styles) {
+    const auto styles = attachedChildren();
+    for (QQuickAttachedObject *child : styles) {
         QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(child);
         if (universal)
             universal->inheritTheme(m_theme);
@@ -213,7 +213,7 @@ void QQuickUniversalStyle::resetTheme()
         return;
 
     m_explicitTheme = false;
-    QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(parentStyle());
+    QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(attachedParent());
     inheritTheme(universal ? universal->theme() : GlobalTheme);
 }
 
@@ -249,8 +249,8 @@ void QQuickUniversalStyle::inheritAccent(QRgb accent)
 
 void QQuickUniversalStyle::propagateAccent()
 {
-    const auto styles = childStyles();
-    for (QQuickStyleAttached *child : styles) {
+    const auto styles = attachedChildren();
+    for (QQuickAttachedObject *child : styles) {
         QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(child);
         if (universal)
             universal->inheritAccent(m_accent);
@@ -263,7 +263,7 @@ void QQuickUniversalStyle::resetAccent()
         return;
 
     m_explicitAccent = false;
-    QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(parentStyle());
+    QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(attachedParent());
     inheritAccent(universal ? universal->m_accent : GlobalAccent);
 }
 
@@ -303,8 +303,8 @@ void QQuickUniversalStyle::inheritForeground(QRgb foreground, bool has)
 
 void QQuickUniversalStyle::propagateForeground()
 {
-    const auto styles = childStyles();
-    for (QQuickStyleAttached *child : styles) {
+    const auto styles = attachedChildren();
+    for (QQuickAttachedObject *child : styles) {
         QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(child);
         if (universal)
             universal->inheritForeground(m_foreground, m_hasForeground);
@@ -318,7 +318,7 @@ void QQuickUniversalStyle::resetForeground()
 
     m_hasForeground = false;
     m_explicitForeground = false;
-    QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(parentStyle());
+    QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(attachedParent());
     inheritForeground(universal ? universal->m_foreground : GlobalForeground, universal ? universal->m_hasForeground : false);
 }
 
@@ -358,8 +358,8 @@ void QQuickUniversalStyle::inheritBackground(QRgb background, bool has)
 
 void QQuickUniversalStyle::propagateBackground()
 {
-    const auto styles = childStyles();
-    for (QQuickStyleAttached *child : styles) {
+    const auto styles = attachedChildren();
+    for (QQuickAttachedObject *child : styles) {
         QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(child);
         if (universal)
             universal->inheritBackground(m_background, m_hasBackground);
@@ -373,7 +373,7 @@ void QQuickUniversalStyle::resetBackground()
 
     m_hasBackground = false;
     m_explicitBackground = false;
-    QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(parentStyle());
+    QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(attachedParent());
     inheritBackground(universal ? universal->m_background : GlobalBackground, universal ? universal->m_hasBackground : false);
 }
 
@@ -507,7 +507,7 @@ QColor QQuickUniversalStyle::systemColor(SystemColor role) const
     return QColor::fromRgba(m_theme == QQuickUniversalStyle::Dark ? qquickuniversal_dark_color(role) : qquickuniversal_light_color(role));
 }
 
-void QQuickUniversalStyle::parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent)
+void QQuickUniversalStyle::attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent)
 {
     Q_UNUSED(oldParent);
     QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(newParent);
@@ -595,7 +595,7 @@ void QQuickUniversalStyle::init()
         globalsInitialized = true;
     }
 
-    QQuickStyleAttached::init(); // TODO: lazy init?
+    QQuickAttachedObject::init(); // TODO: lazy init?
 }
 
 bool QQuickUniversalStyle::variantToRgba(const QVariant &var, const char *name, QRgb *rgba) const
diff --git a/src/imports/controls/universal/qquickuniversalstyle_p.h b/src/imports/controls/universal/qquickuniversalstyle_p.h
index 508e8297..196048ef 100644
--- a/src/imports/controls/universal/qquickuniversalstyle_p.h
+++ b/src/imports/controls/universal/qquickuniversalstyle_p.h
@@ -49,13 +49,13 @@
 //
 
 #include <QtGui/qcolor.h>
-#include <QtQuickControls2/private/qquickstyleattached_p.h>
+#include <QtQuickControls2/private/qquickattachedobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickUniversalStylePrivate;
 
-class QQuickUniversalStyle : public QQuickStyleAttached
+class QQuickUniversalStyle : public QQuickAttachedObject
 {
     Q_OBJECT
     Q_PROPERTY(Theme theme READ theme WRITE setTheme RESET resetTheme NOTIFY themeChanged FINAL)
@@ -208,7 +208,7 @@ Q_SIGNALS:
     void paletteChanged();
 
 protected:
-    void parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent) override;
+    void attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent) override;
 
 private:
     void init();
diff --git a/src/quickcontrols2/qquickstyleattached.cpp b/src/quickcontrols2/qquickattachedobject.cpp
index 8b87a6d0..c21ebea5 100644
--- a/src/quickcontrols2/qquickstyleattached.cpp
+++ b/src/quickcontrols2/qquickattachedobject.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickstyleattached_p.h"
+#include "qquickattachedobject_p.h"
 
 #include <QtQuick/qquickwindow.h>
 #include <QtQuick/private/qquickitem_p.h>
@@ -42,41 +42,41 @@
 
 QT_BEGIN_NAMESPACE
 
-static QQuickStyleAttached *attachedStyle(const QMetaObject *type, QObject *object, bool create = false)
+static QQuickAttachedObject *attachedObject(const QMetaObject *type, QObject *object, bool create = false)
 {
     if (!object)
         return nullptr;
     int idx = -1;
-    return qobject_cast<QQuickStyleAttached *>(qmlAttachedPropertiesObject(&idx, object, type, create));
+    return qobject_cast<QQuickAttachedObject *>(qmlAttachedPropertiesObject(&idx, object, type, create));
 }
 
-static QQuickStyleAttached *findParentStyle(const QMetaObject *type, QObject *object)
+static QQuickAttachedObject *findAttachedParent(const QMetaObject *type, QObject *object)
 {
     QQuickItem *item = qobject_cast<QQuickItem *>(object);
     if (item) {
         // lookup parent items and popups
         QQuickItem *parent = item->parentItem();
         while (parent) {
-            QQuickStyleAttached *style = attachedStyle(type, parent);
-            if (style)
-                return style;
+            QQuickAttachedObject *attached = attachedObject(type, parent);
+            if (attached)
+                return attached;
 
             QQuickPopup *popup = qobject_cast<QQuickPopup *>(parent->parent());
             if (popup)
-                return attachedStyle(type, popup);
+                return attachedObject(type, popup);
 
             parent = parent->parentItem();
         }
 
         // fallback to item's window
-        QQuickStyleAttached *style = attachedStyle(type, item->window());
-        if (style)
-            return style;
+        QQuickAttachedObject *attached = attachedObject(type, item->window());
+        if (attached)
+            return attached;
     } else {
         // lookup popup's window
         QQuickPopup *popup = qobject_cast<QQuickPopup *>(object);
         if (popup)
-            return attachedStyle(type, popup->popupItem()->window());
+            return attachedObject(type, popup->popupItem()->window());
     }
 
     // lookup parent window
@@ -84,9 +84,9 @@ static QQuickStyleAttached *findParentStyle(const QMetaObject *type, QObject *ob
     if (window) {
         QQuickWindow *parentWindow = qobject_cast<QQuickWindow *>(window->parent());
         if (parentWindow) {
-            QQuickStyleAttached *style = attachedStyle(type, window);
-            if (style)
-                return style;
+            QQuickAttachedObject *attached = attachedObject(type, window);
+            if (attached)
+                return attached;
         }
     }
 
@@ -95,21 +95,21 @@ static QQuickStyleAttached *findParentStyle(const QMetaObject *type, QObject *ob
         QQmlEngine *engine = qmlEngine(object);
         if (engine) {
             QByteArray name = QByteArray("_q_") + type->className();
-            QQuickStyleAttached *style = engine->property(name).value<QQuickStyleAttached*>();
-            if (!style) {
-                style = attachedStyle(type, engine, true);
-                engine->setProperty(name, QVariant::fromValue(style));
+            QQuickAttachedObject *attached = engine->property(name).value<QQuickAttachedObject *>();
+            if (!attached) {
+                attached = attachedObject(type, engine, true);
+                engine->setProperty(name, QVariant::fromValue(attached));
             }
-            return style;
+            return attached;
         }
     }
 
     return nullptr;
 }
 
-static QList<QQuickStyleAttached *> findChildStyles(const QMetaObject *type, QObject *object)
+static QList<QQuickAttachedObject *> findAttachedChildren(const QMetaObject *type, QObject *object)
 {
-    QList<QQuickStyleAttached *> children;
+    QList<QQuickAttachedObject *> children;
 
     QQuickItem *item = qobject_cast<QQuickItem *>(object);
     if (!item) {
@@ -121,9 +121,9 @@ static QList<QQuickStyleAttached *> findChildStyles(const QMetaObject *type, QOb
             for (QObject *child : windowChildren) {
                 QQuickWindow *childWindow = qobject_cast<QQuickWindow *>(child);
                 if (childWindow) {
-                    QQuickStyleAttached *style = attachedStyle(type, childWindow);
-                    if (style)
-                        children += style;
+                    QQuickAttachedObject *attached = attachedObject(type, childWindow);
+                    if (attached)
+                        children += attached;
                 }
             }
         }
@@ -132,18 +132,18 @@ static QList<QQuickStyleAttached *> findChildStyles(const QMetaObject *type, QOb
     if (item) {
         const auto childItems = item->childItems();
         for (QQuickItem *child : childItems) {
-            QQuickStyleAttached *style = attachedStyle(type, child);
-            if (style)
-                children += style;
+            QQuickAttachedObject *attached = attachedObject(type, child);
+            if (attached)
+                children += attached;
             else
-                children += findChildStyles(type, child);
+                children += findAttachedChildren(type, child);
         }
     }
 
     return children;
 }
 
-QQuickStyleAttached::QQuickStyleAttached(QObject *parent) : QObject(parent)
+QQuickAttachedObject::QQuickAttachedObject(QObject *parent) : QObject(parent)
 {
     QQuickItem *item = qobject_cast<QQuickItem *>(parent);
     if (!item) {
@@ -153,77 +153,77 @@ QQuickStyleAttached::QQuickStyleAttached(QObject *parent) : QObject(parent)
     }
 
     if (item) {
-        connect(item, &QQuickItem::windowChanged, this, &QQuickStyleAttached::itemWindowChanged);
+        connect(item, &QQuickItem::windowChanged, this, &QQuickAttachedObject::itemWindowChanged);
         QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Parent);
     }
 }
 
-QQuickStyleAttached::~QQuickStyleAttached()
+QQuickAttachedObject::~QQuickAttachedObject()
 {
     QQuickItem *item = qobject_cast<QQuickItem *>(parent());
     if (item) {
-        disconnect(item, &QQuickItem::windowChanged, this, &QQuickStyleAttached::itemWindowChanged);
+        disconnect(item, &QQuickItem::windowChanged, this, &QQuickAttachedObject::itemWindowChanged);
         QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Parent);
     }
 
-    setParentStyle(nullptr);
+    setAttachedParent(nullptr);
 }
 
-QList<QQuickStyleAttached *> QQuickStyleAttached::childStyles() const
+QList<QQuickAttachedObject *> QQuickAttachedObject::attachedChildren() const
 {
-    return m_childStyles;
+    return m_attachedChildren;
 }
 
-QQuickStyleAttached *QQuickStyleAttached::parentStyle() const
+QQuickAttachedObject *QQuickAttachedObject::attachedParent() const
 {
-    return m_parentStyle;
+    return m_attachedParent;
 }
 
-void QQuickStyleAttached::setParentStyle(QQuickStyleAttached *style)
+void QQuickAttachedObject::setAttachedParent(QQuickAttachedObject *parent)
 {
-    if (m_parentStyle != style) {
-        QQuickStyleAttached *oldParent = m_parentStyle;
-        if (m_parentStyle)
-            m_parentStyle->m_childStyles.removeOne(this);
-        m_parentStyle = style;
-        if (style)
-            style->m_childStyles.append(this);
-        parentStyleChange(style, oldParent);
+    if (m_attachedParent != parent) {
+        QQuickAttachedObject *oldParent = m_attachedParent;
+        if (m_attachedParent)
+            m_attachedParent->m_attachedChildren.removeOne(this);
+        m_attachedParent = parent;
+        if (parent)
+            parent->m_attachedChildren.append(this);
+        attachedParentChange(parent, oldParent);
     }
 }
 
-void QQuickStyleAttached::init()
+void QQuickAttachedObject::init()
 {
-    QQuickStyleAttached *parentStyle = findParentStyle(metaObject(), parent());
-    if (parentStyle)
-        setParentStyle(parentStyle);
+    QQuickAttachedObject *attachedParent = findAttachedParent(metaObject(), parent());
+    if (attachedParent)
+        setAttachedParent(attachedParent);
 
-    const QList<QQuickStyleAttached *> children = findChildStyles(metaObject(), parent());
-    for (QQuickStyleAttached *child : children)
-        child->setParentStyle(this);
+    const QList<QQuickAttachedObject *> attachedChildren = findAttachedChildren(metaObject(), parent());
+    for (QQuickAttachedObject *child : attachedChildren)
+        child->setAttachedParent(this);
 }
 
-void QQuickStyleAttached::parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent)
+void QQuickAttachedObject::attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent)
 {
     Q_UNUSED(newParent);
     Q_UNUSED(oldParent);
 }
 
-void QQuickStyleAttached::itemWindowChanged(QQuickWindow *window)
+void QQuickAttachedObject::itemWindowChanged(QQuickWindow *window)
 {
-    QQuickStyleAttached *parentStyle = nullptr;
+    QQuickAttachedObject *attachedParent = nullptr;
     QQuickItem *item = qobject_cast<QQuickItem *>(sender());
     if (item)
-        parentStyle = findParentStyle(metaObject(), item);
-    if (!parentStyle)
-        parentStyle = attachedStyle(metaObject(), window);
-    setParentStyle(parentStyle);
+        attachedParent = findAttachedParent(metaObject(), item);
+    if (!attachedParent)
+        attachedParent = attachedObject(metaObject(), window);
+    setAttachedParent(attachedParent);
 }
 
-void QQuickStyleAttached::itemParentChanged(QQuickItem *item, QQuickItem *parent)
+void QQuickAttachedObject::itemParentChanged(QQuickItem *item, QQuickItem *parent)
 {
     Q_UNUSED(parent);
-    setParentStyle(findParentStyle(metaObject(), item));
+    setAttachedParent(findAttachedParent(metaObject(), item));
 }
 
 QT_END_NAMESPACE
diff --git a/src/quickcontrols2/qquickstyleattached_p.h b/src/quickcontrols2/qquickattachedobject_p.h
index 2f29d37b..7fc0ce13 100644
--- a/src/quickcontrols2/qquickstyleattached_p.h
+++ b/src/quickcontrols2/qquickattachedobject_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKSTYLEATTACHED_P_H
-#define QQUICKSTYLEATTACHED_P_H
+#ifndef QQUICKATTACHEDOBJECT_P_H
+#define QQUICKATTACHEDOBJECT_P_H
 
 //
 //  W A R N I N G
@@ -59,32 +59,32 @@ QT_BEGIN_NAMESPACE
 
 class QQuickWindow;
 
-class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickStyleAttached : public QObject, public QQuickItemChangeListener
+class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickAttachedObject : public QObject, public QQuickItemChangeListener
 {
     Q_OBJECT
 
 public:
-    explicit QQuickStyleAttached(QObject *parent = nullptr);
-    ~QQuickStyleAttached();
+    explicit QQuickAttachedObject(QObject *parent = nullptr);
+    ~QQuickAttachedObject();
 
-protected:
-    void init();
+    QList<QQuickAttachedObject *> attachedChildren() const;
 
-    QList<QQuickStyleAttached *> childStyles() const;
+    QQuickAttachedObject *attachedParent() const;
+    void setAttachedParent(QQuickAttachedObject *parent);
 
-    QQuickStyleAttached *parentStyle() const;
-    void setParentStyle(QQuickStyleAttached *style);
+protected:
+    void init();
 
-    virtual void parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent);
+    virtual void attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent);
 
     void itemWindowChanged(QQuickWindow *window);
     void itemParentChanged(QQuickItem *item, QQuickItem *parent) override;
 
 private:
-    QList<QQuickStyleAttached *> m_childStyles;
-    QPointer<QQuickStyleAttached> m_parentStyle;
+    QList<QQuickAttachedObject *> m_attachedChildren;
+    QPointer<QQuickAttachedObject> m_attachedParent;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKSTYLEATTACHED_P_H
+#endif // QQUICKATTACHEDOBJECT_P_H
diff --git a/src/quickcontrols2/quickcontrols2.pri b/src/quickcontrols2/quickcontrols2.pri
index 83ffb687..5c93f14d 100644
--- a/src/quickcontrols2/quickcontrols2.pri
+++ b/src/quickcontrols2/quickcontrols2.pri
@@ -1,5 +1,6 @@
 HEADERS += \
     $$PWD/qquickanimatednode_p.h \
+    $$PWD/qquickattachedobject_p.h \
     $$PWD/qquickcolor_p.h \
     $$PWD/qquickcolorimageprovider_p.h \
     $$PWD/qquickdisplaylayout_p.h \
@@ -10,7 +11,6 @@ HEADERS += \
     $$PWD/qquickproxytheme_p.h \
     $$PWD/qquickstyle.h \
     $$PWD/qquickstyle_p.h \
-    $$PWD/qquickstyleattached_p.h \
     $$PWD/qquickstyleplugin_p.h \
     $$PWD/qquickstyleselector_p.h \
     $$PWD/qquickstyleselector_p_p.h \
@@ -18,6 +18,7 @@ HEADERS += \
 
 SOURCES += \
     $$PWD/qquickanimatednode.cpp \
+    $$PWD/qquickattachedobject.cpp \
     $$PWD/qquickcolor.cpp \
     $$PWD/qquickcolorimageprovider.cpp \
     $$PWD/qquickdisplaylayout.cpp \
@@ -25,7 +26,6 @@ SOURCES += \
     $$PWD/qquickplaceholdertext.cpp \
     $$PWD/qquickproxytheme.cpp \
     $$PWD/qquickstyle.cpp \
-    $$PWD/qquickstyleattached.cpp \
     $$PWD/qquickstyleplugin.cpp \
     $$PWD/qquickstyleselector.cpp \
     $$PWD/qquickpaddedrectangle.cpp