summaryrefslogtreecommitdiffstats
path: root/src/controls/qtstack.cpp
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@digia.com>2013-03-25 10:36:35 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-28 09:35:31 +0100
commit7e2ec122bd44aa6a50c310392edb8d2f22d6e12c (patch)
treea77a5a17250dcba37c7fed4b2db54e21473b732a /src/controls/qtstack.cpp
parentd9968ae805df9296546b1a1695e4864b43382301 (diff)
PageStack: rename PageTransition to StackViewDelegate
A 'PageTransition' is more a 'delegate' that is asked when the PageStack needs to create a new transition. So it feels more correct to name it this way. Change-Id: I1359592690d76b59f2d76baaf83455ae634fa4cc Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/qtstack.cpp')
-rw-r--r--src/controls/qtstack.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/controls/qtstack.cpp b/src/controls/qtstack.cpp
index 09f2c534d..f1933191e 100644
--- a/src/controls/qtstack.cpp
+++ b/src/controls/qtstack.cpp
@@ -65,7 +65,7 @@ QtStack::QtStack(QObject *object)
m_index(-1),
m_status(Inactive),
m_pageStack(0),
- m_pageTransition(0)
+ m_delegate(0)
{
}
@@ -141,23 +141,23 @@ void QtStack::setPageStack(QQuickItem *pageStack)
}
/*!
- \qmlproperty PageTransition Stack::pageTransition
+ \qmlproperty delegate Stack::delegate
This property can be set to override the default animations used
during a page transition. To better understand how to use this
property, refer to the \l{PageStack#Transitions}{transition documentation} in PageStack.
\sa {PageStack::animations}{PageStack.animations}
*/
-QObject *QtStack::pageTransition() const
+QObject *QtStack::delegate() const
{
- return m_pageTransition;
+ return m_delegate;
}
-void QtStack::setPageTransition(QObject* pageTransition)
+void QtStack::setdelegate(QObject* delegate)
{
- if (m_pageTransition != pageTransition) {
- m_pageTransition = pageTransition;
- emit pageTransitionChanged();
+ if (m_delegate != delegate) {
+ m_delegate = delegate;
+ emit delegateChanged();
}
}