summaryrefslogtreecommitdiff
path: root/src/controls/qquickstack.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-05-29 16:17:02 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-30 09:21:23 +0200
commitf6a716a11a26e2ce76f8ed71ad1733e939ca468b (patch)
tree2d1b3eb7764767700cc73da469f400db74a9263a /src/controls/qquickstack.cpp
parent6de2c97d064daa069066bb46880f04bfd5be43b7 (diff)
downloadqtquickcontrols-f6a716a11a26e2ce76f8ed71ad1733e939ca468b.tar.gz
Remove remaining references to PageStack
Change-Id: I59a9846c83340d0752659ef22cbb19a4be6a4129 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/controls/qquickstack.cpp')
-rw-r--r--src/controls/qquickstack.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/controls/qquickstack.cpp b/src/controls/qquickstack.cpp
index 1723ef72..5d3accff 100644
--- a/src/controls/qquickstack.cpp
+++ b/src/controls/qquickstack.cpp
@@ -64,7 +64,7 @@ QQuickStack::QQuickStack(QObject *object)
: QObject(object),
m_index(-1),
m_status(Inactive),
- m_pageStack(0)
+ m_view(0)
{
}
@@ -77,9 +77,9 @@ QQuickStack *QQuickStack::qmlAttachedProperties(QObject *object)
\readonly
\qmlproperty int Stack::index
- This property holds the index of the item inside \l{pageStack}{StackView},
- so that \l{StackView::get()}{pageStack.get(index)} will return the item itself.
- If \l{Stack::pageStack}{pageStack} is \c null, \a index will be \c -1.
+ This property holds the index of the item inside \l{view}{StackView},
+ so that \l{StackView::get()}{StackView.get(index)} will return the item itself.
+ If \l{Stack::view}{view} is \c null, \a index will be \c -1.
*/
int QQuickStack::index() const
{
@@ -121,21 +121,21 @@ void QQuickStack::setStatus(Status status)
/*!
\readonly
- \qmlproperty StackView Stack::pageStack
+ \qmlproperty StackView Stack::view
This property holds the StackView the item is in. If the item is not inside
- a StackView, \a pageStack will be \c null.
+ a StackView, \a view will be \c null.
*/
-QQuickItem *QQuickStack::pageStack() const
+QQuickItem *QQuickStack::view() const
{
- return m_pageStack;
+ return m_view;
}
-void QQuickStack::setStackView(QQuickItem *pageStack)
+void QQuickStack::setView(QQuickItem *view)
{
- if (m_pageStack != pageStack) {
- m_pageStack = pageStack;
- emit pageStackChanged();
+ if (m_view != view) {
+ m_view = view;
+ emit viewChanged();
}
}