aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativetransitionmanager.cpp
diff options
context:
space:
mode:
authorChristiaan Janssen <christiaan.janssen@nokia.com>2011-05-23 16:44:29 +0200
committerChristiaan Janssen <christiaan.janssen@nokia.com>2011-05-31 12:49:23 +0200
commitc99aa4ae85e44ced3a6b487b77af72679ecb12dc (patch)
tree94730382ba6381cd11252d3baa756e2cca62bd94 /src/declarative/util/qdeclarativetransitionmanager.cpp
parent4feaf5d4825feeb190d7ba0ed351a044b726a2dd (diff)
QDeclarative: fixed clean animation lists
Diffstat (limited to 'src/declarative/util/qdeclarativetransitionmanager.cpp')
-rw-r--r--src/declarative/util/qdeclarativetransitionmanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp
index 944b37faf8..6e96ac914c 100644
--- a/src/declarative/util/qdeclarativetransitionmanager.cpp
+++ b/src/declarative/util/qdeclarativetransitionmanager.cpp
@@ -56,12 +56,12 @@ class QDeclarativeTransitionManagerPrivate
{
public:
QDeclarativeTransitionManagerPrivate()
- : state(0), transition(0) {}
+ : state(0) {}
void applyBindings();
typedef QList<QDeclarativeSimpleAction> SimpleActionList;
QDeclarativeState *state;
- QDeclarativeTransition *transition;
+ QDeclarativeGuard<QDeclarativeTransition> transition;
QDeclarativeStateOperation::ActionList bindingsList;
SimpleActionList completeList;
};
@@ -253,7 +253,7 @@ void QDeclarativeTransitionManager::cancel()
{
if (d->transition) {
// ### this could potentially trigger a complete in rare circumstances
- d->transition->stop();
+ d->transition->stop();
d->transition = 0;
}