Add missing override and final to destructors.

Also remove some empty destructors.

43 files changed, 42 insertions, 48 deletions

diff --git a/src/gui/windows/bankwindow.h b/src/gui/windows/bankwindow.h
index 046b11ec4..d02273c1d 100644
--- a/src/gui/windows/bankwindow.h
+++ b/src/gui/windows/bankwindow.h
@@ -44,7 +44,7 @@ class BankWindow final : public Window,
 
         A_DELETE_COPY(BankWindow)
 
-        ~BankWindow();
+        ~BankWindow() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h
index 7914c0ef3..bab391c7b 100644
--- a/src/gui/windows/buydialog.h
+++ b/src/gui/windows/buydialog.h
@@ -94,7 +94,7 @@ class BuyDialog final : public Window,
         /**
          * Destructor
          */
-        ~BuyDialog();
+        ~BuyDialog() override final;
 
         enum
         {
diff --git a/src/gui/windows/buyselldialog.h b/src/gui/windows/buyselldialog.h
index b2a527d16..baff4e6ae 100644
--- a/src/gui/windows/buyselldialog.h
+++ b/src/gui/windows/buyselldialog.h
@@ -52,7 +52,7 @@ class BuySellDialog final : public Window,
 
         A_DELETE_COPY(BuySellDialog)
 
-        ~BuySellDialog();
+        ~BuySellDialog() override final;
 
         void init();
 
diff --git a/src/gui/windows/changeemaildialog.h b/src/gui/windows/changeemaildialog.h
index c20dffd9e..be23802b7 100644
--- a/src/gui/windows/changeemaildialog.h
+++ b/src/gui/windows/changeemaildialog.h
@@ -53,7 +53,7 @@ class ChangeEmailDialog final : public Window,
         /**
          * Destructor.
          */
-        ~ChangeEmailDialog();
+        ~ChangeEmailDialog() override final;
 
         /**
          * Called when receiving actions from the widgets.
diff --git a/src/gui/windows/changepassworddialog.h b/src/gui/windows/changepassworddialog.h
index dd5c0d152..97531a7c0 100644
--- a/src/gui/windows/changepassworddialog.h
+++ b/src/gui/windows/changepassworddialog.h
@@ -53,7 +53,7 @@ class ChangePasswordDialog final : public Window,
         /**
          * Destructor
          */
-        ~ChangePasswordDialog();
+        ~ChangePasswordDialog() override final;
 
         /**
          * Called when receiving actions from the widgets.
diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h
index 9d786a35c..63d9e01c6 100644
--- a/src/gui/windows/charcreatedialog.h
+++ b/src/gui/windows/charcreatedialog.h
@@ -59,7 +59,7 @@ class CharCreateDialog final : public Window,
         /**
          * Destructor.
          */
-        ~CharCreateDialog();
+        ~CharCreateDialog() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h
index 682dcd108..dba37ccbf 100644
--- a/src/gui/windows/charselectdialog.h
+++ b/src/gui/windows/charselectdialog.h
@@ -63,7 +63,7 @@ class CharSelectDialog final : public Window,
 
         A_DELETE_COPY(CharSelectDialog)
 
-        ~CharSelectDialog();
+        ~CharSelectDialog() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 051d89288..0f27e8cbc 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -69,7 +69,7 @@ class ChatWindow final : public Window,
         /**
          * Destructor: used to write back values to the config file
          */
-        ~ChatWindow();
+        ~ChatWindow() override final;
 
         /**
          * Gets the focused tab.
diff --git a/src/gui/windows/cutinwindow.h b/src/gui/windows/cutinwindow.h
index c0aa81577..ce404c57d 100644
--- a/src/gui/windows/cutinwindow.h
+++ b/src/gui/windows/cutinwindow.h
@@ -36,7 +36,7 @@ class CutInWindow final : public Window
 
         A_DELETE_COPY(CutInWindow)
 
-        ~CutInWindow();
+        ~CutInWindow() override final;
 
         void draw(Graphics *const graphics) override final A_NONNULL(2);
 
diff --git a/src/gui/windows/debugwindow.h b/src/gui/windows/debugwindow.h
index 6350b8820..344940deb 100644
--- a/src/gui/windows/debugwindow.h
+++ b/src/gui/windows/debugwindow.h
@@ -45,7 +45,7 @@ class DebugWindow final : public Window
 
         A_DELETE_COPY(DebugWindow)
 
-        ~DebugWindow();
+        ~DebugWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h
index 334799b61..c3f59c17c 100644
--- a/src/gui/windows/didyouknowwindow.h
+++ b/src/gui/windows/didyouknowwindow.h
@@ -45,7 +45,7 @@ class DidYouKnowWindow final : public Window,
          */
         DidYouKnowWindow();
 
-        ~DidYouKnowWindow();
+        ~DidYouKnowWindow() override final;
 
         A_DELETE_COPY(DidYouKnowWindow)
 
diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h
index e53632c00..84a8ca217 100644
--- a/src/gui/windows/editserverdialog.h
+++ b/src/gui/windows/editserverdialog.h
@@ -53,7 +53,7 @@ class EditServerDialog final : public Window,
 
         A_DELETE_COPY(EditServerDialog)
 
-        ~EditServerDialog();
+        ~EditServerDialog() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/emotewindow.h b/src/gui/windows/emotewindow.h
index 66fb0c83c..1e3c15152 100644
--- a/src/gui/windows/emotewindow.h
+++ b/src/gui/windows/emotewindow.h
@@ -39,7 +39,7 @@ class EmoteWindow final : public Window
 
         A_DELETE_COPY(EmoteWindow)
 
-        ~EmoteWindow();
+        ~EmoteWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h
index d8d4e91c9..f24bf0edd 100644
--- a/src/gui/windows/equipmentwindow.h
+++ b/src/gui/windows/equipmentwindow.h
@@ -64,7 +64,7 @@ class EquipmentWindow final : public Window,
         /**
          * Destructor.
          */
-        ~EquipmentWindow();
+        ~EquipmentWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h
index 82726e151..787a5280a 100644
--- a/src/gui/windows/inventorywindow.h
+++ b/src/gui/windows/inventorywindow.h
@@ -71,7 +71,7 @@ class InventoryWindow final : public Window,
         /**
          * Destructor.
          */
-        ~InventoryWindow();
+        ~InventoryWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h
index ca0bd4955..efeb546b5 100644
--- a/src/gui/windows/itemamountwindow.h
+++ b/src/gui/windows/itemamountwindow.h
@@ -83,7 +83,7 @@ class ItemAmountWindow final : public Window,
                                int maxRange,
                                const int tag);
 
-        ~ItemAmountWindow();
+        ~ItemAmountWindow() override final;
 
 #ifndef UNITTESTS
     private:
diff --git a/src/gui/windows/killstats.h b/src/gui/windows/killstats.h
index c701d8430..e41b51706 100644
--- a/src/gui/windows/killstats.h
+++ b/src/gui/windows/killstats.h
@@ -44,12 +44,6 @@ class KillStats final : public Window,
         A_DELETE_COPY(KillStats)
 
         /**
-         * Destructor.
-         */
-        ~KillStats()
-        { }
-
-        /**
          * Stuff.
          */
         void action(const ActionEvent &event) override final;
diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h
index c3178f079..d05c29fb7 100644
--- a/src/gui/windows/logindialog.h
+++ b/src/gui/windows/logindialog.h
@@ -59,7 +59,7 @@ class LoginDialog final : public Window,
 
         A_DELETE_COPY(LoginDialog)
 
-        ~LoginDialog();
+        ~LoginDialog() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/maileditwindow.h b/src/gui/windows/maileditwindow.h
index 2c6c5d0ef..efcd77cad 100644
--- a/src/gui/windows/maileditwindow.h
+++ b/src/gui/windows/maileditwindow.h
@@ -44,7 +44,7 @@ class MailEditWindow final : public Window,
 
         A_DELETE_COPY(MailEditWindow)
 
-        ~MailEditWindow();
+        ~MailEditWindow() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/mailviewwindow.h b/src/gui/windows/mailviewwindow.h
index 19585de03..e44a51369 100644
--- a/src/gui/windows/mailviewwindow.h
+++ b/src/gui/windows/mailviewwindow.h
@@ -42,7 +42,7 @@ class MailViewWindow final : public Window,
 
         A_DELETE_COPY(MailViewWindow)
 
-        ~MailViewWindow();
+        ~MailViewWindow() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/mailwindow.h b/src/gui/windows/mailwindow.h
index c99236499..ea4935923 100644
--- a/src/gui/windows/mailwindow.h
+++ b/src/gui/windows/mailwindow.h
@@ -47,7 +47,7 @@ class MailWindow final : public Window,
 
         A_DELETE_COPY(MailWindow)
 
-        ~MailWindow();
+        ~MailWindow() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/minimap.h b/src/gui/windows/minimap.h
index 5aad6e8be..7eff8c367 100644
--- a/src/gui/windows/minimap.h
+++ b/src/gui/windows/minimap.h
@@ -44,7 +44,7 @@ class Minimap final : public Window, public ConfigListener
 
         A_DELETE_COPY(Minimap)
 
-        ~Minimap();
+        ~Minimap() override final;
 
         /**
          * Sets the map image that should be displayed.
diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h
index 9d6e19ac7..33192978c 100644
--- a/src/gui/windows/ministatuswindow.h
+++ b/src/gui/windows/ministatuswindow.h
@@ -54,7 +54,7 @@ class MiniStatusWindow final : public Window,
 
         A_DELETE_COPY(MiniStatusWindow)
 
-        ~MiniStatusWindow();
+        ~MiniStatusWindow() override final;
 
         /**
          * Sets one of the icons.
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index 71dd171b6..426e1f48f 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -76,7 +76,7 @@ class NpcDialog final : public Window,
 
         A_DELETE_COPY(NpcDialog)
 
-        ~NpcDialog();
+        ~NpcDialog() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h
index 14c7fd3ce..8ff1cc4f4 100644
--- a/src/gui/windows/outfitwindow.h
+++ b/src/gui/windows/outfitwindow.h
@@ -50,7 +50,7 @@ class OutfitWindow final : public Window,
         /**
          * Destructor.
          */
-        ~OutfitWindow();
+        ~OutfitWindow() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h
index fd4175754..8fea2fc2c 100644
--- a/src/gui/windows/questswindow.h
+++ b/src/gui/windows/questswindow.h
@@ -54,7 +54,7 @@ class QuestsWindow final : public Window,
 
         A_DELETE_COPY(QuestsWindow)
 
-        ~QuestsWindow();
+        ~QuestsWindow() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h
index e12e13e7b..8cda875a7 100644
--- a/src/gui/windows/quitdialog.h
+++ b/src/gui/windows/quitdialog.h
@@ -53,7 +53,7 @@ class QuitDialog final : public Window,
         /**
          * Destructor
          */
-        ~QuitDialog();
+        ~QuitDialog() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/registerdialog.h b/src/gui/windows/registerdialog.h
index d0d0d821a..380afc7ce 100644
--- a/src/gui/windows/registerdialog.h
+++ b/src/gui/windows/registerdialog.h
@@ -57,7 +57,7 @@ class RegisterDialog final : public Window,
         /**
          * Destructor
          */
-        ~RegisterDialog();
+        ~RegisterDialog() override final;
 
         void postInit() override;
 
diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h
index 484c28507..19373cafc 100644
--- a/src/gui/windows/serverdialog.h
+++ b/src/gui/windows/serverdialog.h
@@ -73,7 +73,7 @@ class ServerDialog final : public Window,
         /**
          * Destructor
          */
-        ~ServerDialog();
+        ~ServerDialog() override final;
 
         /**
          * Called when receiving actions from the widgets.
diff --git a/src/gui/windows/serverinfowindow.h b/src/gui/windows/serverinfowindow.h
index d872b1fdf..9ce7a6fa3 100644
--- a/src/gui/windows/serverinfowindow.h
+++ b/src/gui/windows/serverinfowindow.h
@@ -41,7 +41,7 @@ class ServerInfoWindow final : public Window,
 
         void postInit() override final;
 
-        ~ServerInfoWindow();
+        ~ServerInfoWindow() override final;
 
         void handleLink(const std::string &link,
                         MouseEvent *const event A_UNUSED) override final;
diff --git a/src/gui/windows/setupwindow.h b/src/gui/windows/setupwindow.h
index 79a11a469..2457382a4 100644
--- a/src/gui/windows/setupwindow.h
+++ b/src/gui/windows/setupwindow.h
@@ -46,7 +46,7 @@ class SetupWindow final : public Window,
 
         A_DELETE_COPY(SetupWindow)
 
-        ~SetupWindow();
+        ~SetupWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h
index 19ceca838..0a8f66b1d 100644
--- a/src/gui/windows/shopwindow.h
+++ b/src/gui/windows/shopwindow.h
@@ -73,7 +73,7 @@ class ShopWindow final : public Window,
         /**
          * Destructor
          */
-        ~ShopWindow();
+        ~ShopWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/shortcutwindow.h b/src/gui/windows/shortcutwindow.h
index 8d77f9a5d..6af92d641 100644
--- a/src/gui/windows/shortcutwindow.h
+++ b/src/gui/windows/shortcutwindow.h
@@ -56,7 +56,7 @@ class ShortcutWindow final : public Window
         /**
          * Destructor.
          */
-        ~ShortcutWindow();
+        ~ShortcutWindow() override final;
 
         void addTab(const std::string &name, ShortcutContainer *const content);
 
diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h
index 2273125f0..a69161b32 100644
--- a/src/gui/windows/skilldialog.h
+++ b/src/gui/windows/skilldialog.h
@@ -60,7 +60,7 @@ class SkillDialog final : public Window,
 
         A_DELETE_COPY(SkillDialog)
 
-        ~SkillDialog();
+        ~SkillDialog() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h
index 394fdf9d6..bfde9a594 100644
--- a/src/gui/windows/socialwindow.h
+++ b/src/gui/windows/socialwindow.h
@@ -51,7 +51,7 @@ class SocialWindow final : public Window,
 
         A_DELETE_COPY(SocialWindow)
 
-        ~SocialWindow();
+        ~SocialWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h
index c3567deca..295d7dc25 100644
--- a/src/gui/windows/statuswindow.h
+++ b/src/gui/windows/statuswindow.h
@@ -52,7 +52,7 @@ class StatusWindow final : public Window,
 
         A_DELETE_COPY(StatusWindow)
 
-        ~StatusWindow();
+        ~StatusWindow() override final;
 
         void setPointsNeeded(const AttributesT id,
                              const int needed);
diff --git a/src/gui/windows/textcommandeditor.h b/src/gui/windows/textcommandeditor.h
index 88bfd48d4..c177efd2b 100644
--- a/src/gui/windows/textcommandeditor.h
+++ b/src/gui/windows/textcommandeditor.h
@@ -55,7 +55,7 @@ class TextCommandEditor final : public Window,
         /**
          * Destructor.
          */
-        ~TextCommandEditor();
+        ~TextCommandEditor() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/textdialog.h b/src/gui/windows/textdialog.h
index 3a7311e32..225a5c974 100644
--- a/src/gui/windows/textdialog.h
+++ b/src/gui/windows/textdialog.h
@@ -52,7 +52,7 @@ class TextDialog final : public Window,
 
         A_DELETE_COPY(TextDialog)
 
-        ~TextDialog();
+        ~TextDialog() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/textselectdialog.h b/src/gui/windows/textselectdialog.h
index 30e596d32..6c48288fa 100644
--- a/src/gui/windows/textselectdialog.h
+++ b/src/gui/windows/textselectdialog.h
@@ -52,7 +52,7 @@ class TextSelectDialog notfinal : public Window,
         /**
          * Destructor
          */
-        ~TextSelectDialog();
+        ~TextSelectDialog() override final;
 
         /**
          * Called when receiving actions from the widgets.
diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h
index 21461d9e7..05ca4edf1 100644
--- a/src/gui/windows/tradewindow.h
+++ b/src/gui/windows/tradewindow.h
@@ -65,7 +65,7 @@ class TradeWindow final : public Window,
         /**
          * Destructor.
          */
-        ~TradeWindow();
+        ~TradeWindow() override final;
 
         /**
          * Displays expected money in the trade window.
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index 661168a9f..5c58cd299 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -80,7 +80,7 @@ class UpdaterWindow final : public Window,
         /**
          * Destructor
          */
-        ~UpdaterWindow();
+        ~UpdaterWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h
index afdb43785..5fb07e999 100644
--- a/src/gui/windows/whoisonline.h
+++ b/src/gui/windows/whoisonline.h
@@ -54,7 +54,7 @@ class WhoIsOnline final : public Window,
         /**
          * Destructor
          */
-        ~WhoIsOnline();
+        ~WhoIsOnline() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/worldselectdialog.h b/src/gui/windows/worldselectdialog.h
index 4c6dc0f8c..fcfe3e3bc 100644
--- a/src/gui/windows/worldselectdialog.h
+++ b/src/gui/windows/worldselectdialog.h
@@ -58,7 +58,7 @@ class WorldSelectDialog final : public Window,
         /**
          * Destructor.
          */
-        ~WorldSelectDialog();
+        ~WorldSelectDialog() override final;
 
         /**
          * Called when receiving actions from the widgets.