Add missing override and final to destructors.

Also remove some empty destructors.

28 files changed, 8 insertions, 68 deletions

diff --git a/src/gui/models/beingslistmodel.h b/src/gui/models/beingslistmodel.h
index a0a9d2920..c3f0d8fff 100644
--- a/src/gui/models/beingslistmodel.h
+++ b/src/gui/models/beingslistmodel.h
@@ -39,7 +39,7 @@ class BeingsListModel final : public AvatarListModel
 
         A_DELETE_COPY(BeingsListModel)
 
-        ~BeingsListModel()
+        ~BeingsListModel() override final
         {
             delete_all(mMembers);
             mMembers.clear();
diff --git a/src/gui/models/colorlistmodel.h b/src/gui/models/colorlistmodel.h
index bb2d413c2..6dca6341b 100644
--- a/src/gui/models/colorlistmodel.h
+++ b/src/gui/models/colorlistmodel.h
@@ -68,9 +68,6 @@ class ColorListModel final : public ListModel
 
         A_DELETE_COPY(ColorListModel)
 
-        ~ColorListModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return 14;
diff --git a/src/gui/models/colormodel.h b/src/gui/models/colormodel.h
index 9d621dfbe..b9677adf4 100644
--- a/src/gui/models/colormodel.h
+++ b/src/gui/models/colormodel.h
@@ -39,7 +39,7 @@ class ColorModel final : public ListModel
 
         A_DELETE_COPY(ColorModel)
 
-        virtual ~ColorModel();
+        ~ColorModel() override final;
 
         int getNumberOfElements() override final A_WARN_UNUSED;
 
diff --git a/src/gui/models/extendednamesmodel.h b/src/gui/models/extendednamesmodel.h
index 2e85a4b2b..c6a7f2941 100644
--- a/src/gui/models/extendednamesmodel.h
+++ b/src/gui/models/extendednamesmodel.h
@@ -32,7 +32,7 @@ class ExtendedNamesModel notfinal : public ExtendedListModel
 
         A_DELETE_COPY(ExtendedNamesModel)
 
-        virtual ~ExtendedNamesModel();
+        ~ExtendedNamesModel() override;
 
         int getNumberOfElements() override final A_WARN_UNUSED;
 
diff --git a/src/gui/models/fontsizechoicelistmodel.h b/src/gui/models/fontsizechoicelistmodel.h
index 79aecf2fb..7372a804f 100644
--- a/src/gui/models/fontsizechoicelistmodel.h
+++ b/src/gui/models/fontsizechoicelistmodel.h
@@ -74,9 +74,6 @@ class FontSizeChoiceListModel final : public ListModel
 
         A_DELETE_COPY(FontSizeChoiceListModel)
 
-        ~FontSizeChoiceListModel()
-        { }
-
         int getNumberOfElements() override final A_WARN_UNUSED
         { return maxFontSizes; }
 
diff --git a/src/gui/models/fontsmodel.h b/src/gui/models/fontsmodel.h
index b7f5fc4be..476406357 100644
--- a/src/gui/models/fontsmodel.h
+++ b/src/gui/models/fontsmodel.h
@@ -36,9 +36,6 @@ class FontsModel final : public NamesModel
         { Theme::fillFontsList(mNames); }
 
         A_DELETE_COPY(FontsModel)
-
-        ~FontsModel()
-        { }
 };
 
 #endif  // GUI_MODELS_FONTSMODEL_H
diff --git a/src/gui/models/iconsmodel.h b/src/gui/models/iconsmodel.h
index 4028895fb..64d25d75d 100644
--- a/src/gui/models/iconsmodel.h
+++ b/src/gui/models/iconsmodel.h
@@ -67,9 +67,6 @@ class IconsModel final : public ListModel
 
         A_DELETE_COPY(IconsModel)
 
-        ~IconsModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return CAST_S32(mStrings.size());
diff --git a/src/gui/models/ignorechoiceslistmodel.h b/src/gui/models/ignorechoiceslistmodel.h
index 6cd8bbe87..be328ab8c 100644
--- a/src/gui/models/ignorechoiceslistmodel.h
+++ b/src/gui/models/ignorechoiceslistmodel.h
@@ -42,9 +42,6 @@ class IgnoreChoicesListModel final : public ListModel
 
         A_DELETE_COPY(IgnoreChoicesListModel)
 
-        ~IgnoreChoicesListModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return CAST_S32(playerRelations.
diff --git a/src/gui/models/itemsmodel.h b/src/gui/models/itemsmodel.h
index a49a7cfc5..0bde3202f 100644
--- a/src/gui/models/itemsmodel.h
+++ b/src/gui/models/itemsmodel.h
@@ -66,9 +66,6 @@ class ItemsModal final : public ListModel
 
         A_DELETE_COPY(ItemsModal)
 
-        ~ItemsModal()
-        { }
-
         int getNumberOfElements() override final
         {
             return CAST_S32(mStrings.size());
diff --git a/src/gui/models/langlistmodel.h b/src/gui/models/langlistmodel.h
index f8c67ad30..e137a740b 100644
--- a/src/gui/models/langlistmodel.h
+++ b/src/gui/models/langlistmodel.h
@@ -111,7 +111,7 @@ class LangListModel final : public ExtendedListModel
 
         A_DELETE_COPY(LangListModel)
 
-        ~LangListModel()
+        ~LangListModel() override final
         {
             for (int f = 0; f < langs_count; f ++)
             {
diff --git a/src/gui/models/magicschoolmodel.h b/src/gui/models/magicschoolmodel.h
index 2dcd01880..ced4a657f 100644
--- a/src/gui/models/magicschoolmodel.h
+++ b/src/gui/models/magicschoolmodel.h
@@ -54,9 +54,6 @@ class MagicSchoolModel final : public ListModel
 
         A_DELETE_COPY(MagicSchoolModel)
 
-        ~MagicSchoolModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return 6;
diff --git a/src/gui/models/modelistmodel.h b/src/gui/models/modelistmodel.h
index ed4d449d7..1d38aca41 100644
--- a/src/gui/models/modelistmodel.h
+++ b/src/gui/models/modelistmodel.h
@@ -37,9 +37,6 @@ class ModeListModel final : public ListModel
 
         A_DELETE_COPY(ModeListModel)
 
-        ~ModeListModel()
-        { }
-
         /**
          * Returns the number of elements in container.
          */
diff --git a/src/gui/models/namesmodel.h b/src/gui/models/namesmodel.h
index a239bd9aa..ffd3c6088 100644
--- a/src/gui/models/namesmodel.h
+++ b/src/gui/models/namesmodel.h
@@ -34,7 +34,7 @@ class NamesModel notfinal : public ListModel
 
         A_DELETE_COPY(NamesModel)
 
-        virtual ~NamesModel();
+        ~NamesModel() override;
 
         int getNumberOfElements() override final A_WARN_UNUSED;
 
diff --git a/src/gui/models/opengllistmodel.h b/src/gui/models/opengllistmodel.h
index 085dd17a5..085054b6e 100644
--- a/src/gui/models/opengllistmodel.h
+++ b/src/gui/models/opengllistmodel.h
@@ -36,9 +36,6 @@ class OpenGLListModel final : public ListModel
 
         A_DELETE_COPY(OpenGLListModel)
 
-        ~OpenGLListModel()
-        { }
-
         int getNumberOfElements() override final
         { return renderModesListSize; }
 
diff --git a/src/gui/models/playerrelationlistmodel.h b/src/gui/models/playerrelationlistmodel.h
index 5e58d4905..954fec9a7 100644
--- a/src/gui/models/playerrelationlistmodel.h
+++ b/src/gui/models/playerrelationlistmodel.h
@@ -56,9 +56,6 @@ class PlayerRelationListModel final : public ListModel
 
         A_DELETE_COPY(PlayerRelationListModel)
 
-        ~PlayerRelationListModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return PlayerRelation::RELATIONS_NR;
diff --git a/src/gui/models/playertablemodel.h b/src/gui/models/playertablemodel.h
index dfb00eeb4..74f806abd 100644
--- a/src/gui/models/playertablemodel.h
+++ b/src/gui/models/playertablemodel.h
@@ -39,7 +39,7 @@ class PlayerTableModel final : public Widget2,
 
         A_DELETE_COPY(PlayerTableModel)
 
-        ~PlayerTableModel();
+        ~PlayerTableModel() override final;
 
         int getRows() const override final;
 
diff --git a/src/gui/models/questsmodel.h b/src/gui/models/questsmodel.h
index f80e7a32d..8ea102128 100644
--- a/src/gui/models/questsmodel.h
+++ b/src/gui/models/questsmodel.h
@@ -32,9 +32,6 @@ class QuestsModel final : public ExtendedNamesModel
         }
 
         A_DELETE_COPY(QuestsModel)
-
-        ~QuestsModel()
-        { }
 };
 
 #endif  // GUI_MODELS_QUESTSMODEL_H
diff --git a/src/gui/models/shopitems.h b/src/gui/models/shopitems.h
index 26c5a94e4..438713ce1 100644
--- a/src/gui/models/shopitems.h
+++ b/src/gui/models/shopitems.h
@@ -59,7 +59,7 @@ class ShopItems final : public ListModel
 
         A_DELETE_COPY(ShopItems)
 
-        ~ShopItems();
+        ~ShopItems() override final;
 
         /**
          * Adds an item to the list.
diff --git a/src/gui/models/sortlistmodelbuy.h b/src/gui/models/sortlistmodelbuy.h
index 3af489222..3ba9d67c3 100644
--- a/src/gui/models/sortlistmodelbuy.h
+++ b/src/gui/models/sortlistmodelbuy.h
@@ -54,9 +54,6 @@ class SortListModelBuy final : public ListModel
 
         A_DELETE_COPY(SortListModelBuy)
 
-        ~SortListModelBuy()
-        { }
-
         int getNumberOfElements() override final
         { return 7; }
 
diff --git a/src/gui/models/sortlistmodelinv.h b/src/gui/models/sortlistmodelinv.h
index 3561d2621..5728fe7e3 100644
--- a/src/gui/models/sortlistmodelinv.h
+++ b/src/gui/models/sortlistmodelinv.h
@@ -51,9 +51,6 @@ class SortListModelInv final : public ListModel
 
         A_DELETE_COPY(SortListModelInv)
 
-        ~SortListModelInv()
-        { }
-
         int getNumberOfElements() override final
         { return 6; }
 
diff --git a/src/gui/models/soundsmodel.h b/src/gui/models/soundsmodel.h
index ad66049a3..fefb5ec29 100644
--- a/src/gui/models/soundsmodel.h
+++ b/src/gui/models/soundsmodel.h
@@ -41,9 +41,6 @@ class SoundsModel final : public NamesModel
         }
 
         A_DELETE_COPY(SoundsModel)
-
-        ~SoundsModel()
-        { }
 };
 
 #endif  // GUI_MODELS_SOUNDSMODEL_H
diff --git a/src/gui/models/tablemodel.h b/src/gui/models/tablemodel.h
index 23f286c2e..1da26e5a5 100644
--- a/src/gui/models/tablemodel.h
+++ b/src/gui/models/tablemodel.h
@@ -103,7 +103,7 @@ class StaticTableModel final : public TableModel
 
         A_DELETE_COPY(StaticTableModel)
 
-        ~StaticTableModel();
+        ~StaticTableModel() override final;
 
         /**
          * Inserts a widget into the table model.
diff --git a/src/gui/models/targettypemodel.h b/src/gui/models/targettypemodel.h
index ec049bf66..a5eed0cdd 100644
--- a/src/gui/models/targettypemodel.h
+++ b/src/gui/models/targettypemodel.h
@@ -45,9 +45,6 @@ class TargetTypeModel final : public ListModel
 
         A_DELETE_COPY(TargetTypeModel)
 
-        ~TargetTypeModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return 3;
diff --git a/src/gui/models/themesmodel.h b/src/gui/models/themesmodel.h
index c68cc0a2f..61bb90cca 100644
--- a/src/gui/models/themesmodel.h
+++ b/src/gui/models/themesmodel.h
@@ -41,9 +41,6 @@ class ThemesModel final : public NamesModel
         }
 
         A_DELETE_COPY(ThemesModel)
-
-        ~ThemesModel()
-        { }
 };
 
 #endif  // GUI_MODELS_THEMESMODEL_H
diff --git a/src/gui/models/touchactionmodel.h b/src/gui/models/touchactionmodel.h
index 2d8cff02a..2e519d7a6 100644
--- a/src/gui/models/touchactionmodel.h
+++ b/src/gui/models/touchactionmodel.h
@@ -34,9 +34,6 @@ class TouchActionsModel final : public NamesModel
 
         A_DELETE_COPY(TouchActionsModel)
 
-        ~TouchActionsModel()
-        { }
-
         InputActionT getActionFromSelection(const int sel) const;
 
         int getSelectionFromAction(const InputActionT action) const;
diff --git a/src/gui/models/updatelistmodel.h b/src/gui/models/updatelistmodel.h
index cd4ba50c3..f9e10e34e 100644
--- a/src/gui/models/updatelistmodel.h
+++ b/src/gui/models/updatelistmodel.h
@@ -51,9 +51,6 @@ class UpdateListModel final : public ListModel
 
         A_DELETE_COPY(UpdateListModel)
 
-        ~UpdateListModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return CAST_S32(mNames.size());
diff --git a/src/gui/models/updatetypemodel.h b/src/gui/models/updatetypemodel.h
index 232be8223..2476f085c 100644
--- a/src/gui/models/updatetypemodel.h
+++ b/src/gui/models/updatetypemodel.h
@@ -44,9 +44,6 @@ class UpdateTypeModel final : public ListModel
 
         A_DELETE_COPY(UpdateTypeModel)
 
-        ~UpdateTypeModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return 3;
diff --git a/src/gui/models/worldlistmodel.h b/src/gui/models/worldlistmodel.h
index 3be179c61..e5c164cf7 100644
--- a/src/gui/models/worldlistmodel.h
+++ b/src/gui/models/worldlistmodel.h
@@ -43,9 +43,6 @@ class WorldListModel final : public ListModel
 
         A_DELETE_COPY(WorldListModel)
 
-        ~WorldListModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return CAST_S32(mWorlds.size());