diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-27 08:07:06 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-27 08:25:52 +0000 |
| commit | 0babb4de001be4aa75d9ea0bfbab869a1c2b27c7 (patch) | |
| tree | c64ffcbf68b0efb9fa663bd53a1c01af4989c3e6 /src/quicktemplates2/qquickstackview_p.h | |
| parent | e59982c968dad7ffe4e3c0fd63325187b3f07b42 (diff) | |
Rename QQuickStackAttached to QQuickStackViewAttached
In QQC1 the attached property was called "Stack", purely because we
couldn't have both QML and C++ types with the same name. Now the
attached properties are provided by StackView itself, so this is the
correct name.
Change-Id: I0f98d73735cff14c444a9e843b7cb56dc8a45cd8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickstackview_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickstackview_p.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/quicktemplates2/qquickstackview_p.h b/src/quicktemplates2/qquickstackview_p.h index 9bf60183..e14bf2d4 100644 --- a/src/quicktemplates2/qquickstackview_p.h +++ b/src/quicktemplates2/qquickstackview_p.h @@ -55,8 +55,9 @@ QT_BEGIN_NAMESPACE class QQmlV4Function; class QQuickTransition; class QQuickStackElement; -class QQuickStackAttached; class QQuickStackViewPrivate; +class QQuickStackViewAttached; +class QQuickStackViewAttachedPrivate; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickStackView : public QQuickControl { @@ -76,7 +77,7 @@ public: explicit QQuickStackView(QQuickItem *parent = nullptr); ~QQuickStackView(); - static QQuickStackAttached *qmlAttachedProperties(QObject *object); + static QQuickStackViewAttached *qmlAttachedProperties(QObject *object); bool isBusy() const; int depth() const; @@ -157,9 +158,7 @@ private: Q_DECLARE_PRIVATE(QQuickStackView) }; -class QQuickStackAttachedPrivate; - -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickStackAttached : public QObject +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickStackViewAttached : public QObject { Q_OBJECT Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL) @@ -167,8 +166,8 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickStackAttached : public QObject Q_PROPERTY(QQuickStackView::Status status READ status NOTIFY statusChanged FINAL) public: - explicit QQuickStackAttached(QObject *parent = nullptr); - ~QQuickStackAttached(); + explicit QQuickStackViewAttached(QObject *parent = nullptr); + ~QQuickStackViewAttached(); int index() const; QQuickStackView *view() const; @@ -185,8 +184,8 @@ Q_SIGNALS: /*Q_REVISION(1)*/ void removed(); private: - Q_DISABLE_COPY(QQuickStackAttached) - Q_DECLARE_PRIVATE(QQuickStackAttached) + Q_DISABLE_COPY(QQuickStackViewAttached) + Q_DECLARE_PRIVATE(QQuickStackViewAttached) }; QT_END_NAMESPACE |