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/gui/widgets/emoteshortcutcontainer.h | |
parent | 53530f76275df76406a9ce438a33df78c50d0948 (diff) | |
download | manaverse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz manaverse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2 manaverse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz manaverse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip |
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/gui/widgets/emoteshortcutcontainer.h')
-rw-r--r-- | src/gui/widgets/emoteshortcutcontainer.h | 18 |
1 files changed, 9 insertions, 9 deletions
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<const EmoteSprite*> mEmoteImg; |