diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-10-24 12:17:17 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-10-24 12:17:17 +0300 |
commit | d6fbc25d16e3f96a20c492904a0dab16f8b4d8fb (patch) | |
tree | a2cec0346050bd47660b33654ec05bd85141af3d | |
parent | 10be802d2640bad75222736216cdcfcd7fb6a521 (diff) | |
download | manaverse-d6fbc25d16e3f96a20c492904a0dab16f8b4d8fb.tar.gz manaverse-d6fbc25d16e3f96a20c492904a0dab16f8b4d8fb.tar.bz2 manaverse-d6fbc25d16e3f96a20c492904a0dab16f8b4d8fb.tar.xz manaverse-d6fbc25d16e3f96a20c492904a0dab16f8b4d8fb.zip |
add final keyword to gui files.
-rw-r--r-- | src/gui/focushandler.h | 13 | ||||
-rw-r--r-- | src/gui/popups/beingpopup.h | 2 | ||||
-rw-r--r-- | src/gui/popups/itempopup.h | 4 | ||||
-rw-r--r-- | src/gui/popups/popupmenu.h | 8 | ||||
-rw-r--r-- | src/gui/popups/speechbubble.h | 2 | ||||
-rw-r--r-- | src/gui/popups/spellpopup.h | 4 | ||||
-rw-r--r-- | src/gui/popups/statuspopup.h | 2 | ||||
-rw-r--r-- | src/gui/popups/textpopup.h | 4 | ||||
-rw-r--r-- | src/gui/sdlfont.h | 7 | ||||
-rw-r--r-- | src/gui/sdlinput.h | 10 | ||||
-rw-r--r-- | src/gui/theme.h | 2 | ||||
-rw-r--r-- | src/gui/userpalette.h | 4 | ||||
-rw-r--r-- | src/gui/viewport.h | 14 | ||||
-rw-r--r-- | src/gui/windowmenu.h | 12 |
14 files changed, 45 insertions, 43 deletions
diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h index 5965ff5ce..de61db3c4 100644 --- a/src/gui/focushandler.h +++ b/src/gui/focushandler.h @@ -48,30 +48,31 @@ class FocusHandler final : public gcn::FocusHandler * then that widget loses modal focus and will regain it after this * widget releases his modal focus. */ - void requestModalFocus(gcn::Widget *widget) override; + void requestModalFocus(gcn::Widget *widget) override final; /** * Releases modal focus of a widget. When this widget had modal focus * and there are other widgets that had also requested modal focus, * then modal focus will be transfered to the last of those. */ - void releaseModalFocus(gcn::Widget *widget) override; + void releaseModalFocus(gcn::Widget *widget) override final; /** * Removes a widget from the focus handler. Also makes sure no dangling * pointers remain in modal focus stack. */ - void remove(gcn::Widget *widget) override; + void remove(gcn::Widget *widget) override final; /** * Overloaded to allow windows to move to the top when one of their * widgets is tabbed to when tabbing through focusable elements. */ - void tabNext() override; + void tabNext() override final; - void tabPrevious() override; + void tabPrevious() override final; - void distributeFocusGainedEvent(const gcn::Event &focusEvent) override; + void distributeFocusGainedEvent(const gcn::Event &focusEvent) + override final; private: /** diff --git a/src/gui/popups/beingpopup.h b/src/gui/popups/beingpopup.h index 3b5a2d421..cf9291db1 100644 --- a/src/gui/popups/beingpopup.h +++ b/src/gui/popups/beingpopup.h @@ -50,7 +50,7 @@ class BeingPopup final : public Popup */ void show(const int x, const int y, Being *const b); - void postInit() override; + void postInit() override final; #ifdef USE_PROFILER void logic(); diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h index 4902a97b0..4a4eca008 100644 --- a/src/gui/popups/itempopup.h +++ b/src/gui/popups/itempopup.h @@ -50,7 +50,7 @@ class ItemPopup final : public Popup */ ~ItemPopup(); - void postInit() override; + void postInit() override final; /** * Sets the info to be displayed given a particular item. @@ -60,7 +60,7 @@ class ItemPopup final : public Popup void setItem(const Item *const item, const bool showImage = false); - void mouseMoved(gcn::MouseEvent &mouseEvent) override; + void mouseMoved(gcn::MouseEvent &mouseEvent) override final; private: Label *mItemName; diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h index 41c976c6e..56ecb860b 100644 --- a/src/gui/popups/popupmenu.h +++ b/src/gui/popups/popupmenu.h @@ -54,7 +54,7 @@ class RenameListener final : public gcn::ActionListener A_DELETE_COPY(RenameListener) - void action(const gcn::ActionEvent &event) override; + void action(const gcn::ActionEvent &event) override final; void setMapItem(MapItem *const mapItem); @@ -74,7 +74,7 @@ class PlayerListener : public gcn::ActionListener A_DELETE_COPY(PlayerListener) - void action(const gcn::ActionEvent &event) override; + void action(const gcn::ActionEvent &event) override final; void setNick(std::string name) { mNick = name; } @@ -104,7 +104,7 @@ class PopupMenu final : public Popup, public LinkHandler A_DELETE_COPY(PopupMenu) - void postInit() override; + void postInit() override final; /** * Shows the being related popup menu at the specified mouse coords. @@ -187,7 +187,7 @@ class PopupMenu final : public Popup, public LinkHandler * Handles link action. */ void handleLink(const std::string &link, - gcn::MouseEvent *event A_UNUSED) override; + gcn::MouseEvent *event A_UNUSED) override final; void clear(); diff --git a/src/gui/popups/speechbubble.h b/src/gui/popups/speechbubble.h index 281603db3..6b7c705bb 100644 --- a/src/gui/popups/speechbubble.h +++ b/src/gui/popups/speechbubble.h @@ -41,7 +41,7 @@ class SpeechBubble final : public Popup A_DELETE_COPY(SpeechBubble) - void postInit() override; + void postInit() override final; /** * Sets the name displayed for the speech bubble, and in what color. diff --git a/src/gui/popups/spellpopup.h b/src/gui/popups/spellpopup.h index 9c059c954..faac5b355 100644 --- a/src/gui/popups/spellpopup.h +++ b/src/gui/popups/spellpopup.h @@ -48,7 +48,7 @@ class SpellPopup final : public Popup */ ~SpellPopup(); - void postInit() override; + void postInit() override final; /** * Sets the info to be displayed given a particular item. @@ -60,7 +60,7 @@ class SpellPopup final : public Popup */ void view(const int x, const int y); - void mouseMoved(gcn::MouseEvent &mouseEvent) override; + void mouseMoved(gcn::MouseEvent &mouseEvent) override final; private: Label *mItemName; diff --git a/src/gui/popups/statuspopup.h b/src/gui/popups/statuspopup.h index b8fb05f0e..40890325e 100644 --- a/src/gui/popups/statuspopup.h +++ b/src/gui/popups/statuspopup.h @@ -45,7 +45,7 @@ class StatusPopup final : public Popup A_DELETE_COPY(StatusPopup) - void postInit() override; + void postInit() override final; /** * Destructor. Cleans up the item popup on deletion. diff --git a/src/gui/popups/textpopup.h b/src/gui/popups/textpopup.h index d57b17faf..cca690e35 100644 --- a/src/gui/popups/textpopup.h +++ b/src/gui/popups/textpopup.h @@ -48,7 +48,7 @@ class TextPopup final : public Popup */ ~TextPopup(); - void postInit() override; + void postInit() override final; /** * Sets the text to be displayed. @@ -72,7 +72,7 @@ class TextPopup final : public Popup void show(const int x, const int y, const std::string &str1, const std::string &str2, const std::string &str3); - void mouseMoved(gcn::MouseEvent &mouseEvent) override; + void mouseMoved(gcn::MouseEvent &mouseEvent) override final; private: Label *mText[TEXTPOPUPCOUNT]; diff --git a/src/gui/sdlfont.h b/src/gui/sdlfont.h index 55dafe744..58a22871f 100644 --- a/src/gui/sdlfont.h +++ b/src/gui/sdlfont.h @@ -121,9 +121,10 @@ class SDLFont final : public gcn::Font const int size, const int style = 0); - int getWidth(const std::string &text) const override A_WARN_UNUSED; + int getWidth(const std::string &text) const override + final A_WARN_UNUSED; - int getHeight() const override A_WARN_UNUSED; + int getHeight() const override final A_WARN_UNUSED; const TextChunkList *getCache() const A_WARN_UNUSED; @@ -132,7 +133,7 @@ class SDLFont final : public gcn::Font */ void drawString(gcn::Graphics *const graphics, const std::string &text, - const int x, const int y) override; + const int x, const int y) override final; void clear(); diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h index 77e8ea8db..368367bd2 100644 --- a/src/gui/sdlinput.h +++ b/src/gui/sdlinput.h @@ -152,21 +152,21 @@ public: * only use SDL and plan sticking with SDL you can safely ignore this * function as it in the SDL case does nothing. */ - void _pollInput() override + void _pollInput() override final { } KeyInput dequeueKeyInput2() A_WARN_UNUSED; - gcn::KeyInput dequeueKeyInput() override A_WARN_UNUSED + gcn::KeyInput dequeueKeyInput() override final A_WARN_UNUSED { return gcn::KeyInput(); } // Inherited from Input - bool isKeyQueueEmpty() override A_WARN_UNUSED; + bool isKeyQueueEmpty() override final A_WARN_UNUSED; - bool isMouseQueueEmpty() override A_WARN_UNUSED; + bool isMouseQueueEmpty() override final A_WARN_UNUSED; - gcn::MouseInput dequeueMouseInput() override A_WARN_UNUSED; + gcn::MouseInput dequeueMouseInput() override final A_WARN_UNUSED; MouseInput dequeueMouseInput2() A_WARN_UNUSED; diff --git a/src/gui/theme.h b/src/gui/theme.h index 5ff94ca77..3ccd35265 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -463,7 +463,7 @@ class Theme final : public Palette, public ConfigListener */ void setMinimumOpacity(const float minimumOpacity); - void optionChanged(const std::string &) override; + void optionChanged(const std::string &) override final; void loadRect(ImageRect &image, const std::string &name, const std::string &name2, const int start = 0, diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h index bb3a151ef..32cc9d963 100644 --- a/src/gui/userpalette.h +++ b/src/gui/userpalette.h @@ -155,7 +155,7 @@ class UserPalette final : public Palette, public gcn::ListModel * * @return the number of colors known */ - inline int getNumberOfElements() override A_WARN_UNUSED + inline int getNumberOfElements() override final A_WARN_UNUSED { return static_cast<int>(mColors.size()); } /** @@ -165,7 +165,7 @@ class UserPalette final : public Palette, public gcn::ListModel * * @return the name of the color */ - std::string getElementAt(int i) override A_WARN_UNUSED; + std::string getElementAt(int i) override final A_WARN_UNUSED; /** * Commit the colors diff --git a/src/gui/viewport.h b/src/gui/viewport.h index b47716ac2..8827bd52f 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -83,12 +83,12 @@ class Viewport final : public WindowContainer, /** * Draws the viewport. */ - void draw(gcn::Graphics *graphics) override; + void draw(gcn::Graphics *graphics) override final; /** * Implements player to keep following mouse. */ - void logic() override; + void logic() override final; /** * Toggles whether the path debug graphics are shown. normal, @@ -102,22 +102,22 @@ class Viewport final : public WindowContainer, /** * Handles mouse press on map. */ - void mousePressed(gcn::MouseEvent &event) override; + void mousePressed(gcn::MouseEvent &event) override final; /** * Handles mouse move on map */ - void mouseDragged(gcn::MouseEvent &event) override; + void mouseDragged(gcn::MouseEvent &event) override final; /** * Handles mouse button release on map. */ - void mouseReleased(gcn::MouseEvent &event) override; + void mouseReleased(gcn::MouseEvent &event) override final; /** * Handles mouse move on map. */ - void mouseMoved(gcn::MouseEvent &event) override; + void mouseMoved(gcn::MouseEvent &event) override final; /** * Shows a popup for an item. @@ -197,7 +197,7 @@ class Viewport final : public WindowContainer, /** * A relevant config option changed. */ - void optionChanged(const std::string &name) override; + void optionChanged(const std::string &name) override final; /** * Returns camera x offset in pixels. diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h index 8519a17ba..2fbd3a0c8 100644 --- a/src/gui/windowmenu.h +++ b/src/gui/windowmenu.h @@ -88,13 +88,13 @@ class WindowMenu final : public Container, ~WindowMenu(); - void action(const gcn::ActionEvent &event) override; + void action(const gcn::ActionEvent &event) override final; - void mousePressed(gcn::MouseEvent &event) override; + void mousePressed(gcn::MouseEvent &event) override final; - void mouseMoved(gcn::MouseEvent &event) override; + void mouseMoved(gcn::MouseEvent &event) override final; - void mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED) override; + void mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED) override final; std::map <std::string, ButtonInfo*> &getButtonNames() A_WARN_UNUSED { return mButtonNames; } @@ -111,14 +111,14 @@ class WindowMenu final : public Container, void saveButtons() const; - void optionChanged(const std::string &name) override; + void optionChanged(const std::string &name) override final; #ifdef USE_PROFILER void logicChildren(); #endif protected: - void drawChildren(gcn::Graphics* graphics) override; + void drawChildren(gcn::Graphics* graphics) override final; private: inline void addButton(const char *const text, |