From 6b775ffda38549bc9d76b6374dd9604115868a18 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Fri, 17 Feb 2012 14:02:49 +1000 Subject: Use an enum rather than a string to represent state event types. Change-Id: Iad230b610f35b1c1faa6ce60615551f293d4745d Reviewed-by: Bea Lam --- src/quick/items/qquickanimation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quick/items/qquickanimation.cpp') 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(action.event)->object() == d->target)) { QQuickParentChange *pc = static_cast(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(action.event)->object()))) { data->actions << static_cast(action.event)->additionalActions(); } -- cgit v1.2.3