Add missing override and final to destructors.

Also remove some empty destructors.

36 files changed, 36 insertions, 36 deletions

diff --git a/src/gui/widgets/tabs/chat/battletab.h b/src/gui/widgets/tabs/chat/battletab.h
index 24f69c8b9..e8cdacd65 100644
--- a/src/gui/widgets/tabs/chat/battletab.h
+++ b/src/gui/widgets/tabs/chat/battletab.h
@@ -35,7 +35,7 @@ class BattleTab final : public ChatTab
 
         A_DELETE_COPY(BattleTab)
 
-        ~BattleTab();
+        ~BattleTab() override final;
 };
 
 extern BattleTab *battleChatTab;
diff --git a/src/gui/widgets/tabs/chat/channeltab.h b/src/gui/widgets/tabs/chat/channeltab.h
index 3ac51e59d..2f0517684 100644
--- a/src/gui/widgets/tabs/chat/channeltab.h
+++ b/src/gui/widgets/tabs/chat/channeltab.h
@@ -36,7 +36,7 @@ class ChannelTab final : public ChatTab
 
         A_DELETE_COPY(ChannelTab)
 
-        ~ChannelTab();
+        ~ChannelTab() override final;
 
     protected:
         void handleInput(const std::string &msg) override final;
diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h
index aeefe43db..088977631 100644
--- a/src/gui/widgets/tabs/chat/chattab.h
+++ b/src/gui/widgets/tabs/chat/chattab.h
@@ -72,7 +72,7 @@ class ChatTab notfinal : public Tab
 
         A_DELETE_COPY(ChatTab)
 
-        virtual ~ChatTab();
+        ~ChatTab() override;
 
         /**
          * Adds a line of text to our message list. Parameters:
diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.h b/src/gui/widgets/tabs/chat/emulateguildtab.h
index 3cf3a0e59..fbe8aab00 100644
--- a/src/gui/widgets/tabs/chat/emulateguildtab.h
+++ b/src/gui/widgets/tabs/chat/emulateguildtab.h
@@ -38,7 +38,7 @@ class EmulateGuildTab final : public ChatTab,
 
         A_DELETE_COPY(EmulateGuildTab)
 
-        ~EmulateGuildTab();
+        ~EmulateGuildTab() override final;
 
         bool handleCommand(const std::string &restrict type,
                            const std::string &restrict args) override final;
diff --git a/src/gui/widgets/tabs/chat/gmtab.h b/src/gui/widgets/tabs/chat/gmtab.h
index a8dd46fd3..609f9da75 100644
--- a/src/gui/widgets/tabs/chat/gmtab.h
+++ b/src/gui/widgets/tabs/chat/gmtab.h
@@ -33,7 +33,7 @@ class GmTab final : public ChatTab
 
         A_DELETE_COPY(GmTab)
 
-        ~GmTab();
+        ~GmTab() override final;
 
     protected:
         void getAutoCompleteList(StringVect &names) const
diff --git a/src/gui/widgets/tabs/chat/guildtab.h b/src/gui/widgets/tabs/chat/guildtab.h
index 5aa540ecb..95142c682 100644
--- a/src/gui/widgets/tabs/chat/guildtab.h
+++ b/src/gui/widgets/tabs/chat/guildtab.h
@@ -36,7 +36,7 @@ class GuildTab notfinal : public ChatTab,
 
         A_DELETE_COPY(GuildTab)
 
-        virtual ~GuildTab();
+        ~GuildTab() override final;
 
         bool handleCommand(const std::string &restrict type,
                            const std::string &restrict args) override final;
diff --git a/src/gui/widgets/tabs/chat/langtab.h b/src/gui/widgets/tabs/chat/langtab.h
index 773431e85..44173c653 100644
--- a/src/gui/widgets/tabs/chat/langtab.h
+++ b/src/gui/widgets/tabs/chat/langtab.h
@@ -31,7 +31,7 @@ class LangTab final : public ChatTab
 
         A_DELETE_COPY(LangTab)
 
-        ~LangTab();
+        ~LangTab() override final;
 };
 
 extern LangTab *langChatTab;
diff --git a/src/gui/widgets/tabs/chat/partytab.h b/src/gui/widgets/tabs/chat/partytab.h
index a987c9362..71de2395f 100644
--- a/src/gui/widgets/tabs/chat/partytab.h
+++ b/src/gui/widgets/tabs/chat/partytab.h
@@ -36,7 +36,7 @@ class PartyTab notfinal : public ChatTab,
 
         A_DELETE_COPY(PartyTab)
 
-        virtual ~PartyTab();
+        ~PartyTab() override;
 
         bool handleCommand(const std::string &restrict type,
                            const std::string &restrict args) override final;
diff --git a/src/gui/widgets/tabs/chat/tradetab.h b/src/gui/widgets/tabs/chat/tradetab.h
index 26c9bf8f6..ef0f8f7cb 100644
--- a/src/gui/widgets/tabs/chat/tradetab.h
+++ b/src/gui/widgets/tabs/chat/tradetab.h
@@ -35,7 +35,7 @@ class TradeTab final : public ChatTab
 
         A_DELETE_COPY(TradeTab)
 
-        ~TradeTab();
+        ~TradeTab() override final;
 
     protected:
         void handleInput(const std::string &msg) override final;
diff --git a/src/gui/widgets/tabs/chat/whispertab.h b/src/gui/widgets/tabs/chat/whispertab.h
index 1d3c03857..53ad98b6f 100644
--- a/src/gui/widgets/tabs/chat/whispertab.h
+++ b/src/gui/widgets/tabs/chat/whispertab.h
@@ -60,7 +60,7 @@ class WhisperTab final : public ChatTab
                    const std::string &caption,
                    const std::string &nick);
 
-        ~WhisperTab();
+        ~WhisperTab() override final;
 
         void handleInput(const std::string &msg) override final;
 
diff --git a/src/gui/widgets/tabs/setup_audio.h b/src/gui/widgets/tabs/setup_audio.h
index d76add16c..7d90bd381 100644
--- a/src/gui/widgets/tabs/setup_audio.h
+++ b/src/gui/widgets/tabs/setup_audio.h
@@ -34,7 +34,7 @@ class Setup_Audio final : public SetupTabScroll
 
         A_DELETE_COPY(Setup_Audio)
 
-        ~Setup_Audio();
+        ~Setup_Audio() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_colors.h b/src/gui/widgets/tabs/setup_colors.h
index 1ba74f340..cb6755371 100644
--- a/src/gui/widgets/tabs/setup_colors.h
+++ b/src/gui/widgets/tabs/setup_colors.h
@@ -42,7 +42,7 @@ class Setup_Colors final : public SetupTab,
 
         A_DELETE_COPY(Setup_Colors)
 
-        ~Setup_Colors();
+        ~Setup_Colors() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_input.h b/src/gui/widgets/tabs/setup_input.h
index 2da411b2c..f22d8f960 100644
--- a/src/gui/widgets/tabs/setup_input.h
+++ b/src/gui/widgets/tabs/setup_input.h
@@ -49,7 +49,7 @@ class Setup_Input final : public SetupTab
         /**
          * Destructor
          */
-        ~Setup_Input();
+        ~Setup_Input() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_joystick.h b/src/gui/widgets/tabs/setup_joystick.h
index c66ab8687..286ebc824 100644
--- a/src/gui/widgets/tabs/setup_joystick.h
+++ b/src/gui/widgets/tabs/setup_joystick.h
@@ -38,7 +38,7 @@ class Setup_Joystick final : public SetupTab
 
         A_DELETE_COPY(Setup_Joystick)
 
-        ~Setup_Joystick();
+        ~Setup_Joystick() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_misc.h b/src/gui/widgets/tabs/setup_misc.h
index 787f4c181..2f5d8a179 100644
--- a/src/gui/widgets/tabs/setup_misc.h
+++ b/src/gui/widgets/tabs/setup_misc.h
@@ -34,7 +34,7 @@ class Setup_Misc final : public SetupTabScroll
 
         A_DELETE_COPY(Setup_Misc)
 
-        ~Setup_Misc();
+        ~Setup_Misc() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_mods.h b/src/gui/widgets/tabs/setup_mods.h
index 488915d31..71e35ff66 100644
--- a/src/gui/widgets/tabs/setup_mods.h
+++ b/src/gui/widgets/tabs/setup_mods.h
@@ -32,7 +32,7 @@ class Setup_Mods final : public SetupTabScroll
 
         A_DELETE_COPY(Setup_Mods)
 
-        ~Setup_Mods();
+        ~Setup_Mods() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_perfomance.h b/src/gui/widgets/tabs/setup_perfomance.h
index 95030a8e5..d4cadd659 100644
--- a/src/gui/widgets/tabs/setup_perfomance.h
+++ b/src/gui/widgets/tabs/setup_perfomance.h
@@ -34,7 +34,7 @@ class Setup_Perfomance final : public SetupTabScroll
 
         A_DELETE_COPY(Setup_Perfomance)
 
-        ~Setup_Perfomance();
+        ~Setup_Perfomance() override final;
 
     private:
 #ifdef USE_SDL2
diff --git a/src/gui/widgets/tabs/setup_players.h b/src/gui/widgets/tabs/setup_players.h
index d29d41781..9be4f29c5 100644
--- a/src/gui/widgets/tabs/setup_players.h
+++ b/src/gui/widgets/tabs/setup_players.h
@@ -32,7 +32,7 @@ class Setup_Players final : public SetupTabScroll
     public:
         explicit Setup_Players(const Widget2 *const widget);
 
-        ~Setup_Players();
+        ~Setup_Players() override final;
 
         A_DELETE_COPY(Setup_Players)
 
diff --git a/src/gui/widgets/tabs/setup_quick.h b/src/gui/widgets/tabs/setup_quick.h
index f174153ee..20e13d2de 100644
--- a/src/gui/widgets/tabs/setup_quick.h
+++ b/src/gui/widgets/tabs/setup_quick.h
@@ -34,7 +34,7 @@ class Setup_Quick final : public SetupTabScroll
 
         A_DELETE_COPY(Setup_Quick)
 
-        ~Setup_Quick();
+        ~Setup_Quick() override final;
 
     protected:
         NamesModel *mMoveTypeList;
diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h
index 879450891..9d5566e20 100644
--- a/src/gui/widgets/tabs/setup_relations.h
+++ b/src/gui/widgets/tabs/setup_relations.h
@@ -44,7 +44,7 @@ class Setup_Relations final : public SetupTab,
 
         A_DELETE_COPY(Setup_Relations)
 
-        ~Setup_Relations();
+        ~Setup_Relations() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_theme.h b/src/gui/widgets/tabs/setup_theme.h
index 57798f243..9a1702748 100644
--- a/src/gui/widgets/tabs/setup_theme.h
+++ b/src/gui/widgets/tabs/setup_theme.h
@@ -40,7 +40,7 @@ class Setup_Theme final : public SetupTab
 
         A_DELETE_COPY(Setup_Theme)
 
-        ~Setup_Theme();
+        ~Setup_Theme() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_touch.h b/src/gui/widgets/tabs/setup_touch.h
index a87a46c77..35e559934 100644
--- a/src/gui/widgets/tabs/setup_touch.h
+++ b/src/gui/widgets/tabs/setup_touch.h
@@ -33,7 +33,7 @@ class Setup_Touch final : public SetupTabScroll
 
         A_DELETE_COPY(Setup_Touch)
 
-        ~Setup_Touch();
+        ~Setup_Touch() override final;
 
     protected:
         NamesModel *mSizeList;
diff --git a/src/gui/widgets/tabs/setup_video.h b/src/gui/widgets/tabs/setup_video.h
index e327a29d8..809323c63 100644
--- a/src/gui/widgets/tabs/setup_video.h
+++ b/src/gui/widgets/tabs/setup_video.h
@@ -45,7 +45,7 @@ class Setup_Video final : public SetupTab,
 
         A_DELETE_COPY(Setup_Video)
 
-        ~Setup_Video();
+        ~Setup_Video() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_visual.h b/src/gui/widgets/tabs/setup_visual.h
index 08d1c7848..756ee5096 100644
--- a/src/gui/widgets/tabs/setup_visual.h
+++ b/src/gui/widgets/tabs/setup_visual.h
@@ -35,7 +35,7 @@ class Setup_Visual final : public SetupTabScroll
 
         A_DELETE_COPY(Setup_Visual)
 
-        ~Setup_Visual();
+        ~Setup_Visual() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h
index 655b98c85..e618e0d72 100644
--- a/src/gui/widgets/tabs/setuptabscroll.h
+++ b/src/gui/widgets/tabs/setuptabscroll.h
@@ -36,7 +36,7 @@ class SetupTabScroll notfinal : public SetupTab
 
         A_DELETE_COPY(SetupTabScroll)
 
-        virtual ~SetupTabScroll();
+        ~SetupTabScroll() override;
 
         void addControl(SetupItem *const widget);
 
diff --git a/src/gui/widgets/tabs/skilltab.h b/src/gui/widgets/tabs/skilltab.h
index 9086a4d0c..52ab92bdd 100644
--- a/src/gui/widgets/tabs/skilltab.h
+++ b/src/gui/widgets/tabs/skilltab.h
@@ -57,7 +57,7 @@ class SkillTab final : public Tab
 
         A_DELETE_COPY(SkillTab)
 
-        ~SkillTab()
+        ~SkillTab() override final
         {
             delete2(mListBox)
             delete2(mRectangleListBox)
diff --git a/src/gui/widgets/tabs/socialattacktab.h b/src/gui/widgets/tabs/socialattacktab.h
index e876a60ae..e59990005 100644
--- a/src/gui/widgets/tabs/socialattacktab.h
+++ b/src/gui/widgets/tabs/socialattacktab.h
@@ -52,7 +52,7 @@ class SocialAttackTab final : public SocialTab
 
         A_DELETE_COPY(SocialAttackTab)
 
-        ~SocialAttackTab()
+        ~SocialAttackTab() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h
index d1cd942cd..8577af974 100644
--- a/src/gui/widgets/tabs/socialfriendstab.h
+++ b/src/gui/widgets/tabs/socialfriendstab.h
@@ -58,7 +58,7 @@ class SocialFriendsTab final : public SocialTab
 
         A_DELETE_COPY(SocialFriendsTab)
 
-        ~SocialFriendsTab()
+        ~SocialFriendsTab() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h
index a42ad1dad..d0a1f8a1d 100644
--- a/src/gui/widgets/tabs/socialguildtab.h
+++ b/src/gui/widgets/tabs/socialguildtab.h
@@ -66,7 +66,7 @@ class SocialGuildTab final : public SocialTab,
 
         A_DELETE_COPY(SocialGuildTab)
 
-        ~SocialGuildTab()
+        ~SocialGuildTab() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h
index c0dc123a4..f8dc661b7 100644
--- a/src/gui/widgets/tabs/socialguildtab2.h
+++ b/src/gui/widgets/tabs/socialguildtab2.h
@@ -65,7 +65,7 @@ class SocialGuildTab2 final : public SocialTab,
 
         A_DELETE_COPY(SocialGuildTab2)
 
-        ~SocialGuildTab2()
+        ~SocialGuildTab2() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h
index 1b049f055..d447cb6ce 100644
--- a/src/gui/widgets/tabs/socialnavigationtab.h
+++ b/src/gui/widgets/tabs/socialnavigationtab.h
@@ -63,7 +63,7 @@ class SocialNavigationTab final : public SocialTab
 
         A_DELETE_COPY(SocialNavigationTab)
 
-        ~SocialNavigationTab()
+        ~SocialNavigationTab() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h
index 17fcfd3f1..f296aa041 100644
--- a/src/gui/widgets/tabs/socialpartytab.h
+++ b/src/gui/widgets/tabs/socialpartytab.h
@@ -68,7 +68,7 @@ class SocialPartyTab final : public SocialTab,
 
         A_DELETE_COPY(SocialPartyTab)
 
-        ~SocialPartyTab()
+        ~SocialPartyTab() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialpickuptab.h b/src/gui/widgets/tabs/socialpickuptab.h
index 93d00e81a..626cb0a10 100644
--- a/src/gui/widgets/tabs/socialpickuptab.h
+++ b/src/gui/widgets/tabs/socialpickuptab.h
@@ -52,7 +52,7 @@ class SocialPickupTab final : public SocialTab
 
         A_DELETE_COPY(SocialPickupTab)
 
-        ~SocialPickupTab()
+        ~SocialPickupTab() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h
index c43093fca..b71ec3be7 100644
--- a/src/gui/widgets/tabs/socialplayerstab.h
+++ b/src/gui/widgets/tabs/socialplayerstab.h
@@ -57,7 +57,7 @@ class SocialPlayersTab final : public SocialTab
 
         A_DELETE_COPY(SocialPlayersTab)
 
-        ~SocialPlayersTab()
+        ~SocialPlayersTab() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialtab.h b/src/gui/widgets/tabs/socialtab.h
index 1c94aaede..85aa2c880 100644
--- a/src/gui/widgets/tabs/socialtab.h
+++ b/src/gui/widgets/tabs/socialtab.h
@@ -85,7 +85,7 @@ class SocialTab notfinal : public Tab
         {
         }
 
-        virtual ~SocialTab()
+        ~SocialTab() override
         {
             // Cleanup dialogs
             if (mInviteDialog != nullptr)
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index e6a816072..ccbc34f5d 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -90,7 +90,7 @@ class Tab notfinal : public BasicContainer,
 
         A_DELETE_COPY(Tab)
 
-        virtual ~Tab();
+        ~Tab() override;
 
         enum
         {