Rename QQuickStyle to QQuickStyleAttached

Make room for a public QQuickStyle class for configuring the style.

Task-number: QTBUG-50787
Change-Id: I2a43436dd1815e3acd7e896a5847e41db42af5c4
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

8 files changed, 63 insertions, 63 deletions

diff --git a/src/controls/controls.pri b/src/controls/controls.pri
index 7aa9447f..dcc40024 100644
--- a/src/controls/controls.pri
+++ b/src/controls/controls.pri
@@ -1,7 +1,7 @@
 HEADERS += \
     $$PWD/qquickcolorimageprovider_p.h \
     $$PWD/qquickproxytheme_p.h \
-    $$PWD/qquickstyle_p.h \
+    $$PWD/qquickstyleattached_p.h \
     $$PWD/qquickstyleselector_p.h \
     $$PWD/qquickstyleselector_p_p.h \
     $$PWD/qquickpaddedrectangle_p.h
@@ -9,6 +9,6 @@ HEADERS += \
 SOURCES += \
     $$PWD/qquickcolorimageprovider.cpp \
     $$PWD/qquickproxytheme.cpp \
-    $$PWD/qquickstyle.cpp \
+    $$PWD/qquickstyleattached.cpp \
     $$PWD/qquickstyleselector.cpp \
     $$PWD/qquickpaddedrectangle.cpp
diff --git a/src/controls/qquickstyle.cpp b/src/controls/qquickstyleattached.cpp
index 38099044..85a4b3c8 100644
--- a/src/controls/qquickstyle.cpp
+++ b/src/controls/qquickstyleattached.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickstyle_p.h"
+#include "qquickstyleattached_p.h"
 
 #include <QtCore/qfile.h>
 #include <QtCore/qsettings.h>
@@ -44,22 +44,22 @@
 
 QT_BEGIN_NAMESPACE
 
-static QQuickStyle *attachedStyle(const QMetaObject *type, QObject *object, bool create = false)
+static QQuickStyleAttached *attachedStyle(const QMetaObject *type, QObject *object, bool create = false)
 {
     if (!object)
         return nullptr;
     int idx = -1;
-    return qobject_cast<QQuickStyle *>(qmlAttachedPropertiesObject(&idx, object, type, create));
+    return qobject_cast<QQuickStyleAttached *>(qmlAttachedPropertiesObject(&idx, object, type, create));
 }
 
-static QQuickStyle *findParentStyle(const QMetaObject *type, QObject *object)
+static QQuickStyleAttached *findParentStyle(const QMetaObject *type, QObject *object)
 {
     QQuickItem *item = qobject_cast<QQuickItem *>(object);
     if (item) {
         // lookup parent items and popups
         QQuickItem *parent = item->parentItem();
         while (parent) {
-            QQuickStyle *style = attachedStyle(type, parent);
+            QQuickStyleAttached *style = attachedStyle(type, parent);
             if (style)
                 return style;
 
@@ -71,7 +71,7 @@ static QQuickStyle *findParentStyle(const QMetaObject *type, QObject *object)
         }
 
         // fallback to item's window
-        QQuickStyle *style = attachedStyle(type, item->window());
+        QQuickStyleAttached *style = attachedStyle(type, item->window());
         if (style)
             return style;
     } else {
@@ -86,7 +86,7 @@ static QQuickStyle *findParentStyle(const QMetaObject *type, QObject *object)
     if (window) {
         QQuickWindow *parentWindow = qobject_cast<QQuickWindow *>(window->parent());
         if (parentWindow) {
-            QQuickStyle *style = attachedStyle(type, window);
+            QQuickStyleAttached *style = attachedStyle(type, window);
             if (style)
                 return style;
         }
@@ -97,7 +97,7 @@ static QQuickStyle *findParentStyle(const QMetaObject *type, QObject *object)
         QQmlEngine *engine = qmlEngine(object);
         if (engine) {
             QByteArray name = QByteArray("_q_") + type->className();
-            QQuickStyle *style = engine->property(name).value<QQuickStyle*>();
+            QQuickStyleAttached *style = engine->property(name).value<QQuickStyleAttached*>();
             if (!style) {
                 style = attachedStyle(type, engine, true);
                 engine->setProperty(name, QVariant::fromValue(style));
@@ -109,9 +109,9 @@ static QQuickStyle *findParentStyle(const QMetaObject *type, QObject *object)
     return nullptr;
 }
 
-static QList<QQuickStyle *> findChildStyles(const QMetaObject *type, QObject *object)
+static QList<QQuickStyleAttached *> findChildStyles(const QMetaObject *type, QObject *object)
 {
-    QList<QQuickStyle *> children;
+    QList<QQuickStyleAttached *> children;
 
     QQuickItem *item = qobject_cast<QQuickItem *>(object);
     if (!item) {
@@ -123,7 +123,7 @@ static QList<QQuickStyle *> findChildStyles(const QMetaObject *type, QObject *ob
             for (QObject *child : windowChildren) {
                 QQuickWindow *childWindow = qobject_cast<QQuickWindow *>(child);
                 if (childWindow) {
-                    QQuickStyle *style = attachedStyle(type, childWindow);
+                    QQuickStyleAttached *style = attachedStyle(type, childWindow);
                     if (style)
                         children += style;
                 }
@@ -134,7 +134,7 @@ static QList<QQuickStyle *> findChildStyles(const QMetaObject *type, QObject *ob
     if (item) {
         const auto childItems = item->childItems();
         for (QQuickItem *child : childItems) {
-            QQuickStyle *style = attachedStyle(type, child);
+            QQuickStyleAttached *style = attachedStyle(type, child);
             if (style)
                 children += style;
             else
@@ -145,14 +145,14 @@ static QList<QQuickStyle *> findChildStyles(const QMetaObject *type, QObject *ob
     return children;
 }
 
-QQuickStyle::QQuickStyle(QObject *parent) : QObject(parent)
+QQuickStyleAttached::QQuickStyleAttached(QObject *parent) : QObject(parent)
 {
     QQuickItem *item = parentItem();
     if (item)
         QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Parent);
 }
 
-QQuickStyle::~QQuickStyle()
+QQuickStyleAttached::~QQuickStyleAttached()
 {
     QQuickItem *item = parentItem();
     if (item)
@@ -161,7 +161,7 @@ QQuickStyle::~QQuickStyle()
     setParentStyle(nullptr);
 }
 
-QSharedPointer<QSettings> QQuickStyle::settings(const QString &group)
+QSharedPointer<QSettings> QQuickStyleAttached::settings(const QString &group)
 {
 #ifndef QT_NO_SETTINGS
     const QString filePath = QStringLiteral(":/qtlabscontrols.conf");
@@ -176,7 +176,7 @@ QSharedPointer<QSettings> QQuickStyle::settings(const QString &group)
     return QSharedPointer<QSettings>();
 }
 
-QQuickItem *QQuickStyle::parentItem() const
+QQuickItem *QQuickStyleAttached::parentItem() const
 {
     QQuickItem *item = qobject_cast<QQuickItem *>(parent());
     if (!item) {
@@ -187,20 +187,20 @@ QQuickItem *QQuickStyle::parentItem() const
     return item;
 }
 
-QList<QQuickStyle *> QQuickStyle::childStyles() const
+QList<QQuickStyleAttached *> QQuickStyleAttached::childStyles() const
 {
     return m_childStyles;
 }
 
-QQuickStyle *QQuickStyle::parentStyle() const
+QQuickStyleAttached *QQuickStyleAttached::parentStyle() const
 {
     return m_parentStyle;
 }
 
-void QQuickStyle::setParentStyle(QQuickStyle *style)
+void QQuickStyleAttached::setParentStyle(QQuickStyleAttached *style)
 {
     if (m_parentStyle != style) {
-        QQuickStyle *oldParent = m_parentStyle;
+        QQuickStyleAttached *oldParent = m_parentStyle;
         if (m_parentStyle)
             m_parentStyle->m_childStyles.removeOne(this);
         m_parentStyle = style;
@@ -210,24 +210,24 @@ void QQuickStyle::setParentStyle(QQuickStyle *style)
     }
 }
 
-void QQuickStyle::init()
+void QQuickStyleAttached::init()
 {
-    QQuickStyle *parentStyle = findParentStyle(metaObject(), parent());
+    QQuickStyleAttached *parentStyle = findParentStyle(metaObject(), parent());
     if (parentStyle)
         setParentStyle(parentStyle);
 
-    const QList<QQuickStyle *> children = findChildStyles(metaObject(), parent());
-    for (QQuickStyle *child : children)
+    const QList<QQuickStyleAttached *> children = findChildStyles(metaObject(), parent());
+    for (QQuickStyleAttached *child : children)
         child->setParentStyle(this);
 }
 
-void QQuickStyle::parentStyleChange(QQuickStyle *newParent, QQuickStyle *oldParent)
+void QQuickStyleAttached::parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent)
 {
     Q_UNUSED(newParent);
     Q_UNUSED(oldParent);
 }
 
-void QQuickStyle::itemParentChanged(QQuickItem *item, QQuickItem *parent)
+void QQuickStyleAttached::itemParentChanged(QQuickItem *item, QQuickItem *parent)
 {
     Q_UNUSED(parent);
     setParentStyle(findParentStyle(metaObject(), item));
diff --git a/src/controls/qquickstyle_p.h b/src/controls/qquickstyleattached_p.h
index 2a1d3d00..47871d15 100644
--- a/src/controls/qquickstyle_p.h
+++ b/src/controls/qquickstyleattached_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKSTYLE_P_H
-#define QQUICKSTYLE_P_H
+#ifndef QQUICKSTYLEATTACHED_P_H
+#define QQUICKSTYLEATTACHED_P_H
 
 //
 //  W A R N I N G
@@ -59,13 +59,13 @@ QT_BEGIN_NAMESPACE
 
 class QSettings;
 
-class QQuickStyle : public QObject, public QQuickItemChangeListener
+class QQuickStyleAttached : public QObject, public QQuickItemChangeListener
 {
     Q_OBJECT
 
 public:
-    explicit QQuickStyle(QObject *parent = nullptr);
-    ~QQuickStyle();
+    explicit QQuickStyleAttached(QObject *parent = nullptr);
+    ~QQuickStyleAttached();
 
     static QSharedPointer<QSettings> settings(const QString &group = QString());
 
@@ -74,20 +74,20 @@ protected:
 
     QQuickItem *parentItem() const;
 
-    QList<QQuickStyle *> childStyles() const;
+    QList<QQuickStyleAttached *> childStyles() const;
 
-    QQuickStyle *parentStyle() const;
-    void setParentStyle(QQuickStyle *style);
+    QQuickStyleAttached *parentStyle() const;
+    void setParentStyle(QQuickStyleAttached *style);
 
-    virtual void parentStyleChange(QQuickStyle *newParent, QQuickStyle *oldParent);
+    virtual void parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent);
 
     void itemParentChanged(QQuickItem *item, QQuickItem *parent) override;
 
 private:
-    QList<QQuickStyle *> m_childStyles;
-    QPointer<QQuickStyle> m_parentStyle;
+    QList<QQuickStyleAttached *> m_childStyles;
+    QPointer<QQuickStyleAttached> m_parentStyle;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKSTYLE_P_H
+#endif // QQUICKSTYLEATTACHED_P_H
diff --git a/src/controls/qquickstyleselector.cpp b/src/controls/qquickstyleselector.cpp
index 0f0fb3b0..500afdd6 100644
--- a/src/controls/qquickstyleselector.cpp
+++ b/src/controls/qquickstyleselector.cpp
@@ -45,7 +45,7 @@
 #include <QtCore/QSettings>
 
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtLabsControls/private/qquickstyle_p.h>
+#include <QtLabsControls/private/qquickstyleattached_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -63,7 +63,7 @@ QQuickStyleSelector::QQuickStyleSelector() : d_ptr(new QQuickStyleSelectorPrivat
     if (d->style.isEmpty())
         d->style = QString::fromLatin1(qgetenv("QT_LABS_CONTROLS_STYLE")).toLower();
     if (d->style.isEmpty()) {
-        QSharedPointer<QSettings> settings = QQuickStyle::settings(QStringLiteral("Controls"));
+        QSharedPointer<QSettings> settings = QQuickStyleAttached::settings(QStringLiteral("Controls"));
         if (settings)
             d->style = settings->value(QStringLiteral("Style")).toString().toLower();
     }
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index 9b6c4668..722f4f58 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -39,7 +39,7 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qsettings.h>
 #include <QtQml/qqmlinfo.h>
-#include <QtLabsControls/private/qquickstyle_p.h>
+#include <QtLabsControls/private/qquickstyleattached_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -413,7 +413,7 @@ static const QRgb switchDisabledTrackColorDark = 0x19FFFFFF;
 static const QRgb checkBoxUncheckedRippleColorLight = 0x10000000;
 static const QRgb checkBoxUncheckedRippleColorDark = 0x20FFFFFF;
 
-QQuickMaterialStyle::QQuickMaterialStyle(QObject *parent) : QQuickStyle(parent),
+QQuickMaterialStyle::QQuickMaterialStyle(QObject *parent) : QQuickStyleAttached(parent),
     m_explicitTheme(false),
     m_explicitPrimary(false),
     m_explicitAccent(false),
@@ -462,7 +462,7 @@ void QQuickMaterialStyle::inheritTheme(Theme theme)
 void QQuickMaterialStyle::propagateTheme()
 {
     const auto styles = childStyles();
-    for (QQuickStyle *child : styles) {
+    for (QQuickStyleAttached *child : styles) {
         QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child);
         if (material)
             material->inheritTheme(m_theme);
@@ -535,7 +535,7 @@ void QQuickMaterialStyle::inheritPrimary(uint primary, bool custom)
 void QQuickMaterialStyle::propagatePrimary()
 {
     const auto styles = childStyles();
-    for (QQuickStyle *child : styles) {
+    for (QQuickStyleAttached *child : styles) {
         QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child);
         if (material)
             material->inheritPrimary(m_primary, m_customPrimary);
@@ -609,7 +609,7 @@ void QQuickMaterialStyle::inheritAccent(uint accent, bool custom)
 void QQuickMaterialStyle::propagateAccent()
 {
     const auto styles = childStyles();
-    for (QQuickStyle *child : styles) {
+    for (QQuickStyleAttached *child : styles) {
         QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child);
         if (material)
             material->inheritAccent(m_accent, m_customAccent);
@@ -927,7 +927,7 @@ QColor QQuickMaterialStyle::shade(const QColor &color, Shade shade) const
     }
 }
 
-void QQuickMaterialStyle::parentStyleChange(QQuickStyle *newParent, QQuickStyle *oldParent)
+void QQuickMaterialStyle::parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent)
 {
     Q_UNUSED(oldParent);
     QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(newParent);
@@ -949,7 +949,7 @@ void QQuickMaterialStyle::init()
 {
     static bool defaultsInitialized = false;
     if (!defaultsInitialized) {
-        QSharedPointer<QSettings> settings = QQuickStyle::settings(QStringLiteral("Material"));
+        QSharedPointer<QSettings> settings = QQuickStyleAttached::settings(QStringLiteral("Material"));
         if (!settings.isNull()) {
             bool ok = false;
             QByteArray value = settings->value(QStringLiteral("Theme")).toByteArray();
@@ -992,7 +992,7 @@ void QQuickMaterialStyle::init()
         defaultsInitialized = true;
     }
 
-    QQuickStyle::init(); // TODO: lazy init?
+    QQuickStyleAttached::init(); // TODO: lazy init?
 }
 
 QT_END_NAMESPACE
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h
index 98540cd2..2bf2915e 100644
--- a/src/imports/controls/material/qquickmaterialstyle_p.h
+++ b/src/imports/controls/material/qquickmaterialstyle_p.h
@@ -49,13 +49,13 @@
 //
 
 #include <QtGui/qcolor.h>
-#include <QtLabsControls/private/qquickstyle_p.h>
+#include <QtLabsControls/private/qquickstyleattached_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickMaterialStylePrivate;
 
-class QQuickMaterialStyle : public QQuickStyle
+class QQuickMaterialStyle : public QQuickStyleAttached
 {
     Q_OBJECT
     Q_PROPERTY(Theme theme READ theme WRITE setTheme RESET resetTheme NOTIFY themeChanged FINAL)
@@ -222,7 +222,7 @@ Q_SIGNALS:
     void paletteChanged();
 
 protected:
-    void parentStyleChange(QQuickStyle *newParent, QQuickStyle *oldParent) override;
+    void parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent) override;
 
 private:
     void init();
diff --git a/src/imports/controls/universal/qquickuniversalstyle.cpp b/src/imports/controls/universal/qquickuniversalstyle.cpp
index 17a214f4..ee678609 100644
--- a/src/imports/controls/universal/qquickuniversalstyle.cpp
+++ b/src/imports/controls/universal/qquickuniversalstyle.cpp
@@ -39,7 +39,7 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qsettings.h>
 #include <QtQml/qqmlinfo.h>
-#include <QtLabsControls/private/qquickstyle_p.h>
+#include <QtLabsControls/private/qquickstyleattached_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -135,7 +135,7 @@ static QRgb qquickuniversal_accent_color(QQuickUniversalStyle::Accent accent)
 static QQuickUniversalStyle::Theme DefaultTheme = QQuickUniversalStyle::Light;
 static QRgb DefaultAccent = qquickuniversal_accent_color(QQuickUniversalStyle::Cobalt);
 
-QQuickUniversalStyle::QQuickUniversalStyle(QObject *parent) : QQuickStyle(parent),
+QQuickUniversalStyle::QQuickUniversalStyle(QObject *parent) : QQuickStyleAttached(parent),
     m_hasTheme(false), m_hasAccent(false), m_theme(DefaultTheme), m_accent(DefaultAccent)
 {
     init();
@@ -177,7 +177,7 @@ void QQuickUniversalStyle::inheritTheme(Theme theme)
 void QQuickUniversalStyle::propagateTheme()
 {
     const auto styles = childStyles();
-    for (QQuickStyle *child : styles) {
+    for (QQuickStyleAttached *child : styles) {
         QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(child);
         if (universal)
             universal->inheritTheme(m_theme);
@@ -245,7 +245,7 @@ void QQuickUniversalStyle::inheritAccent(QRgb accent)
 void QQuickUniversalStyle::propagateAccent()
 {
     const auto styles = childStyles();
-    for (QQuickStyle *child : styles) {
+    for (QQuickStyleAttached *child : styles) {
         QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(child);
         if (universal)
             universal->inheritAccent(m_accent);
@@ -387,7 +387,7 @@ QColor QQuickUniversalStyle::getColor(SystemColor role) const
     return m_theme == QQuickUniversalStyle::Dark ? qquickuniversal_dark_color(role) : qquickuniversal_light_color(role);
 }
 
-void QQuickUniversalStyle::parentStyleChange(QQuickStyle *newParent, QQuickStyle *oldParent)
+void QQuickUniversalStyle::parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent)
 {
     Q_UNUSED(oldParent);
     QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(newParent);
@@ -408,7 +408,7 @@ void QQuickUniversalStyle::init()
 {
     static bool defaultsInitialized = false;
     if (!defaultsInitialized) {
-        QSharedPointer<QSettings> settings = QQuickStyle::settings(QStringLiteral("Universal"));
+        QSharedPointer<QSettings> settings = QQuickStyleAttached::settings(QStringLiteral("Universal"));
         if (!settings.isNull()) {
             bool ok = false;
             QByteArray value = settings->value(QStringLiteral("Theme")).toByteArray();
@@ -433,7 +433,7 @@ void QQuickUniversalStyle::init()
         defaultsInitialized = true;
     }
 
-    QQuickStyle::init(); // TODO: lazy init?
+    QQuickStyleAttached::init(); // TODO: lazy init?
 }
 
 QT_END_NAMESPACE
diff --git a/src/imports/controls/universal/qquickuniversalstyle_p.h b/src/imports/controls/universal/qquickuniversalstyle_p.h
index bba1876d..47a6de4a 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 <QtLabsControls/private/qquickstyle_p.h>
+#include <QtLabsControls/private/qquickstyleattached_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickUniversalStylePrivate;
 
-class QQuickUniversalStyle : public QQuickStyle
+class QQuickUniversalStyle : public QQuickStyleAttached
 {
     Q_OBJECT
     Q_PROPERTY(Theme theme READ theme WRITE setTheme RESET resetTheme NOTIFY themeChanged FINAL)
@@ -190,7 +190,7 @@ Q_SIGNALS:
     void paletteChanged();
 
 protected:
-    void parentStyleChange(QQuickStyle *newParent, QQuickStyle *oldParent) override;
+    void parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent) override;
 
 private:
     void init();