diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:06 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:56 +0300 |
commit | dba0611175c8d4a56dfbc918ccef139351e5c3e0 (patch) | |
tree | b3c7a5684604facc0f0f5656fe373958c53dc5ad /src/dyetool | |
parent | 53530f76275df76406a9ce438a33df78c50d0948 (diff) | |
download | manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2 manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip |
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/dyetool')
-rw-r--r-- | src/dyetool/client.h | 2 | ||||
-rw-r--r-- | src/dyetool/gui/viewport.h | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/dyetool/client.h b/src/dyetool/client.h index 81b8b92cc..4a79a303e 100644 --- a/src/dyetool/client.h +++ b/src/dyetool/client.h @@ -74,7 +74,7 @@ class Client final : public ActionListener StateT getState() const A_WARN_UNUSED { return mState; } - void action(const ActionEvent &event) final; + void action(const ActionEvent &event) override final; void moveButtons(const int width); diff --git a/src/dyetool/gui/viewport.h b/src/dyetool/gui/viewport.h index e0238d4ce..e5159976b 100644 --- a/src/dyetool/gui/viewport.h +++ b/src/dyetool/gui/viewport.h @@ -69,14 +69,14 @@ class Viewport final : public WindowContainer, /** * Draws the viewport. */ - void draw(Graphics *const graphics) final A_NONNULL(2); + void draw(Graphics *const graphics) override final A_NONNULL(2); - void safeDraw(Graphics *const graphics) final A_NONNULL(2); + void safeDraw(Graphics *const graphics) override final A_NONNULL(2); /** * Implements player to keep following mouse. */ - void logic() final; + void logic() override final; /** * Toggles whether the path debug graphics are shown. normal, @@ -90,27 +90,27 @@ class Viewport final : public WindowContainer, /** * Handles mouse press on map. */ - void mousePressed(MouseEvent &event) final; + void mousePressed(MouseEvent &event) override final; /** * Handles mouse move on map */ - void mouseDragged(MouseEvent &event) final; + void mouseDragged(MouseEvent &event) override final; /** * Handles mouse button release on map. */ - void mouseReleased(MouseEvent &event) final; + void mouseReleased(MouseEvent &event) override final; /** * Handles mouse move on map. */ - void mouseMoved(MouseEvent &event) final; + void mouseMoved(MouseEvent &event) override final; /** * A relevant config option changed. */ - void optionChanged(const std::string &name) final; + void optionChanged(const std::string &name) override final; /** * Returns camera x offset in pixels. |