Use an enum rather than a string to represent state event types.

Change-Id: Iad230b610f35b1c1faa6ce60615551f293d4745d
Reviewed-by: Bea Lam <bea.lam@nokia.com>

3 files changed, 10 insertions, 10 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();
         }
diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp
index bf78bade56..c4dd0fd146 100644
--- a/src/quick/items/qquickstateoperations.cpp
+++ b/src/quick/items/qquickstateoperations.cpp
@@ -465,15 +465,15 @@ void QQuickParentChange::reverse(Reason)
     d->doChange(d->origParent, d->origStackBefore);
 }
 
-QString QQuickParentChange::typeName() const
+QDeclarativeActionEvent::EventType QQuickParentChange::type() const
 {
-    return QLatin1String("ParentChange");
+    return ParentChange;
 }
 
 bool QQuickParentChange::override(QDeclarativeActionEvent*other)
 {
     Q_D(QQuickParentChange);
-    if (other->typeName() != QLatin1String("ParentChange"))
+    if (other->type() != ParentChange)
         return false;
     if (QQuickParentChange *otherPC = static_cast<QQuickParentChange*>(other))
         return (d->target == otherPC->object());
@@ -1116,9 +1116,9 @@ void QQuickAnchorChanges::reverse(Reason reason)
         d->target->setY(d->origY);
 }
 
-QString QQuickAnchorChanges::typeName() const
+QDeclarativeActionEvent::EventType QQuickAnchorChanges::type() const
 {
-    return QLatin1String("AnchorChanges");
+    return AnchorChanges;
 }
 
 QList<QDeclarativeAction> QQuickAnchorChanges::additionalActions()
@@ -1278,7 +1278,7 @@ void QQuickAnchorChanges::clearBindings()
 
 bool QQuickAnchorChanges::override(QDeclarativeActionEvent*other)
 {
-    if (other->typeName() != QLatin1String("AnchorChanges"))
+    if (other->type() != AnchorChanges)
         return false;
     if (static_cast<QDeclarativeActionEvent*>(this) == other)
         return true;
diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h
index 91a1c33ffd..328beab7dd 100644
--- a/src/quick/items/qquickstateoperations_p.h
+++ b/src/quick/items/qquickstateoperations_p.h
@@ -111,7 +111,7 @@ public:
     virtual void execute(Reason reason = ActualChange);
     virtual bool isReversable();
     virtual void reverse(Reason reason = ActualChange);
-    virtual QString typeName() const;
+    virtual EventType type() const;
     virtual bool override(QDeclarativeActionEvent*other);
     virtual void rewind();
     virtual void saveCurrentValues();
@@ -247,7 +247,7 @@ public:
     virtual void execute(Reason reason = ActualChange);
     virtual bool isReversable();
     virtual void reverse(Reason reason = ActualChange);
-    virtual QString typeName() const;
+    virtual EventType type() const;
     virtual bool override(QDeclarativeActionEvent*other);
     virtual bool changesBindings();
     virtual void saveOriginals();