diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-08-19 10:14:59 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-19 03:53:11 +0200 |
| commit | 9ed7790fd828f1dfa51a05326620e538076297b1 (patch) | |
| tree | acd3825c454471b005255197d5af560a6ccdc2e0 /src/declarative/util/qdeclarativetransition.cpp | |
| parent | c47025eab4276b4e1b0181b92e53ab4f7e3ae6aa (diff) | |
Internal state class refactoring.
Change-Id: I6e5fe3fa4459f99a50e3aa79c3a87106600f083a
Reviewed-on: http://codereview.qt.nokia.com/3231
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/declarative/util/qdeclarativetransition.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativetransition.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp index 5351f8a5c9..df22a57c1d 100644 --- a/src/declarative/util/qdeclarativetransition.cpp +++ b/src/declarative/util/qdeclarativetransition.cpp @@ -113,7 +113,7 @@ class QDeclarativeTransitionPrivate : public QObjectPrivate public: QDeclarativeTransitionPrivate() : fromState(QLatin1String("*")), toState(QLatin1String("*")), - reversed(false), reversible(false), enabled(true), endState(0) + reversed(false), reversible(false), enabled(true), manager(0) { group.trans = this; } @@ -124,11 +124,11 @@ public: bool reversible; bool enabled; ParallelAnimationWrapper group; - QDeclarativeTransitionManager *endState; + QDeclarativeTransitionManager *manager; void complete() { - endState->complete(); + manager->complete(); } static void append_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, QDeclarativeAbstractAnimation *a); static int animation_count(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list); @@ -203,7 +203,7 @@ void QDeclarativeTransition::setReversed(bool r) void QDeclarativeTransition::prepare(QDeclarativeStateOperation::ActionList &actions, QList<QDeclarativeProperty> &after, - QDeclarativeTransitionManager *endState) + QDeclarativeTransitionManager *manager) { Q_D(QDeclarativeTransition); @@ -219,7 +219,7 @@ void QDeclarativeTransition::prepare(QDeclarativeStateOperation::ActionList &act } } - d->endState = endState; + d->manager = manager; d->group.setDirection(d->reversed ? QAbstractAnimation::Backward : QAbstractAnimation::Forward); d->group.start(); } |