diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-02-17 14:02:49 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-20 07:35:15 +0100 |
| commit | 6b775ffda38549bc9d76b6374dd9604115868a18 (patch) | |
| tree | b2f43ee4dac51fbf71b4cdda9d20b1ad806939a8 /src/quick/items/qquickanimation.cpp | |
| parent | 69ab984ac69fe3a10656e488fe354165b5aa550e (diff) | |
Use an enum rather than a string to represent state event types.
Change-Id: Iad230b610f35b1c1faa6ce60615551f293d4745d
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/quick/items/qquickanimation.cpp')
| -rw-r--r-- | src/quick/items/qquickanimation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickanimation.cpp b/src/quick/items/qquickanimation.cpp index 233e44a4da..4880190697 100644 --- a/src/quick/items/qquickanimation.cpp +++ b/src/quick/items/qquickanimation.cpp @@ -263,7 +263,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction if (!hasExplicit) for (int i = 0; i < actions.size(); ++i) { QDeclarativeAction &action = actions[i]; - if (action.event && action.event->typeName() == QLatin1String("ParentChange") + if (action.event && action.event->type() == QDeclarativeActionEvent::ParentChange && (!d->target || static_cast<QQuickParentChange*>(action.event)->object() == d->target)) { QQuickParentChange *pc = static_cast<QQuickParentChange*>(action.event); @@ -537,7 +537,7 @@ QAbstractAnimationJob* QQuickAnchorAnimation::transition(QDeclarativeStateAction for (int ii = 0; ii < actions.count(); ++ii) { QDeclarativeAction &action = actions[ii]; - if (action.event && action.event->typeName() == QLatin1String("AnchorChanges") + if (action.event && action.event->type() == QDeclarativeActionEvent::AnchorChanges && (d->targets.isEmpty() || d->targets.contains(static_cast<QQuickAnchorChanges*>(action.event)->object()))) { data->actions << static_cast<QQuickAnchorChanges*>(action.event)->additionalActions(); } |