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/qquickstackelement.cpp | |
| 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/qquickstackelement.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickstackelement.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quicktemplates2/qquickstackelement.cpp b/src/quicktemplates2/qquickstackelement.cpp index b90774a2..8b31af30 100644 --- a/src/quicktemplates2/qquickstackelement.cpp +++ b/src/quicktemplates2/qquickstackelement.cpp @@ -47,11 +47,11 @@ QT_BEGIN_NAMESPACE -static QQuickStackAttached *attachedStackObject(QQuickStackElement *element) +static QQuickStackViewAttached *attachedStackObject(QQuickStackElement *element) { - QQuickStackAttached *attached = qobject_cast<QQuickStackAttached *>(qmlAttachedPropertiesObject<QQuickStackView>(element->item, false)); + QQuickStackViewAttached *attached = qobject_cast<QQuickStackViewAttached *>(qmlAttachedPropertiesObject<QQuickStackView>(element->item, false)); if (attached) - QQuickStackAttachedPrivate::get(attached)->element = element; + QQuickStackViewAttachedPrivate::get(attached)->element = element; return attached; } @@ -82,7 +82,7 @@ QQuickStackElement::~QQuickStackElement() if (ownComponent) delete component; - QQuickStackAttached *attached = attachedStackObject(this); + QQuickStackViewAttached *attached = attachedStackObject(this); if (item) { if (ownItem) { item->setParentItem(nullptr); @@ -98,7 +98,7 @@ QQuickStackElement::~QQuickStackElement() item->setParentItem(originalParent); } else { if (attached) - QQuickStackAttachedPrivate::get(attached)->itemParentChanged(item, nullptr); + QQuickStackViewAttachedPrivate::get(attached)->itemParentChanged(item, nullptr); } } } @@ -205,7 +205,7 @@ void QQuickStackElement::setIndex(int value) return; index = value; - QQuickStackAttached *attached = attachedStackObject(this); + QQuickStackViewAttached *attached = attachedStackObject(this); if (attached) emit attached->indexChanged(); } @@ -216,7 +216,7 @@ void QQuickStackElement::setView(QQuickStackView *value) return; view = value; - QQuickStackAttached *attached = attachedStackObject(this); + QQuickStackViewAttached *attached = attachedStackObject(this); if (attached) emit attached->viewChanged(); } @@ -227,7 +227,7 @@ void QQuickStackElement::setStatus(QQuickStackView::Status value) return; status = value; - QQuickStackAttached *attached = attachedStackObject(this); + QQuickStackViewAttached *attached = attachedStackObject(this); if (!attached) return; |