Share style inheritance related helpers

Usage:

    # +material/material.pro
    include(../shared/shared.pri)

    // qquickmaterialstyle.cpp
    #include "qquickstyle_p.h"

    QQuickMaterialStyle *style =
        QQuickStyle::instance<QQuickMaterialStyle>(item);
    // ...

    QQuickMaterialStyle *parent =
        QQuickStyle::findParent<QQuickMaterialStyle>(this);
    // ...

    QList<QQuickMaterialStyle *> children =
        QQuickStyle::findChildren<QQuickMaterialStyle>(object);
    // ...

Change-Id: I2c01a1aa36805f16d83fa60ab25b2cc29e6a43cc
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

1 files changed, 16 insertions, 100 deletions

diff --git a/src/imports/controls/qquicktheme.cpp b/src/imports/controls/qquicktheme.cpp
index 7fec28c9..f0345df2 100644
--- a/src/imports/controls/qquicktheme.cpp
+++ b/src/imports/controls/qquicktheme.cpp
@@ -36,6 +36,7 @@
 
 #include "qquicktheme_p.h"
 #include "qquickthemedata_p.h"
+#include "qquickstyle_p.h"
 
 #include <QtCore/qset.h>
 #include <QtCore/qpointer.h>
@@ -100,100 +101,6 @@ QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC_WITH_ARGS(QQuickThemeData, globalThemeData, (QString::fromLatin1(":/qtlabscontrols/theme.json")))
 
-static QQuickThemeAttached *themeInstance(QQmlEngine *engine)
-{
-    QQuickThemeAttached *theme = engine->property("_q_quicktheme").value<QQuickThemeAttached *>();
-    if (!theme) {
-        theme = new QQuickThemeAttached(*globalThemeData(), engine);
-        engine->setProperty("_q_quicktheme", QVariant::fromValue(theme));
-    }
-    return theme;
-}
-
-static QQuickThemeAttached *attachedTheme(QObject *object)
-{
-    if (object)
-        return qobject_cast<QQuickThemeAttached*>(qmlAttachedPropertiesObject<QQuickThemeAttached>(object, false));
-    return Q_NULLPTR;
-}
-
-static QQuickThemeAttached *findParentTheme(QObject *object)
-{
-    QQuickItem *item = qobject_cast<QQuickItem *>(object);
-    if (item) {
-        // lookup parent items
-        QQuickItem *parent = item->parentItem();
-        while (parent) {
-            QQuickThemeAttached *attached = attachedTheme(parent);
-            if (attached)
-                return attached;
-            parent = parent->parentItem();
-        }
-
-        // fallback to item's window theme
-        QQuickWindow *window = item->window();
-        if (window) {
-            QQuickThemeAttached *attached = attachedTheme(window);
-            if (attached)
-                return attached;
-        }
-    }
-
-    // lookup parent window theme
-    QQuickWindow *window = qobject_cast<QQuickWindow *>(object);
-    if (window) {
-        QQuickWindow *parentWindow = qobject_cast<QQuickWindow *>(window->parent());
-        if (parentWindow) {
-            QQuickThemeAttached *attached = attachedTheme(window);
-            if (attached)
-                return attached;
-        }
-    }
-
-    // fallback to global theme
-    if (object) {
-        QQmlEngine *engine = qmlEngine(object);
-        if (engine)
-            return themeInstance(engine);
-    }
-
-    return Q_NULLPTR;
-}
-
-static QList<QQuickThemeAttached *> findChildThemes(QObject *object)
-{
-    QList<QQuickThemeAttached *> themes;
-
-    QQuickItem *item = qobject_cast<QQuickItem *>(object);
-    if (!item) {
-        QQuickWindow *window = qobject_cast<QQuickWindow *>(object);
-        if (window) {
-            item = window->contentItem();
-
-            foreach (QObject *child, window->children()) {
-                QQuickWindow *childWindow = qobject_cast<QQuickWindow *>(child);
-                if (childWindow) {
-                    QQuickThemeAttached *theme = attachedTheme(childWindow);
-                    if (theme)
-                        themes += theme;
-                }
-            }
-        }
-    }
-
-    if (item) {
-        foreach (QQuickItem *child, item->childItems()) {
-            QQuickThemeAttached *theme = attachedTheme(child);
-            if (theme)
-                themes += theme;
-            else
-                themes += findChildThemes(child);
-        }
-    }
-
-    return themes;
-}
-
 class QQuickThemeAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener
 {
     Q_DECLARE_PUBLIC(QQuickThemeAttached)
@@ -433,20 +340,29 @@ void QQuickThemeAttachedPrivate::inherit(QQuickThemeAttached *theme)
 const QQuickThemeData &QQuickThemeAttachedPrivate::resolve() const
 {
     Q_Q(const QQuickThemeAttached);
-    QQuickThemeAttached *theme = findParentTheme(const_cast<QQuickThemeAttached *>(q));
+    QQuickThemeAttached *theme = QQuickStyle::findParent<QQuickThemeAttached>(const_cast<QQuickThemeAttached *>(q));
     return theme ? theme->d_func()->data : *globalThemeData();
 }
 
 void QQuickThemeAttachedPrivate::itemParentChanged(QQuickItem *item, QQuickItem *)
 {
-    QQuickThemeAttached *theme = attachedTheme(item);
+    QQuickThemeAttached *theme = QQuickStyle::instance<QQuickThemeAttached>(item);
     if (theme) {
-        QQuickThemeAttached *parent = findParentTheme(theme);
+        QQuickThemeAttached *parent = QQuickStyle::findParent<QQuickThemeAttached>(theme);
         if (parent)
             theme->setParentTheme(parent);
     }
 }
 
+QQuickThemeAttached::QQuickThemeAttached(QObject *parent) :
+    QObject(*(new QQuickThemeAttachedPrivate(*globalThemeData())), parent)
+{
+    Q_D(QQuickThemeAttached);
+    QQuickItem *item = qobject_cast<QQuickItem *>(parent);
+    if (item)
+        QQuickItemPrivate::get(item)->addItemChangeListener(d, QQuickItemPrivate::Parent);
+}
+
 QQuickThemeAttached::QQuickThemeAttached(const QQuickThemeData &data, QObject *parent) :
     QObject(*(new QQuickThemeAttachedPrivate(data)), parent)
 {
@@ -469,15 +385,15 @@ QQuickThemeAttached::~QQuickThemeAttached()
 QQuickThemeAttached *QQuickThemeAttached::qmlAttachedProperties(QObject *object)
 {
     QQuickThemeAttached *theme = Q_NULLPTR;
-    QQuickThemeAttached *parent = findParentTheme(object);
+    QQuickThemeAttached *parent = QQuickStyle::findParent<QQuickThemeAttached>(object);
     if (parent) {
         theme = new QQuickThemeAttached(parent->d_func()->data, object);
         theme->setParentTheme(parent);
     } else {
-        theme = new QQuickThemeAttached(*globalThemeData(), object);
+        theme = new QQuickThemeAttached(object);
     }
 
-    QList<QQuickThemeAttached *> childThemes = findChildThemes(object);
+    QList<QQuickThemeAttached *> childThemes = QQuickStyle::findChildren<QQuickThemeAttached>(object);
     foreach (QQuickThemeAttached *child, childThemes)
         child->setParentTheme(theme);
     return theme;