diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-21 12:23:08 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-25 08:27:47 +0000 |
| commit | 84bb134397f9a48b1b5bd57d24e5c0410290e2ce (patch) | |
| tree | d88a29ec2936e2ef7ad9773c1c0137fe765d14ea /src/quick/items/qquickstateoperations_p.h | |
| parent | 681f93c74d7d60dc1998d3124e1f59ddc0f476ee (diff) | |
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 <lars.knoll@qt.io>
Diffstat (limited to 'src/quick/items/qquickstateoperations_p.h')
| -rw-r--r-- | src/quick/items/qquickstateoperations_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |