From 55a6938b3204b28976d456be9f9f68bf44c22051 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sun, 14 Jun 2015 17:25:51 +0200 Subject: Rename QQuickTheme -> QQuickThemeAttached Follow the QtQuick conventions & make tst_sanity easier. Change-Id: Ic722383ca09de2bd53ee81177297ecafdf6a9cf7 Reviewed-by: J-P Nurmi --- src/imports/controls/qquicktheme_p.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/imports/controls/qquicktheme_p.h') diff --git a/src/imports/controls/qquicktheme_p.h b/src/imports/controls/qquicktheme_p.h index a6294c78..90941ea1 100644 --- a/src/imports/controls/qquicktheme_p.h +++ b/src/imports/controls/qquicktheme_p.h @@ -55,9 +55,9 @@ QT_BEGIN_NAMESPACE class QQuickThemeData; -class QQuickThemePrivate; +class QQuickThemeAttachedPrivate; -class QQuickTheme : public QObject +class QQuickThemeAttached : public QObject { Q_OBJECT Q_PROPERTY(QColor accentColor READ accentColor WRITE setAccentColor RESET resetAccentColor NOTIFY accentColorChanged FINAL) @@ -77,13 +77,13 @@ class QQuickTheme : public QObject Q_PROPERTY(qreal disabledOpacity READ disabledOpacity WRITE setDisabledOpacity RESET resetDisabledOpacity NOTIFY disabledOpacityChanged FINAL) public: - explicit QQuickTheme(const QQuickThemeData &data, QObject *parent = Q_NULLPTR); - ~QQuickTheme(); + explicit QQuickThemeAttached(const QQuickThemeData &data, QObject *parent = Q_NULLPTR); + ~QQuickThemeAttached(); - static QQuickTheme *qmlAttachedProperties(QObject *object); + static QQuickThemeAttached *qmlAttachedProperties(QObject *object); - QQuickTheme *parentTheme() const; - void setParentTheme(QQuickTheme *theme); + QQuickThemeAttached *parentTheme() const; + void setParentTheme(QQuickThemeAttached *theme); QColor accentColor() const; void setAccentColor(const QColor &color); @@ -163,12 +163,12 @@ Q_SIGNALS: void disabledOpacityChanged(); private: - Q_DISABLE_COPY(QQuickTheme) - Q_DECLARE_PRIVATE(QQuickTheme) + Q_DISABLE_COPY(QQuickThemeAttached) + Q_DECLARE_PRIVATE(QQuickThemeAttached) }; QT_END_NAMESPACE -QML_DECLARE_TYPEINFO(QQuickTheme, QML_HAS_ATTACHED_PROPERTIES) +QML_DECLARE_TYPEINFO(QQuickThemeAttached, QML_HAS_ATTACHED_PROPERTIES) #endif // QQUICKTHEME_P_H -- cgit v1.2.3