Add missing override keywords.

73 files changed, 123 insertions, 120 deletions

diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index d14e4bf7d..0d9c8e41e 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -72,28 +72,29 @@ class AnimatedSprite final : public Sprite
         void draw(Graphics *const graphics,
                   const int posX, const int posY) const override final;
 
-        int getWidth() const A_WARN_UNUSED;
+        int getWidth() const override final A_WARN_UNUSED;
 
-        int getHeight() const A_WARN_UNUSED;
+        int getHeight() const override final A_WARN_UNUSED;
 
-        const Image* getImage() const A_WARN_UNUSED;
+        const Image* getImage() const override final A_WARN_UNUSED;
 
-        bool setSpriteDirection(const SpriteDirection::Type direction);
+        bool setSpriteDirection(const SpriteDirection::Type direction)
+                                override final;
 
         int getNumberOfLayers() const A_WARN_UNUSED
         { return 1; }
 
         std::string getIdPath() const A_WARN_UNUSED;
 
-        unsigned int getCurrentFrame() const A_WARN_UNUSED;
+        unsigned int getCurrentFrame() const override final A_WARN_UNUSED;
 
-        unsigned int getFrameCount() const A_WARN_UNUSED;
+        unsigned int getFrameCount() const override final A_WARN_UNUSED;
 
         void setAlpha(float alpha) override final;
 
         const void *getHash() const override final A_WARN_UNUSED;
 
-        bool updateNumber(const unsigned num);
+        bool updateNumber(const unsigned num) override final;
 
         void clearDelayLoad();
 
diff --git a/src/being/being.h b/src/being/being.h
index 12b197a23..b587a8d1f 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -169,13 +169,13 @@ class Being notfinal : public ActorSprite,
         /**
          * Returns the tile x coord
          */
-        int getTileX() const A_WARN_UNUSED
+        int getTileX() const override A_WARN_UNUSED
         { return mX; }
 
         /**
          * Returns the tile y coord
          */
-        int getTileY() const A_WARN_UNUSED
+        int getTileY() const override A_WARN_UNUSED
         { return mY; }
 
         /**
@@ -352,7 +352,7 @@ class Being notfinal : public ActorSprite,
         /**
          * Get the number of layers used to draw the being
          */
-        int getNumberOfLayers() const A_WARN_UNUSED
+        int getNumberOfLayers() const override A_WARN_UNUSED
         { return CompoundSprite::getNumberOfLayers(); }
 
         /**
@@ -387,14 +387,14 @@ class Being notfinal : public ActorSprite,
         TargetCursorSize::Size getTargetCursorSize() const override final
                                                      A_WARN_UNUSED;
 
-        int getTargetOffsetX() const A_WARN_UNUSED
+        int getTargetOffsetX() const override A_WARN_UNUSED
         {
             if (!mInfo)
                 return 0;
             return mInfo->getTargetOffsetX();
         }
 
-        int getTargetOffsetY() const A_WARN_UNUSED
+        int getTargetOffsetY() const override A_WARN_UNUSED
         {
             if (!mInfo)
                 return 0;
@@ -414,7 +414,7 @@ class Being notfinal : public ActorSprite,
         /**
          * Gets the way the monster blocks pathfinding for other objects
          */
-        BlockType::BlockType getBlockType() const A_WARN_UNUSED
+        BlockType::BlockType getBlockType() const override A_WARN_UNUSED
         {
             if (!mInfo)
                 return BlockType::NONE;
@@ -865,11 +865,11 @@ class Being notfinal : public ActorSprite,
          */
         void setPath(const Path &path);
 
-        int getSortPixelY() const A_WARN_UNUSED
+        int getSortPixelY() const override A_WARN_UNUSED
         { return static_cast<int>(mPos.y) - mYDiff - mSortOffsetY; }
 //        { return static_cast<int>(mPos.y) - mYDiff - mSortOffsetY + 16; }
 
-        void setMap(Map *const map);
+        void setMap(Map *const map) override;
 
         void recreateItemParticles();
 
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index bf342e8c3..9226c1806 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -281,7 +281,7 @@ class LocalPlayer final : public Being,
         /**
          * Sets the map the being is on
          */
-        void setMap(Map *const map);
+        void setMap(Map *const map) override final;
 
         void addMessageToQueue(const std::string &message,
                                const int color = UserPalette::EXP_INFO);
diff --git a/src/beingequipbackend.h b/src/beingequipbackend.h
index 7b953fa7a..a1d2119ae 100644
--- a/src/beingequipbackend.h
+++ b/src/beingequipbackend.h
@@ -36,9 +36,9 @@ class BeingEquipBackend final : public Equipment::Backend
 
         ~BeingEquipBackend();
 
-        Item *getEquipment(const int index) const A_WARN_UNUSED;
+        Item *getEquipment(const int index) const override final A_WARN_UNUSED;
 
-        void clear();
+        void clear() override final;
 
         void setEquipment(const int index, Item *const item);
 
diff --git a/src/client.cpp b/src/client.cpp
index ab2606ea5..ab0b65bcf 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -182,7 +182,7 @@ namespace
     class AccountListener final : public ActionListener
     {
         public:
-            void action(const ActionEvent &)
+            void action(const ActionEvent &) override final
             {
                 client->setState(STATE_CHAR_SELECT);
             }
@@ -191,7 +191,7 @@ namespace
     class LoginListener final : public ActionListener
     {
         public:
-            void action(const ActionEvent &)
+            void action(const ActionEvent &) override final
             {
                 client->setState(STATE_PRE_LOGIN);
             }
diff --git a/src/configuration.h b/src/configuration.h
index a89d67ea2..83a446f4e 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -290,7 +290,8 @@ class Configuration final : public ConfigurationObject
                             const unsigned line);
 #endif
 
-        void setValue(const std::string &key, const std::string &value);
+        void setValue(const std::string &key,
+                      const std::string &value) override;
 
         void incValue(const std::string &key);
 
diff --git a/src/eventsmanager.h b/src/eventsmanager.h
index 0e6b56455..6e6b1b517 100644
--- a/src/eventsmanager.h
+++ b/src/eventsmanager.h
@@ -54,7 +54,7 @@ class EventsManager final : public ConfigListener
         static void handleActive(const SDL_Event &event);
 #endif
 
-        void optionChanged(const std::string &name);
+        void optionChanged(const std::string &name) override final;
 
         static void logEvent(const SDL_Event &event);
 
diff --git a/src/gui/models/colorlistmodel.h b/src/gui/models/colorlistmodel.h
index 05f935c69..b50d5879d 100644
--- a/src/gui/models/colorlistmodel.h
+++ b/src/gui/models/colorlistmodel.h
@@ -65,12 +65,12 @@ class ColorListModel final : public ListModel
         ~ColorListModel()
         { }
 
-        int getNumberOfElements()
+        int getNumberOfElements() override final
         {
             return 14;
         }
 
-        std::string getElementAt(int i)
+        std::string getElementAt(int i) override final
         {
             if (i >= getNumberOfElements() || i < 0)
                 return "???";
diff --git a/src/gui/models/modelistmodel.h b/src/gui/models/modelistmodel.h
index 05b82b36d..233221f75 100644
--- a/src/gui/models/modelistmodel.h
+++ b/src/gui/models/modelistmodel.h
@@ -48,7 +48,7 @@ class ModeListModel final : public ListModel
         /**
          * Returns element from container.
          */
-        std::string getElementAt(int i)
+        std::string getElementAt(int i) override final
         { return mVideoModes[i]; }
 
         /**
diff --git a/src/gui/models/sortlistmodelbuy.h b/src/gui/models/sortlistmodelbuy.h
index 4e42e548e..f76263cef 100644
--- a/src/gui/models/sortlistmodelbuy.h
+++ b/src/gui/models/sortlistmodelbuy.h
@@ -51,10 +51,10 @@ class SortListModelBuy final : public ListModel
         ~SortListModelBuy()
         { }
 
-        int getNumberOfElements()
+        int getNumberOfElements() override final
         { return 7; }
 
-        std::string getElementAt(int i)
+        std::string getElementAt(int i) override final
         {
             if (i >= getNumberOfElements() || i < 0)
                 return "???";
diff --git a/src/gui/models/userstablemodel.h b/src/gui/models/userstablemodel.h
index 801ef3595..2f6201024 100644
--- a/src/gui/models/userstablemodel.h
+++ b/src/gui/models/userstablemodel.h
@@ -70,22 +70,22 @@ class UsersTableModel final : public TableModel,
             freeWidgets();
         }
 
-        int getRows() const
+        int getRows() const override final
         {
             return static_cast<int>(mPlayers.size());
         }
 
-        int getColumns() const
+        int getColumns() const override final
         {
             return COLUMNS_NR;
         }
 
-        int getRowHeight() const
+        int getRowHeight() const override final
         {
             return ROW_HEIGHT;
         }
 
-        int getColumnWidth(const int index) const
+        int getColumnWidth(const int index) const override final
         {
             if (index == NAME_COLUMN)
                 return NAME_COLUMN_WIDTH;
@@ -234,7 +234,8 @@ class UsersTableModel final : public TableModel,
         {
         }
 
-        Widget *getElementAt(const int row, const int column) const
+        Widget *getElementAt(const int row,
+                             const int column) const override final
         {
             return mWidgets[WIDGET_AT(row, column)];
         }
diff --git a/src/gui/popups/createpartypopup.h b/src/gui/popups/createpartypopup.h
index 82a220cec..ad44928e7 100644
--- a/src/gui/popups/createpartypopup.h
+++ b/src/gui/popups/createpartypopup.h
@@ -54,7 +54,7 @@ class CreatePartyPopup final : public Popup,
             mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel")));
         }
 
-        void postInit()
+        void postInit() override final
         {
             add(mBrowserBox);
             setContentSize(mBrowserBox->getWidth() + 8,
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index 0274d69a4..c6ca65f61 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -150,7 +150,7 @@ class PopupMenu final : public Popup, public LinkHandler
         void handleLink(const std::string &link,
                         MouseEvent *event A_UNUSED) override final;
 
-        void clear();
+        void clear() override final;
 
         void moveUp();
 
diff --git a/src/gui/widgets/basiccontainer.h b/src/gui/widgets/basiccontainer.h
index fc64e0cfb..fcbf7f6dd 100644
--- a/src/gui/widgets/basiccontainer.h
+++ b/src/gui/widgets/basiccontainer.h
@@ -108,7 +108,7 @@ class BasicContainer notfinal : public Widget,
           *               itself to be visible.
           * @param rectangle The rectangle to be visible.
           */
-        virtual void showWidgetPart(Widget *const widget, Rect area);
+        void showWidgetPart(Widget *const widget, Rect area) override;
 
         // Inherited from Widget
 
diff --git a/src/gui/widgets/basiccontainer2.h b/src/gui/widgets/basiccontainer2.h
index 9141550f5..60f4e69bb 100644
--- a/src/gui/widgets/basiccontainer2.h
+++ b/src/gui/widgets/basiccontainer2.h
@@ -140,18 +140,18 @@ class BasicContainer2: public BasicContainer
           *                   container.
           * @see add, clear
           */
-        virtual void remove(Widget* widget);
+        void remove(Widget* widget) override;
 
         /**
           * Clears the container of all widgets.
           *
           * @see add, remove
           */
-        virtual void clear();
+        void clear() override;
 
         // Inherited from Widget
 
-        virtual void draw(Graphics* graphics);
+        void draw(Graphics* graphics) override;
 
     protected:
         /**
diff --git a/src/gui/widgets/chatinput.h b/src/gui/widgets/chatinput.h
index 909b3449c..b1a22d3fb 100644
--- a/src/gui/widgets/chatinput.h
+++ b/src/gui/widgets/chatinput.h
@@ -54,7 +54,7 @@ class ChatInput final : public TextField
          * Called if the chat input loses focus. It will set itself to
          * invisible as result.
          */
-        void focusLost(const Event &event)
+        void focusLost(const Event &event) override final
         {
             TextField::focusLost(event);
             if (mFocusGaining || !config.getBoolValue("protectChatFocus"))
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 8100aa3fc..3b9e19a65 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -155,7 +155,7 @@ class GuiTable final : public Widget,
         // Constraints inherited from TableModelListener
         void modelUpdated(const bool completed) override final;
 
-        void requestFocus();
+        void requestFocus() override;
 
         void setSelectable(bool b)
         { mSelectable = b; }
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index c6038d7fe..d62b18914 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -72,7 +72,7 @@ class ItemShortcutContainer final : public ShortcutContainer
 
         void mouseMoved(MouseEvent &event) override final;
 
-        void setWidget2(const Widget2 *const widget);
+        void setWidget2(const Widget2 *const widget) override final;
 
     private:
         bool mItemClicked;
diff --git a/src/gui/widgets/selldialog.h b/src/gui/widgets/selldialog.h
index 88db5f76d..1d0bed7e1 100644
--- a/src/gui/widgets/selldialog.h
+++ b/src/gui/widgets/selldialog.h
@@ -107,7 +107,7 @@ class SellDialog notfinal : public Window,
          */
         static void closeAll();
 
-        void postInit();
+        void postInit() override;
 
     protected:
         typedef std::list<SellDialog*> DialogList;
diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h
index 982a779e4..387bde055 100644
--- a/src/gui/widgets/skilllistbox.h
+++ b/src/gui/widgets/skilllistbox.h
@@ -91,7 +91,7 @@ class SkillListBox final : public ListBox
             return static_cast<SkillModel*>(mListModel)->getSkillAt(selected);
         }
 
-        void draw(Graphics *graphics) override
+        void draw(Graphics *graphics) override final
         {
             if (!mListModel)
                 return;
@@ -164,7 +164,7 @@ class SkillListBox final : public ListBox
             }
         }
 
-        unsigned int getRowHeight() const override
+        unsigned int getRowHeight() const override final
         { return mRowHeight; }
 
         const SkillInfo *getSkillByEvent(const MouseEvent &event) const
@@ -178,7 +178,7 @@ class SkillListBox final : public ListBox
             return skill;
         }
 
-        void mouseMoved(MouseEvent &event) override
+        void mouseMoved(MouseEvent &event) override final
         {
             ListBox::mouseMoved(event);
             if (!viewport || !dragDrop.isEmpty())
@@ -189,7 +189,7 @@ class SkillListBox final : public ListBox
             mPopup->position(viewport->mMouseX, viewport->mMouseY);
         }
 
-        void mouseDragged(MouseEvent &event)
+        void mouseDragged(MouseEvent &event) override final
         {
             if (event.getButton() == MouseButton::LEFT)
             {
@@ -213,7 +213,7 @@ class SkillListBox final : public ListBox
             }
         }
 
-        void mousePressed(MouseEvent &event)
+        void mousePressed(MouseEvent &event) override final
         {
             ListBox::mousePressed(event);
             if (event.getButton() == MouseButton::LEFT)
@@ -226,12 +226,12 @@ class SkillListBox final : public ListBox
             }
         }
 
-        void mouseReleased(MouseEvent &event)
+        void mouseReleased(MouseEvent &event) override final
         {
             ListBox::mouseReleased(event);
         }
 
-        void mouseExited(MouseEvent &event A_UNUSED) override
+        void mouseExited(MouseEvent &event A_UNUSED) override final
         {
             mPopup->hide();
         }
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 618bda209..7c192dac9 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -224,7 +224,7 @@ class TabbedArea final : public ActionListener,
 
         void setDimension(const Rect &dimension);
 
-        void death(const Event &event);
+        void death(const Event &event) override final;
 
         void setResizeHeight(bool b)
         { mResizeHeight = b; }
diff --git a/src/gui/widgets/tabs/chat/partytab.h b/src/gui/widgets/tabs/chat/partytab.h
index bb7504bc2..7de669e7f 100644
--- a/src/gui/widgets/tabs/chat/partytab.h
+++ b/src/gui/widgets/tabs/chat/partytab.h
@@ -43,7 +43,7 @@ class PartyTab notfinal : public ChatTab,
 
         void playNewMessageSound() const override final;
 
-        void optionChanged(const std::string &value);
+        void optionChanged(const std::string &value) override final;
 
     protected:
         void handleInput(const std::string &msg) override final;
diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h
index 14ae74575..5a023be9f 100644
--- a/src/gui/widgets/tabs/setup_relations.h
+++ b/src/gui/widgets/tabs/setup_relations.h
@@ -56,9 +56,9 @@ class Setup_Relations final : public SetupTab,
 
         void action(const ActionEvent &event) override final;
 
-        void updatedPlayer(const std::string &name);
+        void updatedPlayer(const std::string &name) override final;
 
-        void updateAll();
+        void updateAll() override final;
 
         void externalUpdated() override final;
 
diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h
index 5f7a51005..8c2c2f590 100644
--- a/src/gui/widgets/tabs/setuptabscroll.h
+++ b/src/gui/widgets/tabs/setuptabscroll.h
@@ -67,7 +67,7 @@ class SetupTabScroll notfinal : public SetupTab
 
         void reread(const std::string &name);
 
-        void clear();
+        void clear() override final;
 
         const std::set<SetupItem*> &getAllItems() const
         { return mAllItems; }
diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h
index 1c63a8dde..4c966b2ca 100644
--- a/src/gui/widgets/tabs/socialguildtab.h
+++ b/src/gui/widgets/tabs/socialguildtab.h
@@ -134,7 +134,7 @@ class SocialGuildTab final : public SocialTab,
             mConfirmDialog->addActionListener(this);
         }
 
-        void buildCounter(const int online0, const int total0)
+        void buildCounter(const int online0, const int total0) override final
         {
             if (online0 || total0)
             {
diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h
index 39c114b1e..e17b97466 100644
--- a/src/gui/widgets/tabs/socialguildtab2.h
+++ b/src/gui/widgets/tabs/socialguildtab2.h
@@ -72,7 +72,7 @@ class SocialGuildTab2 final : public SocialTab,
         }
 
         void buildCounter(const int online0 A_UNUSED,
-                          const int total0 A_UNUSED)
+                          const int total0 A_UNUSED) override final
         {
             if (!localPlayer)
                 return;
diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h
index f04755c9a..83d29ec1b 100644
--- a/src/gui/widgets/tabs/socialpartytab.h
+++ b/src/gui/widgets/tabs/socialpartytab.h
@@ -135,7 +135,7 @@ class SocialPartyTab final : public SocialTab,
         }
 
         void buildCounter(const int online0 A_UNUSED,
-                          const int total0 A_UNUSED)
+                          const int total0 A_UNUSED) override final
         {
             if (!localPlayer)
                 return;
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index caff8fd53..e7d6977c7 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -224,7 +224,7 @@ class TextField notfinal : public Widget,
 
         void fixScroll();
 
-        void fontChanged();
+        void fontChanged() override;
 
         bool handleNormalKeys(const int action, bool &consumed);
 
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index 8d34a3317..6a0192a32 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -51,7 +51,7 @@ class VertContainer final : public Container,
 
         void add1(Widget *const widget, const int spacing = -1);
 
-        void clear();
+        void clear() override final;
 
         void widgetResized(const Event &event) override final;
 
diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h
index 1341688c5..dc85461f4 100644
--- a/src/gui/widgets/widgetgroup.h
+++ b/src/gui/widgets/widgetgroup.h
@@ -44,7 +44,7 @@ class WidgetGroup notfinal : public Container,
         virtual void add(Widget *const widget,
                          const int spacing);
 
-        virtual void clear();
+        void clear() override final;
 
         void widgetResized(const Event &event) override final;
 
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index b70a8b016..17db9778f 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -557,7 +557,7 @@ class Window notfinal : public BasicContainer2,
         bool isMovable() const
         { return mMovable; }
 
-        virtual Rect getChildrenArea();
+        Rect getChildrenArea() override;
 
         /**
          * Resizes the window to fit the content.
diff --git a/src/gui/windows/bankwindow.h b/src/gui/windows/bankwindow.h
index 92985e75c..f19f6c17f 100644
--- a/src/gui/windows/bankwindow.h
+++ b/src/gui/windows/bankwindow.h
@@ -52,7 +52,7 @@ class BankWindow final : public Window,
 
         void widgetShown(const Event &event) override final;
 
-        void bankMoneyChanged(const int money);
+        void bankMoneyChanged(const int money) override final;
 
     private:
         Label *mBankMoneyLabel;
diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h
index 78df8ebf8..56735baca 100644
--- a/src/gui/windows/buydialog.h
+++ b/src/gui/windows/buydialog.h
@@ -129,7 +129,7 @@ class BuyDialog final : public Window,
         /**
          * Sets the visibility of this window.
          */
-        void setVisible(bool visible);
+        void setVisible(bool visible) override final;
 
         void sort();
 
diff --git a/src/gui/windows/buyselldialog.h b/src/gui/windows/buyselldialog.h
index 57a46f8a9..14121715f 100644
--- a/src/gui/windows/buyselldialog.h
+++ b/src/gui/windows/buyselldialog.h
@@ -54,7 +54,7 @@ class BuySellDialog final : public Window,
 
         void init();
 
-        void setVisible(bool visible);
+        void setVisible(bool visible) override final;
 
         /**
          * Called when receiving actions from the widgets.
diff --git a/src/gui/windows/chardeleteconfirm.h b/src/gui/windows/chardeleteconfirm.h
index 06bc7db9c..326f39261 100644
--- a/src/gui/windows/chardeleteconfirm.h
+++ b/src/gui/windows/chardeleteconfirm.h
@@ -49,7 +49,7 @@ class CharDeleteConfirm final : public ConfirmDialog
 
         A_DELETE_COPY(CharDeleteConfirm)
 
-        void action(const ActionEvent &event)
+        void action(const ActionEvent &event) override final
         {
             if (event.getId() == "yes" && mMaster)
                 mMaster->askPasswordForDeletion(mIndex);
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 57ef51629..dd28ca74f 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -155,7 +155,7 @@ class ChatWindow final : public Window,
         void addItemText(const std::string &item);
 
         /** Override to reset mTmpVisible */
-        void setVisible(bool visible);
+        void setVisible(bool visible) override final;
 
         /**
          * Handles mouse when dragged.
diff --git a/src/gui/windows/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h
index 8ab9ea984..9d84a8256 100644
--- a/src/gui/windows/didyouknowwindow.h
+++ b/src/gui/windows/didyouknowwindow.h
@@ -63,7 +63,7 @@ class DidYouKnowWindow final : public Window,
 
         void loadData(int num = 0);
 
-        void setVisible(bool visible);
+        void setVisible(bool visible) override final;
 
     private:
         void loadFile(const int num);
diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h
index 119de9e94..209e9c171 100644
--- a/src/gui/windows/inventorywindow.h
+++ b/src/gui/windows/inventorywindow.h
@@ -128,9 +128,9 @@ class InventoryWindow final : public Window,
          * Closes the Storage Window, as well as telling the server that the
          * window has been closed.
          */
-        void close();
+        void close() override final;
 
-        void slotsChanged(Inventory *const inventory);
+        void slotsChanged(Inventory *const inventory) override final;
 
         bool isMainInventory() const A_WARN_UNUSED
         { return mInventory->isMainInventory(); }
diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h
index a82809730..8ce4f13c6 100644
--- a/src/gui/windows/itemamountwindow.h
+++ b/src/gui/windows/itemamountwindow.h
@@ -81,7 +81,7 @@ class ItemAmountWindow final : public Window,
         /**
          * Schedules the Item Amount window for deletion.
          */
-        void close();
+        void close() override final;
 
         void keyReleased(KeyEvent &event) override final;
 
diff --git a/src/gui/windows/minimap.h b/src/gui/windows/minimap.h
index 2c861e330..8d7ffc2a8 100644
--- a/src/gui/windows/minimap.h
+++ b/src/gui/windows/minimap.h
@@ -71,7 +71,7 @@ class Minimap final : public Window, public ConfigListener
 
         void screenToMap(int &x, int &y);
 
-        void optionChanged(const std::string &name);
+        void optionChanged(const std::string &name) override final;
 
     private:
         void deleteMapImage();
diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h
index 38e784ba9..548344728 100644
--- a/src/gui/windows/ministatuswindow.h
+++ b/src/gui/windows/ministatuswindow.h
@@ -67,7 +67,7 @@ class MiniStatusWindow final : public Window,
 
         void drawIcons(Graphics *const graphics);
 
-        void updateStatus();
+        void updateStatus() override final;
 
         void logic() override final;
 
@@ -98,7 +98,7 @@ class MiniStatusWindow final : public Window,
                          const int oldVal1,
                          const int oldVal2) override final;
 
-        void arrowsChanged();
+        void arrowsChanged() override final;
 
 #ifdef USE_PROFILER
         void logicChildren();
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index 8d04cb0d5..72a42701b 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -210,7 +210,7 @@ class NpcDialog final : public Window,
 
         void clearRows();
 
-        void mousePressed(MouseEvent &event);
+        void mousePressed(MouseEvent &event) override final;
 
         int isCloseState() const
         { return mActionState == NPC_ACTION_CLOSE; }
diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h
index 26860d117..d5f015e5d 100644
--- a/src/gui/windows/socialwindow.h
+++ b/src/gui/windows/socialwindow.h
@@ -129,9 +129,9 @@ class SocialWindow final : public Window,
 
         void updateGuildCounter(const int online = 0, const int total = 0);
 
-        void updatedPlayer(const std::string &name);
+        void updatedPlayer(const std::string &name) override final;
 
-        void updateAll();
+        void updateAll() override final;
 
 #ifdef USE_PROFILER
         void logicChildren();
diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h
index c774d521d..f08d88963 100644
--- a/src/gui/windows/tradewindow.h
+++ b/src/gui/windows/tradewindow.h
@@ -143,7 +143,7 @@ class TradeWindow final : public Window,
         /**
          * Clear auto trade items.
          */
-        void clear();
+        void clear() override final;
 
         /**
          * Add item what will be added to trade.
diff --git a/src/imagesprite.h b/src/imagesprite.h
index e185321c8..b5623a12a 100644
--- a/src/imagesprite.h
+++ b/src/imagesprite.h
@@ -55,7 +55,7 @@ class ImageSprite final : public Sprite
         int getHeight() const override final A_WARN_UNUSED
         { return mImage ? mImage->getHeight() : 0; }
 
-        const Image* getImage() const A_WARN_UNUSED
+        const Image* getImage() const override final A_WARN_UNUSED
         { return mImage; }
 
         bool setSpriteDirection(const SpriteDirection::Type
diff --git a/src/listeners/guiconfiglistener.h b/src/listeners/guiconfiglistener.h
index bd23707d7..9d1a4336c 100644
--- a/src/listeners/guiconfiglistener.h
+++ b/src/listeners/guiconfiglistener.h
@@ -45,7 +45,7 @@ class GuiConfigListener final : public ConfigListener
             CHECKLISTENERS
         }
 
-        void optionChanged(const std::string &name)
+        void optionChanged(const std::string &name) override final
         {
             if (!mGui)
                 return;
diff --git a/src/listeners/playerpostdeathlistener.h b/src/listeners/playerpostdeathlistener.h
index af459ea0e..015b8320e 100644
--- a/src/listeners/playerpostdeathlistener.h
+++ b/src/listeners/playerpostdeathlistener.h
@@ -43,7 +43,7 @@ extern OkDialog *deathNotice;
   */
 struct PlayerPostDeathListener final : public ActionListener
 {
-    void action(const ActionEvent &event A_UNUSED)
+    void action(const ActionEvent &event A_UNUSED) override final
     {
         if (playerHandler)
             playerHandler->respawn();
diff --git a/src/listeners/requesttradelistener.h b/src/listeners/requesttradelistener.h
index 662829e3e..b1f5ed620 100644
--- a/src/listeners/requesttradelistener.h
+++ b/src/listeners/requesttradelistener.h
@@ -44,7 +44,7 @@ extern ConfirmDialog *confirmDlg;
  */
 struct RequestTradeListener final : public ActionListener
 {
-    void action(const ActionEvent &event)
+    void action(const ActionEvent &event) override final
     {
         confirmDlg = nullptr;
         const std::string &eventId = event.getId();
diff --git a/src/listeners/weightlistener.h b/src/listeners/weightlistener.h
index f44d063bf..c24591065 100644
--- a/src/listeners/weightlistener.h
+++ b/src/listeners/weightlistener.h
@@ -36,7 +36,7 @@ extern OkDialog *weightNotice;
   */
 struct WeightListener final : public ActionListener
 {
-    void action(const ActionEvent &event A_UNUSED)
+    void action(const ActionEvent &event A_UNUSED) override final
     {
         weightNotice = nullptr;
     }
diff --git a/src/net/ea/equipbackend.h b/src/net/ea/equipbackend.h
index 3b3297315..5aa56bf6b 100644
--- a/src/net/ea/equipbackend.h
+++ b/src/net/ea/equipbackend.h
@@ -56,7 +56,7 @@ class EquipBackend final : public Equipment::Backend
                 return nullptr;
         }
 
-        void clear()
+        void clear() override final
         {
             Inventory *const inv = PlayerInfo::getInventory();
             if (!inv)
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index c8aadc514..9b2e85287 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -51,7 +51,7 @@ class InventoryHandler notfinal : public Net::InventoryHandler
 
         virtual ~InventoryHandler();
 
-        void clear();
+        void clear() override final;
 
         bool canSplit(const Item *const item) const
                       override final A_WARN_UNUSED;
@@ -89,7 +89,7 @@ class InventoryHandler notfinal : public Net::InventoryHandler
 
         void forgotStorage() override final;
 
-        Inventory *getStorage() const
+        Inventory *getStorage() const override final
         { return mStorage; }
 
     protected:
diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h
index 363e6aceb..7faf9b383 100644
--- a/src/net/eathena/adminhandler.h
+++ b/src/net/eathena/adminhandler.h
@@ -69,7 +69,7 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler
         void requestLogin(const Being *const being) const override final;
 
         void setTileType(const int x, const int y,
-                         const int type) const;
+                         const int type) const override final;
 
         void unequipAll(const Being *const being) const override final;
 
diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h
index 4b151c2b1..9f2df6089 100644
--- a/src/net/eathena/buysellhandler.h
+++ b/src/net/eathena/buysellhandler.h
@@ -37,7 +37,7 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler
 
         A_DELETE_COPY(BuySellHandler)
 
-        void handleMessage(Net::MessageIn &msg);
+        void handleMessage(Net::MessageIn &msg) override final;
 
         static void processNpcBuy(Net::MessageIn &msg);
 
diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h
index 0b424024a..b93b7f44a 100644
--- a/src/net/eathena/charserverhandler.h
+++ b/src/net/eathena/charserverhandler.h
@@ -70,7 +70,7 @@ class CharServerHandler final : public MessageHandler,
 
         void processChangeMapServer(Net::MessageIn &msg);
 
-        bool isNeedCreatePin() const A_WARN_UNUSED
+        bool isNeedCreatePin() const override final A_WARN_UNUSED
         { return mNeedCreatePin; }
 
         void setNewPincode(const std::string &pin) override final;
diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h
index 5925352f3..b2c37c9d7 100644
--- a/src/net/eathena/guildhandler.h
+++ b/src/net/eathena/guildhandler.h
@@ -71,7 +71,7 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
                           const std::string &restrict msg2)
                           const override final;
 
-        void checkMaster() const;
+        void checkMaster() const override final;
 
     protected:
         static void processGuildUpdateCoords(Net::MessageIn &msg);
diff --git a/src/net/eathena/messagein.h b/src/net/eathena/messagein.h
index b1aacb59d..1a674e129 100644
--- a/src/net/eathena/messagein.h
+++ b/src/net/eathena/messagein.h
@@ -48,11 +48,11 @@ class MessageIn final : public Net::MessageIn
         void postInit();
 
         /**< Reads a short. */
-        int16_t readInt16(const char *const str);
+        int16_t readInt16(const char *const str) override final;
         /**< Reads a long. */
-        int32_t readInt32(const char *const str);
+        int32_t readInt32(const char *const str) override final;
 
-        int64_t readInt64(const char *const str);
+        int64_t readInt64(const char *const str) override final;
 
         uint16_t readId();
 };
diff --git a/src/net/eathena/messageout.h b/src/net/eathena/messageout.h
index fbdbc21e0..11b124e26 100644
--- a/src/net/eathena/messageout.h
+++ b/src/net/eathena/messageout.h
@@ -50,11 +50,11 @@ class MessageOut final : public Net::MessageOut
 
         /**< Writes a short. */
         void writeInt16(const int16_t value,
-                        const char *const str);
+                        const char *const str) override final;
 
         /**< Writes a long. */
         void writeInt32(const int32_t value,
-                        const char *const str);
+                        const char *const str) override final;
 
         /**
          * Encodes coordinates and direction in 3 bytes.
@@ -68,7 +68,7 @@ class MessageOut final : public Net::MessageOut
         { mPos = 0; }
 
     private:
-        void expand(const size_t size);
+        void expand(const size_t size) override final;
 
         Network *mNetwork;
 };
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 1f0461fbf..35a4ccead 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -69,7 +69,7 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler
         void requestLogin(const Being *const being) const override final;
 
         void setTileType(const int x, const int y,
-                         const int type) const;
+                         const int type) const override final;
 
         void unequipAll(const Being *const being) const override final;
 
diff --git a/src/net/tmwa/buyingstorehandler.h b/src/net/tmwa/buyingstorehandler.h
index b98325acc..381fe5c1a 100644
--- a/src/net/tmwa/buyingstorehandler.h
+++ b/src/net/tmwa/buyingstorehandler.h
@@ -41,7 +41,7 @@ class BuyingStoreHandler final : public MessageHandler,
         void create(const std::string &name,
                     const int maxMoney,
                     const bool flag,
-                    std::vector<ShopItem*> &items) const;
+                    std::vector<ShopItem*> &items) const override final;
 
         void close() const override final;
 
diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h
index 33b234f43..b823ee2db 100644
--- a/src/net/tmwa/buysellhandler.h
+++ b/src/net/tmwa/buysellhandler.h
@@ -37,7 +37,7 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler
 
         A_DELETE_COPY(BuySellHandler)
 
-        void handleMessage(Net::MessageIn &msg);
+        void handleMessage(Net::MessageIn &msg) override final;
 
         static void processNpcBuy(Net::MessageIn &msg);
 
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index 509d82c0c..28d73110d 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -70,7 +70,7 @@ class CharServerHandler final : public MessageHandler,
 
         void processChangeMapServer(Net::MessageIn &msg);
 
-        bool isNeedCreatePin() const
+        bool isNeedCreatePin() const override final
         { return false; }
 
         void setNewPincode(const std::string &pin A_UNUSED) override final
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 811dbda9f..4639a7cae 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -55,7 +55,7 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
 
         void who() const override final;
 
-        void sendRaw(const std::string &args) const;
+        void sendRaw(const std::string &args) const override final;
 
         void ignoreAll() const override final;
 
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index c9a70e943..b233fc898 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -71,7 +71,7 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
                           const std::string &restrict msg2)
                           const override final;
 
-        void checkMaster() const;
+        void checkMaster() const override final;
 
     protected:
         static void processGuildPositionInfo(Net::MessageIn &msg);
diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h
index e34e546a3..ef542bab2 100644
--- a/src/net/tmwa/messagein.h
+++ b/src/net/tmwa/messagein.h
@@ -48,11 +48,11 @@ class MessageIn final : public Net::MessageIn
         void postInit();
 
         /**< Reads a short. */
-        int16_t readInt16(const char *const str);
+        int16_t readInt16(const char *const str) override final;
         /**< Reads a long. */
-        int32_t readInt32(const char *const str);
+        int32_t readInt32(const char *const str) override final;
 
-        int64_t readInt64(const char *const str);
+        int64_t readInt64(const char *const str) override final;
 
         uint16_t readId();
 };
diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h
index 69e32fa40..c6aa522cc 100644
--- a/src/net/tmwa/messageout.h
+++ b/src/net/tmwa/messageout.h
@@ -50,11 +50,11 @@ class MessageOut final : public Net::MessageOut
 
         /**< Writes a short. */
         void writeInt16(const int16_t value,
-                        const char *const str);
+                        const char *const str) override final;
 
         /**< Writes a long. */
         void writeInt32(const int32_t value,
-                        const char *const str);
+                        const char *const str) override final;
 
         /**
          * Encodes coordinates and direction in 3 bytes.
@@ -68,7 +68,7 @@ class MessageOut final : public Net::MessageOut
         { mPos = 0; }
 
     private:
-        void expand(const size_t size);
+        void expand(const size_t size) override final;
 
         Network *mNetwork;
 };
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index f32ca7f6b..d82885da0 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -75,7 +75,7 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler
                         const int materialId3) const override final;
 
         void cooking(const CookingType::Type type,
-                     const int nameId) const;
+                     const int nameId) const override final;
 
         void repair(const int index) const override final;
 
diff --git a/src/particle/particle.h b/src/particle/particle.h
index 3fdd653e6..f5b2e561d 100644
--- a/src/particle/particle.h
+++ b/src/particle/particle.h
@@ -271,10 +271,10 @@ class Particle notfinal : public Actor
         { mAutoDelete = false; }
 
         /** We consider particles (at least for now) to be one layer-sprites */
-        virtual int getNumberOfLayers() const
+        int getNumberOfLayers() const override final
         { return 1; }
 
-        virtual float getAlpha() const
+        float getAlpha() const override final
         { return 1.0F; }
 
         virtual void setAlpha(const float alpha A_UNUSED) override
diff --git a/src/render/graphicsdef.hpp b/src/render/graphicsdef.hpp
index ffa6d12c0..fb90c2fb4 100644
--- a/src/render/graphicsdef.hpp
+++ b/src/render/graphicsdef.hpp
@@ -27,11 +27,11 @@ public:
     */
     void drawImageRect(int x, int y,
                        int w, int h,
-                       const ImageRect &imgRect);
+                       const ImageRect &imgRect) override final;
 
-    void beginDraw();
+    void beginDraw() override final;
 
-    void endDraw();
+    void endDraw() override final;
 
     void pushClipArea(const Rect &area) override final;
 
diff --git a/src/render/imagegraphics.h b/src/render/imagegraphics.h
index a208d675f..8957543d4 100644
--- a/src/render/imagegraphics.h
+++ b/src/render/imagegraphics.h
@@ -128,7 +128,7 @@ class ImegeGraphics final : public Graphics
                                 override final
         { }
 
-        void updateScreen()
+        void updateScreen() override final
         { }
 
         SDL_Surface *getScreenshot() override final A_WARN_UNUSED
@@ -193,7 +193,7 @@ class ImegeGraphics final : public Graphics
          */
         void drawImageRect(const int x A_UNUSED, const int y A_UNUSED,
                            const int w A_UNUSED, const int h A_UNUSED,
-                           const ImageRect &imgRect A_UNUSED)
+                           const ImageRect &imgRect A_UNUSED) override final
         { }
 
     protected:
diff --git a/src/render/safeopenglgraphics.h b/src/render/safeopenglgraphics.h
index fbb359002..04bf478a3 100644
--- a/src/render/safeopenglgraphics.h
+++ b/src/render/safeopenglgraphics.h
@@ -50,7 +50,7 @@ class SafeOpenGLGraphics final : public Graphics
 
         ~SafeOpenGLGraphics();
 
-        void testDraw();
+        void testDraw() override final;
 
         #include "render/graphicsdef.hpp"
 
diff --git a/src/render/surfacegraphics.h b/src/render/surfacegraphics.h
index f03392448..4a12f54d8 100644
--- a/src/render/surfacegraphics.h
+++ b/src/render/surfacegraphics.h
@@ -132,7 +132,7 @@ class SurfaceGraphics final : public Graphics
                                 override final
         { }
 
-        void updateScreen()
+        void updateScreen() override final
         { }
 
         SDL_Surface *getScreenshot() override final A_WARN_UNUSED
@@ -203,7 +203,7 @@ class SurfaceGraphics final : public Graphics
          */
         void drawImageRect(const int x A_UNUSED, const int y A_UNUSED,
                            const int w A_UNUSED, const int h A_UNUSED,
-                           const ImageRect &imgRect A_UNUSED)
+                           const ImageRect &imgRect A_UNUSED) override final
         { }
 
     protected:
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index 735405a81..1afebb736 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -127,7 +127,7 @@ class OpenGLImageHelper final : public ImageHelper
 
         void copySurfaceToImage(const Image *const image,
                                 const int x, const int y,
-                                SDL_Surface *surface) const;
+                                SDL_Surface *surface) const override final;
 
     protected:
         /**
diff --git a/src/touchmanager.h b/src/touchmanager.h
index 8cefa15c6..4a31654bb 100644
--- a/src/touchmanager.h
+++ b/src/touchmanager.h
@@ -142,7 +142,7 @@ class TouchManager final : public ConfigListener
 
         void unloadTouchItem(TouchItem **unloadItem);
 
-        void optionChanged(const std::string &value);
+        void optionChanged(const std::string &value) override final;
 
         void loadPad();