remove useless virtual keywords.

64 files changed, 184 insertions, 187 deletions

diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index eadab73f4..89fef3195 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -61,7 +61,7 @@ class AnimatedSprite final : public Sprite
 
         static AnimatedSprite *clone(const AnimatedSprite *const anim);
 
-        virtual ~AnimatedSprite();
+        ~AnimatedSprite();
 
         bool reset() override;
 
@@ -89,9 +89,9 @@ class AnimatedSprite final : public Sprite
 
         unsigned int getFrameCount() const A_WARN_UNUSED;
 
-        virtual void setAlpha(float alpha) override;
+        void setAlpha(float alpha) override;
 
-        virtual void *getHash() override A_WARN_UNUSED;
+        void *getHash() override A_WARN_UNUSED;
 
         bool updateNumber(const unsigned num);
 
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index abc4644e2..adf712187 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -81,12 +81,12 @@ class LocalPlayer final : public Being,
          */
         ~LocalPlayer();
 
-        virtual void logic() override;
+        void logic() override;
 
         void slowLogic();
 
-        virtual void setAction(const Action &action,
-                               const int attackType = 0) override;
+        void setAction(const Action &action,
+                       const int attackType = 0) override;
 
         /**
          * Compute the next pathnode location when walking using keyboard.
@@ -101,10 +101,10 @@ class LocalPlayer final : public Being,
          * Also, when specified, it picks up an item at the end of a path
          * or attack target.
          */
-        virtual void nextTile() override
+        void nextTile() override
         { nextTile(0); }
 
-        virtual void nextTile(unsigned char dir);
+        void nextTile(unsigned char dir);
 
         bool pickUp(FloorItem *const item);
 
@@ -150,7 +150,7 @@ class LocalPlayer final : public Being,
         /**
          * Sets a new destination for this being to walk to.
          */
-        virtual void setDestination(const int x, const int y);
+        void setDestination(const int x, const int y);
 
         /**
          * Sets a new direction to keep walking in.
@@ -503,9 +503,8 @@ class LocalPlayer final : public Being,
     protected:
         void updateCoords() override;
 
-
-        virtual void handleStatusEffect(StatusEffect *const effect,
-                                        const int effectId);
+        void handleStatusEffect(StatusEffect *const effect,
+                                const int effectId);
 
         void startWalking(const unsigned char dir);
 
diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp
index 7e5807166..fc4889951 100644
--- a/src/being/playerrelations.cpp
+++ b/src/being/playerrelations.cpp
@@ -71,7 +71,7 @@ class PlayerConfSerialiser final :
         std::map<std::string, PlayerRelation *> *>
 {
 public:
-    virtual ConfigurationObject *writeConfigItem(
+    ConfigurationObject *writeConfigItem(
         const std::pair<std::string, PlayerRelation *> &value,
         ConfigurationObject *const cobj) const override
     {
@@ -84,7 +84,7 @@ public:
         return cobj;
     }
 
-    virtual std::map<std::string, PlayerRelation *> *
+    std::map<std::string, PlayerRelation *> *
     readConfigItem(const ConfigurationObject *const cobj,
                    std::map<std::string, PlayerRelation *>
                    *const container) const override
@@ -467,8 +467,8 @@ public:
         mShortName = PLAYER_IGNORE_STRATEGY_NOP;
     }
 
-    virtual void ignore(Being *const being A_UNUSED,
-                        const unsigned int flags A_UNUSED) const override
+    void ignore(Being *const being A_UNUSED,
+                const unsigned int flags A_UNUSED) const override
     {
     }
 };
@@ -484,8 +484,8 @@ public:
         mShortName = "dotdotdot";
     }
 
-    virtual void ignore(Being *const being,
-                        const unsigned int flags A_UNUSED) const override
+    void ignore(Being *const being,
+                const unsigned int flags A_UNUSED) const override
     {
         if (!being)
             return;
@@ -507,8 +507,8 @@ public:
         mShortName = "blinkname";
     }
 
-    virtual void ignore(Being *const being,
-                        const unsigned int flags A_UNUSED) const override
+    void ignore(Being *const being,
+                const unsigned int flags A_UNUSED) const override
     {
         if (!being)
             return;
@@ -530,8 +530,8 @@ public:
         mShortName = shortname;
     }
 
-    virtual void ignore(Being *const being,
-                        const unsigned int flags A_UNUSED) const override
+    void ignore(Being *const being,
+                const unsigned int flags A_UNUSED) const override
     {
         if (!being)
             return;
diff --git a/src/beingequipbackend.h b/src/beingequipbackend.h
index af7002223..09bd9fe14 100644
--- a/src/beingequipbackend.h
+++ b/src/beingequipbackend.h
@@ -34,7 +34,7 @@ class BeingEquipBackend final : public Equipment::Backend
 
         A_DELETE_COPY(BeingEquipBackend)
 
-        virtual ~BeingEquipBackend();
+        ~BeingEquipBackend();
 
         Item *getEquipment(const int index) const A_WARN_UNUSED;
 
diff --git a/src/flooritem.h b/src/flooritem.h
index c77ed8ac3..1eecf3aef 100644
--- a/src/flooritem.h
+++ b/src/flooritem.h
@@ -74,10 +74,10 @@ class FloorItem final : public ActorSprite
 
         std::string getName() const A_WARN_UNUSED;
 
-        virtual int getTileX() const override A_WARN_UNUSED
+        int getTileX() const override A_WARN_UNUSED
         { return mX; }
 
-        virtual int getTileY() const override A_WARN_UNUSED
+        int getTileY() const override A_WARN_UNUSED
         { return mY; }
 
         void incrementPickup()
diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h
index f1a7c7c4a..d3a9fe46d 100644
--- a/src/graphicsmanager.h
+++ b/src/graphicsmanager.h
@@ -74,7 +74,7 @@ class GraphicsManager final
 
         A_DELETE_COPY(GraphicsManager)
 
-        virtual ~GraphicsManager();
+        ~GraphicsManager();
 
         void initGraphics(const bool noOpenGL);
 
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index 74af1142d..58321b12f 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -66,27 +66,27 @@ public:
 
     A_DELETE_COPY(UsersTableModel)
 
-    virtual ~UsersTableModel()
+    ~UsersTableModel()
     {
         freeWidgets();
     }
 
-    virtual int getRows() const
+    int getRows() const
     {
         return static_cast<int>(mPlayers.size());
     }
 
-    virtual int getColumns() const
+    int getColumns() const
     {
         return COLUMNS_NR;
     }
 
-    virtual int getRowHeight() const
+    int getRowHeight() const
     {
         return ROW_HEIGHT;
     }
 
-    virtual int getColumnWidth(const int index) const
+    int getColumnWidth(const int index) const
     {
         if (index == NAME_COLUMN)
             return NAME_COLUMN_WIDTH;
@@ -231,11 +231,11 @@ public:
         signalAfterUpdate();
     }
 
-    virtual void updateModelInRow(const int row A_UNUSED) const
+    void updateModelInRow(const int row A_UNUSED) const
     {
     }
 
-    virtual gcn::Widget *getElementAt(const int row, const int column) const
+    gcn::Widget *getElementAt(const int row, const int column) const
     {
         return mWidgets[WIDGET_AT(row, column)];
     }
diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp
index ce7c32ba2..309a2922c 100644
--- a/src/gui/buydialog.cpp
+++ b/src/gui/buydialog.cpp
@@ -71,13 +71,13 @@ static const char *const SORT_NAME_BUY[7] =
 class SortListModelBuy final : public gcn::ListModel
 {
 public:
-    virtual ~SortListModelBuy()
+    ~SortListModelBuy()
     { }
 
-    virtual int getNumberOfElements()
+    int getNumberOfElements()
     { return 7; }
 
-    virtual std::string getElementAt(int i)
+    std::string getElementAt(int i)
     {
         if (i >= getNumberOfElements() || i < 0)
             return "???";
diff --git a/src/gui/buyselldialog.h b/src/gui/buyselldialog.h
index 74cf5d932..193364ff8 100644
--- a/src/gui/buyselldialog.h
+++ b/src/gui/buyselldialog.h
@@ -49,7 +49,7 @@ class BuySellDialog final : public Window, public gcn::ActionListener
 
         A_DELETE_COPY(BuySellDialog)
 
-        virtual ~BuySellDialog();
+        ~BuySellDialog();
 
         void init();
 
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 9fca48e7d..1f3ff51bb 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -172,15 +172,15 @@ const char *COLOR_NAME[14] =
 class ColorListModel final : public gcn::ListModel
 {
 public:
-    virtual ~ColorListModel()
+    ~ColorListModel()
     { }
 
-    virtual int getNumberOfElements()
+    int getNumberOfElements()
     {
         return 14;
     }
 
-    virtual std::string getElementAt(int i)
+    std::string getElementAt(int i)
     {
         if (i >= getNumberOfElements() || i < 0)
             return "???";
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index a1c4287c8..f8b688dee 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -82,13 +82,13 @@ static const char *const SORT_NAME_INVENTORY[6] =
 class SortListModelInv final : public gcn::ListModel
 {
 public:
-    virtual ~SortListModelInv()
+    ~SortListModelInv()
     { }
 
-    virtual int getNumberOfElements() override
+    int getNumberOfElements() override
     { return 6; }
 
-    virtual std::string getElementAt(int i) override
+    std::string getElementAt(int i) override
     {
         if (i >= getNumberOfElements() || i < 0)
             return "???";
diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp
index e9a178b02..1fd15e351 100644
--- a/src/gui/itemamountwindow.cpp
+++ b/src/gui/itemamountwindow.cpp
@@ -79,15 +79,15 @@ public:
 
     A_DELETE_COPY(ItemsModal)
 
-    virtual ~ItemsModal()
+    ~ItemsModal()
     { }
 
-    virtual int getNumberOfElements() override
+    int getNumberOfElements() override
     {
         return static_cast<int>(mStrings.size());
     }
 
-    virtual std::string getElementAt(int i) override
+    std::string getElementAt(int i) override
     {
         if (i < 0 || i >= getNumberOfElements())
             return "???";
diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp
index 9af26b6ae..e4c19e604 100644
--- a/src/gui/logindialog.cpp
+++ b/src/gui/logindialog.cpp
@@ -88,15 +88,15 @@ class UpdateTypeModel final : public gcn::ListModel
 
         A_DELETE_COPY(UpdateTypeModel)
 
-        virtual ~UpdateTypeModel()
+        ~UpdateTypeModel()
         { }
 
-        virtual int getNumberOfElements() override
+        int getNumberOfElements() override
         {
             return 3;
         }
 
-        virtual std::string getElementAt(int i) override
+        std::string getElementAt(int i) override
         {
             if (i >= getNumberOfElements() || i < 0)
                 return "???";
@@ -115,17 +115,17 @@ class UpdateListModel final : public gcn::ListModel
 
         A_DELETE_COPY(UpdateListModel)
 
-        virtual ~UpdateListModel()
+        ~UpdateListModel()
         { }
 
-        virtual int getNumberOfElements() override
+        int getNumberOfElements() override
         {
             if (!mLoginData)
                 return 0;
             return static_cast<int>(mLoginData->updateHosts.size());
         }
 
-        virtual std::string getElementAt(int i) override
+        std::string getElementAt(int i) override
         {
             if (!mLoginData || i >= getNumberOfElements() || i < 0)
                 return "???";
diff --git a/src/gui/questswindow.cpp b/src/gui/questswindow.cpp
index 3013da0ff..e77d2bbd7 100644
--- a/src/gui/questswindow.cpp
+++ b/src/gui/questswindow.cpp
@@ -96,7 +96,7 @@ class QuestsModel final : public ExtendedNamesModel
 
         A_DELETE_COPY(QuestsModel)
 
-        virtual ~QuestsModel()
+        ~QuestsModel()
         { }
 };
 
diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h
index c114253ba..532244845 100644
--- a/src/gui/selldialog.h
+++ b/src/gui/selldialog.h
@@ -63,7 +63,7 @@ class SellDialog final : public Window,
         /**
          * Destructor
          */
-        virtual ~SellDialog();
+        ~SellDialog();
 
         void init();
 
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index f99ca862b..eb4240585 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -48,7 +48,7 @@ public:
         Theme::fillSoundsList(mNames);
     }
 
-    virtual ~SoundsModel()
+    ~SoundsModel()
     { }
 };
 
diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp
index 7e97800d5..f675d1045 100644
--- a/src/gui/setup_relations.cpp
+++ b/src/gui/setup_relations.cpp
@@ -81,15 +81,15 @@ static const char *const RELATION_NAMES[PlayerRelation::RELATIONS_NR] =
 class PlayerRelationListModel final : public gcn::ListModel
 {
 public:
-    virtual ~PlayerRelationListModel()
+    ~PlayerRelationListModel()
     { }
 
-    virtual int getNumberOfElements() override
+    int getNumberOfElements() override
     {
         return PlayerRelation::RELATIONS_NR;
     }
 
-    virtual std::string getElementAt(int i) override
+    std::string getElementAt(int i) override
     {
         if (i >= getNumberOfElements() || i < 0)
             return "";
@@ -112,7 +112,7 @@ public:
 
     A_DELETE_COPY(PlayerTableModel)
 
-    virtual ~PlayerTableModel()
+    ~PlayerTableModel()
     {
         freeWidgets();
         delete mListModel;
@@ -121,7 +121,7 @@ public:
         mPlayers = nullptr;
     }
 
-    virtual int getRows() const override
+    int getRows() const override
     {
         if (mPlayers)
             return static_cast<int>(mPlayers->size());
@@ -129,17 +129,17 @@ public:
             return 0;
     }
 
-    virtual int getColumns() const override
+    int getColumns() const override
     {
         return COLUMNS_NR;
     }
 
-    virtual int getRowHeight() const override
+    int getRowHeight() const override
     {
         return ROW_HEIGHT;
     }
 
-    virtual int getColumnWidth(const int index) const override
+    int getColumnWidth(const int index) const override
     {
         if (index == NAME_COLUMN)
             return NAME_COLUMN_WIDTH;
@@ -147,7 +147,7 @@ public:
             return RELATION_CHOICE_COLUMN_WIDTH;
     }
 
-    virtual void playerRelationsUpdated()
+    void playerRelationsUpdated()
     {
         signalBeforeUpdate();
 
@@ -176,7 +176,7 @@ public:
         signalAfterUpdate();
     }
 
-    virtual void updateModelInRow(const int row) const
+    void updateModelInRow(const int row) const
     {
         const DropDown *const choicebox = static_cast<DropDown *>(
             getElementAt(row, RELATION_CHOICE_COLUMN));
@@ -186,12 +186,12 @@ public:
     }
 
 
-    virtual gcn::Widget *getElementAt(int row, int column) const override
+    gcn::Widget *getElementAt(int row, int column) const override
     {
         return mWidgets[WIDGET_AT(row, column)];
     }
 
-    virtual void freeWidgets()
+    void freeWidgets()
     {
         delete mPlayers;
         mPlayers = nullptr;
@@ -219,16 +219,16 @@ protected:
 class IgnoreChoicesListModel final : public gcn::ListModel
 {
 public:
-    virtual ~IgnoreChoicesListModel()
+    ~IgnoreChoicesListModel()
     { }
 
-    virtual int getNumberOfElements() override
+    int getNumberOfElements() override
     {
         return static_cast<int>(player_relations.getPlayerIgnoreStrategies()
                                 ->size());
     }
 
-    virtual std::string getElementAt(int i) override
+    std::string getElementAt(int i) override
     {
         if (i >= getNumberOfElements() || i < 0)
             return "???";
diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h
index dc387d5c1..b1e1f8ab0 100644
--- a/src/gui/setup_relations.h
+++ b/src/gui/setup_relations.h
@@ -48,7 +48,7 @@ public:
 
     A_DELETE_COPY(Setup_Relations)
 
-    virtual ~Setup_Relations();
+    ~Setup_Relations();
 
     void apply() override;
 
@@ -58,11 +58,11 @@ public:
 
     void action(const gcn::ActionEvent &event) override;
 
-    virtual void updatedPlayer(const std::string &name);
+    void updatedPlayer(const std::string &name);
 
-    virtual void updateAll();
+    void updateAll();
 
-    virtual void externalUpdated() override;
+    void externalUpdated() override;
 
 private:
     StaticTableModel *mPlayerTableTitleModel;
diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp
index 4715eacf0..850068fd9 100644
--- a/src/gui/setup_theme.cpp
+++ b/src/gui/setup_theme.cpp
@@ -60,7 +60,7 @@ public:
         Theme::fillSkinsList(mNames);
     }
 
-    virtual ~ThemesModel()
+    ~ThemesModel()
     { }
 };
 
@@ -71,7 +71,7 @@ public:
         NamesModel()
     { Theme::fillFontsList(mNames); }
 
-    virtual ~FontsModel()
+    ~FontsModel()
     { }
 };
 
@@ -116,13 +116,13 @@ const char *SIZE_NAME[maxFontSizes] =
 class FontSizeChoiceListModel final : public gcn::ListModel
 {
 public:
-    virtual ~FontSizeChoiceListModel()
+    ~FontSizeChoiceListModel()
     { }
 
-    virtual int getNumberOfElements() override A_WARN_UNUSED
+    int getNumberOfElements() override A_WARN_UNUSED
     { return maxFontSizes; }
 
-    virtual std::string getElementAt(int i) override A_WARN_UNUSED
+    std::string getElementAt(int i) override A_WARN_UNUSED
     {
         if (i >= getNumberOfElements() || i < 0)
             return "???";
@@ -193,7 +193,7 @@ public:
 
     A_DELETE_COPY(LangListModel)
 
-    virtual ~LangListModel()
+    ~LangListModel()
     {
         for (int f = 0; f < langs_count; f ++)
         {
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 4c285a879..881aa69d4 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -61,7 +61,7 @@ class ModeListModel final : public gcn::ListModel
 
         A_DELETE_COPY(ModeListModel)
 
-        virtual ~ModeListModel()
+        ~ModeListModel()
         { }
 
         /**
@@ -158,13 +158,13 @@ int ModeListModel::getIndexOf(const std::string &widthXHeightMode)
 class OpenGLListModel final : public gcn::ListModel
 {
 public:
-    virtual ~OpenGLListModel()
+    ~OpenGLListModel()
     { }
 
-    virtual int getNumberOfElements() override
+    int getNumberOfElements() override
     { return renderModesListSize; }
 
-    virtual std::string getElementAt(int i) override
+    std::string getElementAt(int i) override
     {
         if (i >= getNumberOfElements() || i < 0)
             return "???";
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 7d03c1441..f8a1650a4 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -513,7 +513,7 @@ public:
         return &mMembers;
     }
 
-    virtual Avatar *getAvatarAt(int index) override
+    Avatar *getAvatarAt(int index) override
     {
         return mMembers[index];
     }
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index b8d4f0c6a..0f00cb95c 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -106,7 +106,7 @@ class DerDisplay final : public AttrDisplay
 
         A_DELETE_COPY(DerDisplay)
 
-        virtual Type getType() const override
+        Type getType() const override
         { return DERIVED; }
 };
 
@@ -121,7 +121,7 @@ class ChangeDisplay final : public AttrDisplay, gcn::ActionListener
 
         std::string update() override;
 
-        virtual Type getType() const override
+        Type getType() const override
         { return CHANGEABLE; }
 
         void setPointsNeeded(int needed);
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index e947a09de..d960f20f7 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -73,15 +73,15 @@ public:
 
     A_DELETE_COPY(IconsModal)
 
-    virtual ~IconsModal()
+    ~IconsModal()
     { }
 
-    virtual int getNumberOfElements() override
+    int getNumberOfElements() override
     {
         return static_cast<int>(mStrings.size());
     }
 
-    virtual std::string getElementAt(int i) override
+    std::string getElementAt(int i) override
     {
         if (i < 0 || i >= getNumberOfElements())
             return "???";
@@ -121,15 +121,15 @@ const char *MAGIC_SCHOOL_TEXT[6] =
 class TargetTypeModel final : public gcn::ListModel
 {
 public:
-    virtual ~TargetTypeModel()
+    ~TargetTypeModel()
     { }
 
-    virtual int getNumberOfElements() override
+    int getNumberOfElements() override
     {
         return 3;
     }
 
-    virtual std::string getElementAt(int i) override
+    std::string getElementAt(int i) override
     {
         if (i >= getNumberOfElements() || i < 0)
             return "???";
@@ -140,15 +140,15 @@ public:
 class MagicSchoolModel final : public gcn::ListModel
 {
 public:
-    virtual ~MagicSchoolModel()
+    ~MagicSchoolModel()
     { }
 
-    virtual int getNumberOfElements() override
+    int getNumberOfElements() override
     {
         return 6;
     }
 
-    virtual std::string getElementAt(int i) override
+    std::string getElementAt(int i) override
     {
         if (i >= getNumberOfElements() || i < 0)
             return "???";
@@ -156,7 +156,6 @@ public:
     }
 };
 
-
 TextCommandEditor::TextCommandEditor(TextCommand *const command) :
     // TRANSLATORS: command editor name
     Window(_("Command Editor"), false, nullptr, "commandeditor.xml"),
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 1d605469e..aa951ff7e 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -96,7 +96,7 @@ class Button final : public gcn::Button,
          */
         void updateAlpha();
 
-        virtual void mouseReleased(gcn::MouseEvent& mouseEvent) override;
+        void mouseReleased(gcn::MouseEvent& mouseEvent) override;
 
         void setDescription(std::string text)
         { mDescription = text; }
diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h
index e8a0be29d..d2fedb8b7 100644
--- a/src/gui/widgets/characterdisplay.h
+++ b/src/gui/widgets/characterdisplay.h
@@ -47,7 +47,7 @@ class CharacterDisplay final : public Container,
 
         A_DELETE_COPY(CharacterDisplay)
 
-        virtual ~CharacterDisplay();
+        ~CharacterDisplay();
 
         void setCharacter(Net::Character *const character);
 
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index 55684a4f5..e57caf6aa 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -45,7 +45,7 @@ class DropShortcutContainer final : public ShortcutContainer
         /**
          * Destructor.
          */
-        virtual ~DropShortcutContainer();
+        ~DropShortcutContainer();
 
         /**
          * Draws the items.
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 87ea04bc4..7ec5badb6 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -48,7 +48,7 @@ class EmoteShortcutContainer final : public ShortcutContainer
         /**
          * Destructor.
          */
-        virtual ~EmoteShortcutContainer();
+        ~EmoteShortcutContainer();
 
         /**
          * Draws the items.
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 030605ed5..42e68db55 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -45,9 +45,9 @@ public:
 
     A_DELETE_COPY(GuiTableActionListener)
 
-    virtual ~GuiTableActionListener();
+    ~GuiTableActionListener();
 
-    virtual void action(const gcn::ActionEvent& actionEvent) override;
+    void action(const gcn::ActionEvent& actionEvent) override;
 
 protected:
     GuiTable *mTable;
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 24360062f..fdc089721 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -61,7 +61,7 @@ public:
 
     A_DELETE_COPY(GuiTable)
 
-    virtual ~GuiTable();
+    ~GuiTable();
 
     /**
      * Retrieves the active table model
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 1d6df41e6..65d54f373 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -73,7 +73,7 @@ class ItemContainer final : public gcn::Widget,
         /**
          * Destructor.
          */
-        virtual ~ItemContainer();
+        ~ItemContainer();
 
         void hidePopup();
 
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 99abc1b19..4a57e4292 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -46,7 +46,7 @@ class ItemShortcutContainer final : public ShortcutContainer
         /**
          * Destructor.
          */
-        virtual ~ItemShortcutContainer();
+        ~ItemShortcutContainer();
 
         /**
          * Draws the items.
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index 8a33f03f6..1371420f7 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -173,7 +173,7 @@ class LayoutCell
             FILL
         };
 
-        virtual ~LayoutCell();
+        ~LayoutCell();
 
         /**
          * Sets the padding around the cell content.
diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h
index b5f921fb8..30a54ede7 100644
--- a/src/gui/widgets/setuptouchitem.h
+++ b/src/gui/widgets/setuptouchitem.h
@@ -31,7 +31,7 @@ class TouchActionsModel final : public NamesModel
 
         A_DELETE_COPY(TouchActionsModel)
 
-        virtual ~TouchActionsModel()
+        ~TouchActionsModel()
         { }
 
         int getActionFromSelection(const int sel) const;
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index a4dbeb96e..f0ebc4ba5 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -45,7 +45,7 @@ class SpellShortcutContainer final : public ShortcutContainer
         /**
          * Destructor.
          */
-        virtual ~SpellShortcutContainer();
+        ~SpellShortcutContainer();
 
         /**
          * Draws the items.
diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h
index 7d7daacb9..231a5f5e1 100644
--- a/src/gui/widgets/tablemodel.h
+++ b/src/gui/widgets/tablemodel.h
@@ -118,15 +118,14 @@ public:
 
     A_DELETE_COPY(StaticTableModel)
 
-    virtual ~StaticTableModel();
+    ~StaticTableModel();
 
     /**
      * Inserts a widget into the table model.
      * The model is resized to accomodate the widget's width and height,
      * unless column width / row height have been fixed.
      */
-    virtual void set(const int row, const int column,
-                     gcn::Widget *const widget);
+    void set(const int row, const int column, gcn::Widget *const widget);
 
     /**
      * Fixes the column width for a given column; this overrides dynamic width
@@ -134,28 +133,28 @@ public:
      *
      * Semantics are undefined for width 0.
      */
-    virtual void fixColumnWidth(const int column, const int width);
+    void fixColumnWidth(const int column, const int width);
 
     /**
      * Fixes the row height; this overrides dynamic height inference.
      *
      * Semantics are undefined for width 0.
      */
-    virtual void fixRowHeight(const int height);
+    void fixRowHeight(const int height);
 
     /**
      * Resizes the table model
      */
-    virtual void resize();
-
-    virtual int getRows() const override A_WARN_UNUSED;
-    virtual int getColumns() const override A_WARN_UNUSED;
-    virtual int getRowHeight() const override A_WARN_UNUSED;
-    virtual int getWidth() const A_WARN_UNUSED;
-    virtual int getHeight() const A_WARN_UNUSED;
-    virtual int getColumnWidth(const int index) const override A_WARN_UNUSED;
-    virtual gcn::Widget *getElementAt(const int row, const int column)
-                                      const override A_WARN_UNUSED;
+    void resize();
+
+    int getRows() const override A_WARN_UNUSED;
+    int getColumns() const override A_WARN_UNUSED;
+    int getRowHeight() const override A_WARN_UNUSED;
+    int getWidth() const A_WARN_UNUSED;
+    int getHeight() const A_WARN_UNUSED;
+    int getColumnWidth(const int index) const override A_WARN_UNUSED;
+    gcn::Widget *getElementAt(const int row, const int column)
+                              const override A_WARN_UNUSED;
 
 protected:
     int mRows, mColumns;
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index a03df0f8f..f48bb0e66 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -44,12 +44,12 @@ class VertContainer final : public Container, public gcn::WidgetListener
 
         A_DELETE_COPY(VertContainer)
 
-        virtual void add2(gcn::Widget *const widget, const bool resizable,
-                          const int spacing = -1);
+        void add2(gcn::Widget *const widget, const bool resizable,
+                  const int spacing = -1);
 
-        virtual void add1(gcn::Widget *const widget, const int spacing = -1);
+        void add1(gcn::Widget *const widget, const int spacing = -1);
 
-        virtual void clear();
+        void clear();
 
         void widgetResized(const gcn::Event &event) override;
 
diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp
index d65bd3d34..d65c02e4f 100644
--- a/src/gui/worldselectdialog.cpp
+++ b/src/gui/worldselectdialog.cpp
@@ -54,7 +54,7 @@ class WorldListModel final : public gcn::ListModel
 
         A_DELETE_COPY(WorldListModel)
 
-        virtual ~WorldListModel()
+        ~WorldListModel()
         { }
 
         int getNumberOfElements() override
diff --git a/src/guild.h b/src/guild.h
index a1057552b..d5dcb7234 100644
--- a/src/guild.h
+++ b/src/guild.h
@@ -69,7 +69,7 @@ class Guild final : public AvatarListModel
 public:
     A_DELETE_COPY(Guild)
 
-    virtual ~Guild();
+    ~Guild();
 
     /**
      * Set the guild's name.
diff --git a/src/imagesprite.h b/src/imagesprite.h
index c71223cda..038dfb600 100644
--- a/src/imagesprite.h
+++ b/src/imagesprite.h
@@ -58,8 +58,8 @@ public:
     const Image* getImage() const A_WARN_UNUSED
     { return mImage; }
 
-    virtual bool setSpriteDirection(const SpriteDirection
-                                    direction A_UNUSED) override
+    bool setSpriteDirection(const SpriteDirection
+                            direction A_UNUSED) override
     { return false; }
 
     int getNumberOfLayers() const A_WARN_UNUSED
diff --git a/src/input/keyevent.h b/src/input/keyevent.h
index eaed82376..a9d9cd1a8 100644
--- a/src/input/keyevent.h
+++ b/src/input/keyevent.h
@@ -43,7 +43,7 @@ class KeyEvent final : public gcn::KeyEvent
 
         A_DELETE_COPY(KeyEvent)
 
-        virtual ~KeyEvent();
+        ~KeyEvent();
 
         int getActionId() const A_WARN_UNUSED
         { return mActionId; }
diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h
index 15a89d0b6..2e002d5f9 100644
--- a/src/net/eathena/beinghandler.h
+++ b/src/net/eathena/beinghandler.h
@@ -37,23 +37,23 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
 
         A_DELETE_COPY(BeingHandler)
 
-        virtual void handleMessage(Net::MessageIn &msg) override;
+        void handleMessage(Net::MessageIn &msg) override;
 
-        virtual void requestNameById(const int id) const override;
+        void requestNameById(const int id) const override;
 
-        virtual void undress(Being *const being) const override;
+        void undress(Being *const being) const override;
 
         void processBeingVisibleOrMove(Net::MessageIn &msg,
                                        const bool visible) override;
 
     protected:
-        virtual void processBeingChangeLook(Net::MessageIn &msg,
-                                            const bool look2) const;
+        void processBeingChangeLook(Net::MessageIn &msg,
+                                    const bool look2) const;
 
         void processNameResponse2(Net::MessageIn &msg) const;
 
-        virtual void processPlayerMoveUpdate(Net::MessageIn &msg,
-                                             const int type) const;
+        void processPlayerMoveUpdate(Net::MessageIn &msg,
+                                     const int type) const;
 };
 
 }  // namespace EAthena
diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h
index fb584fb6a..171a1c4e3 100644
--- a/src/net/eathena/buysellhandler.h
+++ b/src/net/eathena/buysellhandler.h
@@ -37,11 +37,11 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler
 
         A_DELETE_COPY(BuySellHandler)
 
-        virtual void handleMessage(Net::MessageIn &msg);
+        void handleMessage(Net::MessageIn &msg);
 
-        virtual void processNpcBuy(Net::MessageIn &msg);
+        void processNpcBuy(Net::MessageIn &msg);
 
-        virtual void processNpcSellResponse(Net::MessageIn &msg) const;
+        void processNpcSellResponse(Net::MessageIn &msg) const;
 };
 
 }  // namespace EAthena
diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h
index 49d384a93..b922125eb 100644
--- a/src/net/eathena/charserverhandler.h
+++ b/src/net/eathena/charserverhandler.h
@@ -41,7 +41,7 @@ class CharServerHandler final : public MessageHandler,
 
         A_DELETE_COPY(CharServerHandler)
 
-        virtual void handleMessage(Net::MessageIn &msg) override;
+        void handleMessage(Net::MessageIn &msg) override;
 
         void chooseCharacter(Net::Character *const character) override;
 
diff --git a/src/net/eathena/itemhandler.h b/src/net/eathena/itemhandler.h
index 071dc7337..667b2eadb 100644
--- a/src/net/eathena/itemhandler.h
+++ b/src/net/eathena/itemhandler.h
@@ -37,7 +37,7 @@ class ItemHandler final : public MessageHandler, public Ea::ItemHandler
 
         A_DELETE_COPY(ItemHandler)
 
-        virtual void handleMessage(Net::MessageIn &msg) override;
+        void handleMessage(Net::MessageIn &msg) override;
 };
 
 }  // namespace EAthena
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index 1e8455d6a..6f863feed 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -37,22 +37,22 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
 
         A_DELETE_COPY(BeingHandler)
 
-        virtual void handleMessage(Net::MessageIn &msg) override;
+        void handleMessage(Net::MessageIn &msg) override;
 
-        virtual void requestNameById(const int id) const override;
+        void requestNameById(const int id) const override;
 
-        virtual void undress(Being *const being) const override;
+        void undress(Being *const being) const override;
 
     protected:
-        virtual void processBeingChangeLook(Net::MessageIn &msg,
-                                            const bool look2) const;
+        void processBeingChangeLook(Net::MessageIn &msg,
+                                    const bool look2) const;
 
         void processNameResponse2(Net::MessageIn &msg) const;
 
-        virtual void processPlayerMoveUpdate(Net::MessageIn &msg,
-                                             const int type) const;
+        void processPlayerMoveUpdate(Net::MessageIn &msg,
+                                     const int type) const;
 
-        virtual void processBeingMove3(Net::MessageIn &msg) const;
+        void processBeingMove3(Net::MessageIn &msg) const;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h
index 388830165..12e2cd719 100644
--- a/src/net/tmwa/buysellhandler.h
+++ b/src/net/tmwa/buysellhandler.h
@@ -37,11 +37,11 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler
 
         A_DELETE_COPY(BuySellHandler)
 
-        virtual void handleMessage(Net::MessageIn &msg);
+        void handleMessage(Net::MessageIn &msg);
 
-        virtual void processNpcBuy(Net::MessageIn &msg);
+        void processNpcBuy(Net::MessageIn &msg);
 
-        virtual void processNpcSellResponse(Net::MessageIn &msg) const;
+        void processNpcSellResponse(Net::MessageIn &msg) const;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index 602a2f079..2f9ac21d6 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -41,7 +41,7 @@ class CharServerHandler final : public MessageHandler,
 
         A_DELETE_COPY(CharServerHandler)
 
-        virtual void handleMessage(Net::MessageIn &msg) override;
+        void handleMessage(Net::MessageIn &msg) override;
 
         void chooseCharacter(Net::Character *const character) override;
 
diff --git a/src/net/tmwa/itemhandler.h b/src/net/tmwa/itemhandler.h
index 5b712bc2a..d77ae64b7 100644
--- a/src/net/tmwa/itemhandler.h
+++ b/src/net/tmwa/itemhandler.h
@@ -37,7 +37,7 @@ class ItemHandler final : public MessageHandler, public Ea::ItemHandler
 
         A_DELETE_COPY(ItemHandler)
 
-        virtual void handleMessage(Net::MessageIn &msg) override;
+        void handleMessage(Net::MessageIn &msg) override;
 };
 
 }  // namespace TmwAthena
diff --git a/src/particle/animationparticle.h b/src/particle/animationparticle.h
index 182bfa177..3bfdea0b6 100644
--- a/src/particle/animationparticle.h
+++ b/src/particle/animationparticle.h
@@ -43,7 +43,7 @@ class AnimationParticle final : public ImageParticle
 
         ~AnimationParticle();
 
-        virtual bool update() override;
+        bool update() override;
 
     private:
         SimpleAnimation *mAnimation; /**< Used animation for this particle */
diff --git a/src/particle/particlecontainer.h b/src/particle/particlecontainer.h
index a348f4cef..a8921a942 100644
--- a/src/particle/particlecontainer.h
+++ b/src/particle/particlecontainer.h
@@ -83,7 +83,7 @@ public:
 
     A_DELETE_COPY(ParticleList)
 
-    virtual ~ParticleList();
+    ~ParticleList();
 
     /**
      * Takes control of and adds a particle
@@ -95,9 +95,9 @@ public:
      */
     void removeLocally(const Particle *const particle);
 
-    virtual void clearLocally() override;
+    void clearLocally() override;
 
-    virtual void moveTo(const float x, const float y) override;
+    void moveTo(const float x, const float y) override;
 
 protected:
     std::list<Particle *> mElements;    /**< Contained particle effects */
@@ -114,22 +114,22 @@ public:
 
     A_DELETE_COPY(ParticleVector)
 
-    virtual ~ParticleVector();
+    ~ParticleVector();
 
     /**
      * Sets a particle at a specified index.  Kills the previous particle
      * there, if needed.
      */
-    virtual void setLocally(const int index, Particle *const particle);
+    void setLocally(const int index, Particle *const particle);
 
     /**
      * Removes a particle at a specified index
      */
-    virtual void delLocally(const int index);
+    void delLocally(const int index);
 
-    virtual void clearLocally() override;
+    void clearLocally() override;
 
-    virtual void moveTo(const float x, const float y) override;
+    void moveTo(const float x, const float y) override;
 
 protected:
     std::vector<Particle *> mIndexedElements;
diff --git a/src/particle/rotationalparticle.h b/src/particle/rotationalparticle.h
index 33289d8c3..a32decb72 100644
--- a/src/particle/rotationalparticle.h
+++ b/src/particle/rotationalparticle.h
@@ -43,7 +43,7 @@ class RotationalParticle final : public ImageParticle
 
         ~RotationalParticle();
 
-        virtual bool update() override;
+        bool update() override;
 
     private:
         SimpleAnimation *mAnimation; /**< Used animation for this particle */
diff --git a/src/particle/textparticle.h b/src/particle/textparticle.h
index a243e32e0..16dfd9158 100644
--- a/src/particle/textparticle.h
+++ b/src/particle/textparticle.h
@@ -40,15 +40,15 @@ class TextParticle final : public Particle
         /**
          * Draws the particle image.
          */
-        virtual bool draw(Graphics *const graphics,
-                          const int offsetX, const int offsetY) const override;
+        bool draw(Graphics *const graphics,
+                  const int offsetX, const int offsetY) const override;
 
         // hack to improve text visibility
-        virtual int getPixelY() const override A_WARN_UNUSED
+        int getPixelY() const override A_WARN_UNUSED
         { return static_cast<int>(mPos.y + mPos.z); }
 
         // hack to improve text visibility (for sorting only)
-        virtual int getSortPixelY() const override A_WARN_UNUSED
+        int getSortPixelY() const override A_WARN_UNUSED
         { return static_cast<int>(mPos.y + mPos.z); }
 
     private:
diff --git a/src/party.h b/src/party.h
index 0ed4b2895..62d346c83 100644
--- a/src/party.h
+++ b/src/party.h
@@ -167,7 +167,7 @@ private:
      */
     explicit Party(const int16_t id);
 
-    virtual ~Party();
+    ~Party();
 
     MemberList mMembers;
     std::string mName;
diff --git a/src/render/mobileopenglgraphics.h b/src/render/mobileopenglgraphics.h
index 75b1b3371..5e97dc6d1 100644
--- a/src/render/mobileopenglgraphics.h
+++ b/src/render/mobileopenglgraphics.h
@@ -182,7 +182,7 @@ class MobileOpenGLGraphics final : public Graphics
         void updateTextureFormat();
 
 #ifdef DEBUG_DRAW_CALLS
-        virtual unsigned int getDrawCalls() const
+        unsigned int getDrawCalls() const
         { return mLastDrawCalls; }
 
         static unsigned int mDrawCalls;
diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h
index 737cb9718..0ba29a141 100644
--- a/src/render/normalopenglgraphics.h
+++ b/src/render/normalopenglgraphics.h
@@ -190,7 +190,7 @@ class NormalOpenGLGraphics final : public Graphics
         void updateTextureFormat();
 
 #ifdef DEBUG_DRAW_CALLS
-        virtual unsigned int getDrawCalls() const
+        unsigned int getDrawCalls() const
         { return mLastDrawCalls; }
 
         static unsigned int mDrawCalls;
@@ -198,7 +198,7 @@ class NormalOpenGLGraphics final : public Graphics
         static unsigned int mLastDrawCalls;
 #endif
 #ifdef DEBUG_BIND_TEXTURE
-        virtual unsigned int getBinds() const
+        unsigned int getBinds() const
         { return mLastBinds; }
 #endif
         static void bindTexture(const GLenum target, const GLuint texture);
diff --git a/src/render/nullopenglgraphics.h b/src/render/nullopenglgraphics.h
index 0f27590be..588bf0283 100644
--- a/src/render/nullopenglgraphics.h
+++ b/src/render/nullopenglgraphics.h
@@ -190,7 +190,7 @@ class NullOpenGLGraphics final : public Graphics
         void updateTextureFormat();
 
 #ifdef DEBUG_DRAW_CALLS
-        virtual unsigned int getDrawCalls() const
+        unsigned int getDrawCalls() const
         { return mLastDrawCalls; }
 
         static unsigned int mDrawCalls;
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index 027a1e835..18b25fe2f 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -64,7 +64,7 @@ class OpenGLImageHelper final : public ImageHelper
 
         A_DELETE_COPY(OpenGLImageHelper)
 
-        virtual ~OpenGLImageHelper()
+        ~OpenGLImageHelper()
         { }
 
         /**
diff --git a/src/resources/sdl2imagehelper.h b/src/resources/sdl2imagehelper.h
index 1790484e3..43e6178e7 100644
--- a/src/resources/sdl2imagehelper.h
+++ b/src/resources/sdl2imagehelper.h
@@ -47,7 +47,7 @@ class SDLImageHelper final : public ImageHelper
 
         A_DELETE_COPY(SDLImageHelper)
 
-        virtual ~SDLImageHelper()
+        ~SDLImageHelper()
         { }
 
         /**
diff --git a/src/resources/sdl2softwareimagehelper.h b/src/resources/sdl2softwareimagehelper.h
index 2eda73aa5..f4160b2cd 100644
--- a/src/resources/sdl2softwareimagehelper.h
+++ b/src/resources/sdl2softwareimagehelper.h
@@ -47,7 +47,7 @@ class SDL2SoftwareImageHelper final : public ImageHelper
 
         A_DELETE_COPY(SDL2SoftwareImageHelper)
 
-        virtual ~SDL2SoftwareImageHelper()
+        ~SDL2SoftwareImageHelper()
         { }
 
         /**
diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h
index 995f5adcc..7253e9090 100644
--- a/src/resources/sdlimagehelper.h
+++ b/src/resources/sdlimagehelper.h
@@ -48,7 +48,7 @@ class SDLImageHelper final : public ImageHelper
 
         A_DELETE_COPY(SDLImageHelper)
 
-        virtual ~SDLImageHelper()
+        ~SDLImageHelper()
         { }
 
         /**
diff --git a/src/resources/sdlmusic.h b/src/resources/sdlmusic.h
index 04b78bde9..957468134 100644
--- a/src/resources/sdlmusic.h
+++ b/src/resources/sdlmusic.h
@@ -46,7 +46,7 @@ class SDLMusic final : public Resource
         /**
          * Destructor.
          */
-        virtual ~SDLMusic();
+        ~SDLMusic();
 
         /**
          * Loads a music from a buffer in memory.
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 3b6724820..4768c9284 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -40,7 +40,7 @@ class SoundEffect final : public Resource
         /**
          * Destructor.
          */
-        virtual ~SoundEffect();
+        ~SoundEffect();
 
         /**
          * Loads a sample from a buffer in memory.
diff --git a/src/resources/surfaceimagehelper.h b/src/resources/surfaceimagehelper.h
index 1a1a03d5a..dbc859e9a 100644
--- a/src/resources/surfaceimagehelper.h
+++ b/src/resources/surfaceimagehelper.h
@@ -50,7 +50,7 @@ class SurfaceImageHelper final : public ImageHelper
 
         A_DELETE_COPY(SurfaceImageHelper)
 
-        virtual ~SurfaceImageHelper()
+        ~SurfaceImageHelper()
         { }
 
         /**
diff --git a/src/text.h b/src/text.h
index 4efc63163..8ce105157 100644
--- a/src/text.h
+++ b/src/text.h
@@ -99,7 +99,7 @@ class FlashText final : public Text
         /**
          * Remove the text from the screen
          */
-        virtual ~FlashText()
+        ~FlashText()
         { }
 
         /**
@@ -111,8 +111,8 @@ class FlashText final : public Text
         /**
          * Draws the text.
          */
-        virtual void draw(Graphics *const graphics,
-                          const int xOff, const int yOff) override;
+        void draw(Graphics *const graphics,
+                  const int xOff, const int yOff) override;
 
     private:
         int mTime;             /**< Time left for flashing */