Get rid of QQuickStateActionEvent::Reason

This doesn't do anything useful anymore afaict now that bindings are
refcounted.

Change-Id: I829facaa1bd463f90653a4190f08f8d04f31a6a4
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

8 files changed, 18 insertions, 38 deletions

diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp
index 15f8eeab7b..ac7fbc24af 100644
--- a/src/quick/items/qquickstateoperations.cpp
+++ b/src/quick/items/qquickstateoperations.cpp
@@ -482,7 +482,7 @@ void QQuickParentChange::saveOriginals()
     saveCurrentValues();
 }*/
 
-void QQuickParentChange::execute(Reason)
+void QQuickParentChange::execute()
 {
     Q_D(QQuickParentChange);
     d->doChange(d->parent);
@@ -493,7 +493,7 @@ bool QQuickParentChange::isReversable()
     return true;
 }
 
-void QQuickParentChange::reverse(Reason)
+void QQuickParentChange::reverse()
 {
     Q_D(QQuickParentChange);
     d->doChange(d->origParent, d->origStackBefore);
@@ -937,10 +937,8 @@ void QQuickAnchorChanges::setObject(QQuickItem *target)
     \endqml
 */
 
-void QQuickAnchorChanges::execute(Reason reason)
+void QQuickAnchorChanges::execute()
 {
-    Q_UNUSED(reason);
-
     Q_D(QQuickAnchorChanges);
     if (!d->target)
         return;
@@ -1035,7 +1033,7 @@ bool QQuickAnchorChanges::isReversable()
     return true;
 }
 
-void QQuickAnchorChanges::reverse(Reason reason)
+void QQuickAnchorChanges::reverse()
 {
     Q_D(QQuickAnchorChanges);
     if (!d->target)
@@ -1046,44 +1044,30 @@ void QQuickAnchorChanges::reverse(Reason reason)
     if (d->leftBinding) {
         targetPrivate->anchors()->resetLeft();
         QQmlPropertyPrivate::removeBinding(d->leftBinding.data());
-        if (reason == ActualChange)
-            d->leftBinding = 0;
     }
     if (d->rightBinding) {
         targetPrivate->anchors()->resetRight();
         QQmlPropertyPrivate::removeBinding(d->rightBinding.data());
-        if (reason == ActualChange)
-            d->rightBinding = 0;
     }
     if (d->hCenterBinding) {
         targetPrivate->anchors()->resetHorizontalCenter();
         QQmlPropertyPrivate::removeBinding(d->hCenterBinding.data());
-        if (reason == ActualChange)
-            d->hCenterBinding = 0;
     }
     if (d->topBinding) {
         targetPrivate->anchors()->resetTop();
         QQmlPropertyPrivate::removeBinding(d->topBinding.data());
-        if (reason == ActualChange)
-            d->topBinding = 0;
     }
     if (d->bottomBinding) {
         targetPrivate->anchors()->resetBottom();
         QQmlPropertyPrivate::removeBinding(d->bottomBinding.data());
-        if (reason == ActualChange)
-            d->bottomBinding = 0;
     }
     if (d->vCenterBinding) {
         targetPrivate->anchors()->resetVerticalCenter();
         QQmlPropertyPrivate::removeBinding(d->vCenterBinding.data());
-        if (reason == ActualChange)
-            d->vCenterBinding = 0;
     }
     if (d->baselineBinding) {
         targetPrivate->anchors()->resetBaseline();
         QQmlPropertyPrivate::removeBinding(d->baselineBinding.data());
-        if (reason == ActualChange)
-            d->baselineBinding = 0;
     }
 
     //restore previous anchors
diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h
index 8d4231c5fa..1999e23a83 100644
--- a/src/quick/items/qquickstateoperations_p.h
+++ b/src/quick/items/qquickstateoperations_p.h
@@ -97,9 +97,9 @@ public:
 
     void saveOriginals() Q_DECL_OVERRIDE;
     //virtual void copyOriginals(QQuickStateActionEvent*);
-    void execute(Reason reason = ActualChange) Q_DECL_OVERRIDE;
+    void execute() Q_DECL_OVERRIDE;
     bool isReversable() Q_DECL_OVERRIDE;
-    void reverse(Reason reason = ActualChange) Q_DECL_OVERRIDE;
+    void reverse() Q_DECL_OVERRIDE;
     EventType type() const Q_DECL_OVERRIDE;
     bool override(QQuickStateActionEvent*other) Q_DECL_OVERRIDE;
     void rewind() Q_DECL_OVERRIDE;
@@ -180,9 +180,9 @@ public:
     QQuickItem *object() const;
     void setObject(QQuickItem *);
 
-    void execute(Reason reason = ActualChange) Q_DECL_OVERRIDE;
+    void execute() Q_DECL_OVERRIDE;
     bool isReversable() Q_DECL_OVERRIDE;
-    void reverse(Reason reason = ActualChange) Q_DECL_OVERRIDE;
+    void reverse() Q_DECL_OVERRIDE;
     EventType type() const Q_DECL_OVERRIDE;
     bool override(QQuickStateActionEvent*other) Q_DECL_OVERRIDE;
     bool changesBindings() Q_DECL_OVERRIDE;
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index bb8b5250a0..58d78a5d84 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -145,12 +145,12 @@ public:
     QQmlBoundSignalExpressionPointer reverseExpression;
     QQmlBoundSignalExpressionPointer rewindExpression;
 
-    virtual void execute(Reason) {
+    virtual void execute() {
         QQmlPropertyPrivate::setSignalExpression(property, expression);
     }
 
     virtual bool isReversable() { return true; }
-    virtual void reverse(Reason) {
+    virtual void reverse() {
         QQmlPropertyPrivate::setSignalExpression(property, reverseExpression);
     }
 
diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp
index c018399396..be676680a6 100644
--- a/src/quick/util/qquickstate.cpp
+++ b/src/quick/util/qquickstate.cpp
@@ -78,7 +78,7 @@ QQuickStateActionEvent::~QQuickStateActionEvent()
 {
 }
 
-void QQuickStateActionEvent::execute(Reason)
+void QQuickStateActionEvent::execute()
 {
 }
 
@@ -87,7 +87,7 @@ bool QQuickStateActionEvent::isReversable()
     return false;
 }
 
-void QQuickStateActionEvent::reverse(Reason)
+void QQuickStateActionEvent::reverse()
 {
 }
 
diff --git a/src/quick/util/qquickstate_p.h b/src/quick/util/qquickstate_p.h
index 26069caa34..1870b70626 100644
--- a/src/quick/util/qquickstate_p.h
+++ b/src/quick/util/qquickstate_p.h
@@ -81,13 +81,12 @@ public:
     virtual ~QQuickStateActionEvent();
 
     enum EventType { Script, SignalHandler, ParentChange, AnchorChanges };
-    enum Reason { ActualChange, FastForward };
 
     virtual EventType type() const = 0;
 
-    virtual void execute(Reason reason = ActualChange);
+    virtual void execute();
     virtual bool isReversable();
-    virtual void reverse(Reason reason = ActualChange);
+    virtual void reverse();
     virtual void saveOriginals() {}
     virtual bool needsCopy() { return false; }
     virtual void copyOriginals(QQuickStateActionEvent *) {}
diff --git a/src/quick/util/qquickstatechangescript.cpp b/src/quick/util/qquickstatechangescript.cpp
index 6d25b9791d..c276183d62 100644
--- a/src/quick/util/qquickstatechangescript.cpp
+++ b/src/quick/util/qquickstatechangescript.cpp
@@ -118,7 +118,7 @@ void QQuickStateChangeScript::setName(const QString &n)
     d->name = n;
 }
 
-void QQuickStateChangeScript::execute(Reason)
+void QQuickStateChangeScript::execute()
 {
     Q_D(QQuickStateChangeScript);
     if (!d->script.isEmpty()) {
diff --git a/src/quick/util/qquickstatechangescript_p.h b/src/quick/util/qquickstatechangescript_p.h
index 4ff6f0db3e..6c019a43d2 100644
--- a/src/quick/util/qquickstatechangescript_p.h
+++ b/src/quick/util/qquickstatechangescript_p.h
@@ -62,7 +62,7 @@ public:
     QString name() const;
     void setName(const QString &);
 
-    virtual void execute(Reason reason = ActualChange);
+    virtual void execute();
 };
 
 
diff --git a/src/quick/util/qquicktransitionmanager.cpp b/src/quick/util/qquicktransitionmanager.cpp
index 14480ac1bf..3992df993c 100644
--- a/src/quick/util/qquicktransitionmanager.cpp
+++ b/src/quick/util/qquicktransitionmanager.cpp
@@ -146,9 +146,6 @@ void QQuickTransitionManager::transition(const QList<QQuickStateAction> &list,
     //
     // This doesn't catch everything, and it might be a little fragile in
     // some cases - but whatcha going to do?
-    //
-    // Note that we only fast forward if both a transition and bindings are
-    // present, as it is unnecessary (and potentially expensive) otherwise.
 
     if (transition && !d->bindingsList.isEmpty()) {
 
@@ -161,9 +158,9 @@ void QQuickTransitionManager::transition(const QList<QQuickStateAction> &list,
                 QQmlPropertyPrivate::write(action.property, action.toValue, QQmlPropertyPrivate::BypassInterceptor | QQmlPropertyPrivate::DontRemoveBinding);
             } else if (action.event->isReversable()) {
                 if (action.reverseEvent)
-                    action.event->reverse(QQuickStateActionEvent::FastForward);
+                    action.event->reverse();
                 else
-                    action.event->execute(QQuickStateActionEvent::FastForward);
+                    action.event->execute();
             }
         }