From dba0611175c8d4a56dfbc918ccef139351e5c3e0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
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/popups/beingpopup.h       | 2 +-
 src/gui/popups/createpartypopup.h | 4 ++--
 src/gui/popups/itempopup.h        | 4 ++--
 src/gui/popups/popupmenu.h        | 6 +++---
 src/gui/popups/skillpopup.h       | 4 ++--
 src/gui/popups/speechbubble.h     | 2 +-
 src/gui/popups/spellpopup.h       | 4 ++--
 src/gui/popups/statuspopup.h      | 2 +-
 src/gui/popups/textboxpopup.h     | 4 ++--
 src/gui/popups/textpopup.h        | 4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/gui/popups')

diff --git a/src/gui/popups/beingpopup.h b/src/gui/popups/beingpopup.h
index e48daedf6..8a11e1e10 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() final;
+        void postInit() override final;
 
 #ifdef USE_PROFILER
         void logic();
diff --git a/src/gui/popups/createpartypopup.h b/src/gui/popups/createpartypopup.h
index d5d483e54..dba59f142 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() final
+        void postInit() override 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) final
+                        MouseEvent *event A_UNUSED) override final
         {
             if (link == "guild" && socialWindow)
             {
diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h
index 2fe51f248..f862d2754 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() final;
+        void postInit() override 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) final;
+        void mouseMoved(MouseEvent &event) override final;
 
         void resetPopup();
 
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index b938c161e..b69a0f588 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() final;
+        void postInit() override 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) final;
+                        MouseEvent *event A_UNUSED) override final;
 
-        void clear() final;
+        void clear() override final;
 
         void moveUp();
 
diff --git a/src/gui/popups/skillpopup.h b/src/gui/popups/skillpopup.h
index 4442b7916..ab170002f 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() final;
+        void postInit() override 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) final;
+        void mouseMoved(MouseEvent &event) override final;
 
     private:
         Label *mSkillName A_NONNULLPOINTER;
diff --git a/src/gui/popups/speechbubble.h b/src/gui/popups/speechbubble.h
index 95cfd9bda..75cd95219 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() final;
+        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 aa61b3d11..f71ced7c1 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() final;
+        void postInit() override 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) final;
+        void mouseMoved(MouseEvent &event) override final;
 
     private:
         Label *mItemName A_NONNULLPOINTER;
diff --git a/src/gui/popups/statuspopup.h b/src/gui/popups/statuspopup.h
index fc4b92c0a..3807eb53e 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() final;
+        void postInit() override final;
 
         /**
          * Destructor. Cleans up the item popup on deletion.
diff --git a/src/gui/popups/textboxpopup.h b/src/gui/popups/textboxpopup.h
index 4746d966a..daf287343 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() final;
+        void postInit() override final;
 
         /**
          * Sets the text to be displayed.
          */
         void show(const int x, const int y, const std::string &str);
 
-        void mouseMoved(MouseEvent &event) final;
+        void mouseMoved(MouseEvent &event) override final;
 
     private:
         TextBox *mTextBox A_NONNULLPOINTER;
diff --git a/src/gui/popups/textpopup.h b/src/gui/popups/textpopup.h
index 7294cb2a5..c5d5deba7 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() final;
+        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(MouseEvent &event) final;
+        void mouseMoved(MouseEvent &event) override final;
 
     private:
         Label *mText[TEXTPOPUPCOUNT];
-- 
cgit v1.2.3-60-g2f50