From 84bb134397f9a48b1b5bd57d24e5c0410290e2ce Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Thu, 21 Sep 2017 12:23:08 +0200 Subject: 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 --- src/quick/items/qquickstateoperations_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quick/items/qquickstateoperations_p.h') 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; } -- cgit v1.2.3