From dba0611175c8d4a56dfbc918ccef139351e5c3e0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Apr 2016 23:06:06 +0300 Subject: Revert "Remove override keyword, if it present with final." This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d. --- src/gui/viewport.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/gui/viewport.h') diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 9a1bbeccd..d189b2415 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -76,14 +76,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, @@ -97,27 +97,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. -- cgit v1.2.3-60-g2f50