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/widgets/emoteshortcutcontainer.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/gui/widgets/emoteshortcutcontainer.h') diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h index b98ffbb12..2ceb41430 100644 --- a/src/gui/widgets/emoteshortcutcontainer.h +++ b/src/gui/widgets/emoteshortcutcontainer.h @@ -50,37 +50,37 @@ class EmoteShortcutContainer final : public ShortcutContainer * Draws the items. */ void draw(Graphics *restrict graphics) - restrict2 final A_NONNULL(2); + restrict2 override final A_NONNULL(2); void safeDraw(Graphics *restrict graphics) - restrict2 final A_NONNULL(2); + restrict2 override final A_NONNULL(2); /** * Handles mouse when dragged. */ void mouseDragged(MouseEvent &restrict event) - restrict2 final A_CONST; + restrict2 override final A_CONST; /** * Handles mouse when pressed. */ - void mousePressed(MouseEvent &restrict event) restrict2 final; + void mousePressed(MouseEvent &restrict event) restrict2 override final; /** * Handles mouse release. */ void mouseReleased(MouseEvent &restrict event) - restrict2 final; + restrict2 override final; - void mouseMoved(MouseEvent &restrict event) restrict2 final; + void mouseMoved(MouseEvent &restrict event) restrict2 override final; - void mouseExited(MouseEvent &restrict event) restrict2 final; + void mouseExited(MouseEvent &restrict event) restrict2 override final; void widgetHidden(const Event &restrict event) - restrict2 final; + restrict2 override final; void setWidget2(const Widget2 *restrict const widget) - restrict2 final; + restrict2 override final; private: std::vector mEmoteImg; -- cgit v1.2.3-60-g2f50