diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-04-17 20:03:14 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-04-17 20:03:14 +0300 |
commit | 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d (patch) | |
tree | b1108bef76eed589fcb0028c4bd97f14510e940f /src/gui/popups | |
parent | 72b9b0b8b7f3e0b60bf7a926b44aaa589dd131e8 (diff) | |
download | mv-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.tar.gz mv-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.tar.bz2 mv-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.tar.xz mv-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.zip |
Remove override keyword, if it present with final.
Diffstat (limited to 'src/gui/popups')
-rw-r--r-- | src/gui/popups/beingpopup.h | 2 | ||||
-rw-r--r-- | src/gui/popups/createpartypopup.h | 4 | ||||
-rw-r--r-- | src/gui/popups/itempopup.h | 4 | ||||
-rw-r--r-- | src/gui/popups/popupmenu.h | 6 | ||||
-rw-r--r-- | src/gui/popups/skillpopup.h | 4 | ||||
-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/textboxpopup.h | 4 | ||||
-rw-r--r-- | src/gui/popups/textpopup.h | 4 |
10 files changed, 18 insertions, 18 deletions
diff --git a/src/gui/popups/beingpopup.h b/src/gui/popups/beingpopup.h index 8a11e1e10..e48daedf6 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 final; + void postInit() final; #ifdef USE_PROFILER void logic(); diff --git a/src/gui/popups/createpartypopup.h b/src/gui/popups/createpartypopup.h index dba59f142..d5d483e54 100644 --- a/src/gui/popups/createpartypopup.h +++ b/src/gui/popups/createpartypopup.h @@ -53,7 +53,7 @@ class CreatePartyPopup final : public Popup, mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); } - void postInit() override final + void postInit() final { Popup::postInit(); add(mBrowserBox); @@ -64,7 +64,7 @@ class CreatePartyPopup final : public Popup, A_DELETE_COPY(CreatePartyPopup) void handleLink(const std::string &link, - MouseEvent *event A_UNUSED) override final + MouseEvent *event A_UNUSED) final { if (link == "guild" && socialWindow) { diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h index f862d2754..2fe51f248 100644 --- a/src/gui/popups/itempopup.h +++ b/src/gui/popups/itempopup.h @@ -54,7 +54,7 @@ class ItemPopup final : public Popup */ ~ItemPopup(); - void postInit() override final; + void postInit() final; /** * Sets the info to be displayed given a particular item. @@ -68,7 +68,7 @@ class ItemPopup final : public Popup void setItem(const Item *const item, const bool showImage); - void mouseMoved(MouseEvent &event) override final; + void mouseMoved(MouseEvent &event) final; void resetPopup(); diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h index b69a0f588..b938c161e 100644 --- a/src/gui/popups/popupmenu.h +++ b/src/gui/popups/popupmenu.h @@ -72,7 +72,7 @@ class PopupMenu final : public Popup, public LinkHandler A_DELETE_COPY(PopupMenu) - void postInit() override final; + void postInit() final; /** * Shows the being related popup menu at the specified mouse coords. @@ -171,9 +171,9 @@ class PopupMenu final : public Popup, public LinkHandler * Handles link action. */ void handleLink(const std::string &link, - MouseEvent *event A_UNUSED) override final; + MouseEvent *event A_UNUSED) final; - void clear() override final; + void clear() final; void moveUp(); diff --git a/src/gui/popups/skillpopup.h b/src/gui/popups/skillpopup.h index ab170002f..4442b7916 100644 --- a/src/gui/popups/skillpopup.h +++ b/src/gui/popups/skillpopup.h @@ -49,7 +49,7 @@ class SkillPopup final : public Popup */ ~SkillPopup(); - void postInit() override final; + void postInit() final; /** * Sets the info to be displayed given a particular item. @@ -57,7 +57,7 @@ class SkillPopup final : public Popup void show(const SkillInfo *const skill, const int level); - void mouseMoved(MouseEvent &event) override final; + void mouseMoved(MouseEvent &event) final; private: Label *mSkillName A_NONNULLPOINTER; diff --git a/src/gui/popups/speechbubble.h b/src/gui/popups/speechbubble.h index 75cd95219..95cfd9bda 100644 --- a/src/gui/popups/speechbubble.h +++ b/src/gui/popups/speechbubble.h @@ -39,7 +39,7 @@ class SpeechBubble final : public Popup A_DELETE_COPY(SpeechBubble) - void postInit() override final; + void postInit() 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 f71ced7c1..aa61b3d11 100644 --- a/src/gui/popups/spellpopup.h +++ b/src/gui/popups/spellpopup.h @@ -47,7 +47,7 @@ class SpellPopup final : public Popup */ ~SpellPopup(); - void postInit() override final; + void postInit() final; /** * Sets the info to be displayed given a particular item. @@ -59,7 +59,7 @@ class SpellPopup final : public Popup */ void view(const int x, const int y); - void mouseMoved(MouseEvent &event) override final; + void mouseMoved(MouseEvent &event) final; private: Label *mItemName A_NONNULLPOINTER; diff --git a/src/gui/popups/statuspopup.h b/src/gui/popups/statuspopup.h index 3807eb53e..fc4b92c0a 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 final; + void postInit() final; /** * Destructor. Cleans up the item popup on deletion. diff --git a/src/gui/popups/textboxpopup.h b/src/gui/popups/textboxpopup.h index daf287343..4746d966a 100644 --- a/src/gui/popups/textboxpopup.h +++ b/src/gui/popups/textboxpopup.h @@ -46,14 +46,14 @@ class TextBoxPopup final : public Popup */ ~TextBoxPopup(); - void postInit() override final; + void postInit() final; /** * Sets the text to be displayed. */ void show(const int x, const int y, const std::string &str); - void mouseMoved(MouseEvent &event) override final; + void mouseMoved(MouseEvent &event) final; private: TextBox *mTextBox A_NONNULLPOINTER; diff --git a/src/gui/popups/textpopup.h b/src/gui/popups/textpopup.h index c5d5deba7..7294cb2a5 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 final; + void postInit() 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(MouseEvent &event) override final; + void mouseMoved(MouseEvent &event) final; private: Label *mText[TEXTPOPUPCOUNT]; |