Disambiguate QQuickStateActionEvent::override

Don't use override as function name, may create confusion with the
official override specifier since C++11

Rename method to QQuickStateActionEvent::mayOverride

Change-Id: I1f34ec1127cc3e7c529b7e0aa3272fbfed553fa1
Reviewed-by: Lars Knoll <[email protected]>

5 files changed, 9 insertions, 9 deletions

diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp
index a4ce13a199..386bb058b5 100644
--- a/src/quick/items/qquickstateoperations.cpp
+++ b/src/quick/items/qquickstateoperations.cpp
@@ -510,7 +510,7 @@ QQuickStateActionEvent::EventType QQuickParentChange::type() const
     return ParentChange;
 }
 
-bool QQuickParentChange::override(QQuickStateActionEvent*other)
+bool QQuickParentChange::mayOverride(QQuickStateActionEvent*other)
 {
     Q_D(QQuickParentChange);
     if (other->type() != ParentChange)
@@ -1302,7 +1302,7 @@ void QQuickAnchorChanges::clearBindings()
     }
 }
 
-bool QQuickAnchorChanges::override(QQuickStateActionEvent*other)
+bool QQuickAnchorChanges::mayOverride(QQuickStateActionEvent*other)
 {
     if (other->type() != AnchorChanges)
         return false;
diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h
index e9ca03a6bc..d61ed294cb 100644
--- a/src/quick/items/qquickstateoperations_p.h
+++ b/src/quick/items/qquickstateoperations_p.h
@@ -118,7 +118,7 @@ public:
     bool isReversable() override;
     void reverse() override;
     EventType type() const override;
-    bool override(QQuickStateActionEvent*other) override;
+    bool mayOverride(QQuickStateActionEvent*other) override;
     void rewind() override;
     void saveCurrentValues() override;
 };
@@ -201,7 +201,7 @@ public:
     bool isReversable() override;
     void reverse() override;
     EventType type() const override;
-    bool override(QQuickStateActionEvent*other) override;
+    bool mayOverride(QQuickStateActionEvent*other) override;
     bool changesBindings() override;
     void saveOriginals() override;
     bool needsCopy() override { return true; }
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index 61380b3ea0..4a9b4a95c1 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -180,7 +180,7 @@ public:
         rewindExpression = QQmlPropertyPrivate::signalExpression(property);
     }
 
-    bool override(QQuickStateActionEvent *other) override {
+    bool mayOverride(QQuickStateActionEvent *other) override {
         if (other == this)
             return true;
         if (other->type() != type())
diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp
index 0a49d41491..65e51feb81 100644
--- a/src/quick/util/qquickstate.cpp
+++ b/src/quick/util/qquickstate.cpp
@@ -106,7 +106,7 @@ void QQuickStateActionEvent::clearBindings()
 {
 }
 
-bool QQuickStateActionEvent::override(QQuickStateActionEvent *other)
+bool QQuickStateActionEvent::mayOverride(QQuickStateActionEvent *other)
 {
     Q_UNUSED(other);
     return false;
@@ -574,7 +574,7 @@ void QQuickState::apply(QQuickTransition *trans, QQuickState *revert)
             for (int jj = 0; jj < d->revertList.count(); ++jj) {
                 QQuickStateActionEvent *event = d->revertList.at(jj).event();
                 if (event && event->type() == action.event->type()) {
-                    if (action.event->override(event)) {
+                    if (action.event->mayOverride(event)) {
                         found = true;
 
                         if (action.event != d->revertList.at(jj).event() && action.event->needsCopy()) {
@@ -636,7 +636,7 @@ void QQuickState::apply(QQuickTransition *trans, QQuickState *revert)
             for (int jj = 0; !found && jj < applyList.count(); ++jj) {
                 const QQuickStateAction &action = applyList.at(jj);
                 if (action.event && action.event->type() == event->type()) {
-                    if (action.event->override(event))
+                    if (action.event->mayOverride(event))
                         found = true;
                 }
             }
diff --git a/src/quick/util/qquickstate_p.h b/src/quick/util/qquickstate_p.h
index 7d22ca9f8c..ac720f4189 100644
--- a/src/quick/util/qquickstate_p.h
+++ b/src/quick/util/qquickstate_p.h
@@ -115,7 +115,7 @@ public:
 
     virtual bool changesBindings();
     virtual void clearBindings();
-    virtual bool override(QQuickStateActionEvent*other);
+    virtual bool mayOverride(QQuickStateActionEvent*other);
 };
 
 //### rename to QQuickStateChange?