From f46644e0096ffa2ce57c23707d588b2c073eed55 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 17 Jan 2017 18:20:02 +0300 Subject: Add missing A_DEFAULT_COPY / A_DELETE_COPY into gui. --- src/gui/models/avatarlistmodel.h | 6 ++++++ src/gui/models/colorlistmodel.h | 6 ++++++ src/gui/models/extendedlistmodel.h | 6 ++++++ src/gui/models/fontsizechoicelistmodel.h | 6 ++++++ src/gui/models/fontsmodel.h | 2 ++ src/gui/models/ignorechoiceslistmodel.h | 6 ++++++ src/gui/models/langlistmodel.h | 2 ++ src/gui/models/listmodel.h | 5 +++++ src/gui/models/magicschoolmodel.h | 6 ++++++ src/gui/models/opengllistmodel.h | 6 ++++++ src/gui/models/playerrelationlistmodel.h | 6 ++++++ src/gui/models/skillmodel.cpp | 1 + src/gui/models/skillmodel.h | 2 ++ src/gui/models/sortlistmodelbuy.h | 6 ++++++ src/gui/models/sortlistmodelinv.h | 6 ++++++ src/gui/models/soundsmodel.h | 2 ++ src/gui/models/tablemodel.h | 2 ++ src/gui/models/targettypemodel.h | 6 ++++++ src/gui/models/themesmodel.h | 2 ++ src/gui/models/touchactionmodel.cpp | 2 ++ src/gui/models/typelistmodel.h | 5 ++++- 21 files changed, 90 insertions(+), 1 deletion(-) (limited to 'src/gui/models') diff --git a/src/gui/models/avatarlistmodel.h b/src/gui/models/avatarlistmodel.h index 13b8c0e33..67ec6846a 100644 --- a/src/gui/models/avatarlistmodel.h +++ b/src/gui/models/avatarlistmodel.h @@ -29,6 +29,12 @@ class AvatarListModel notfinal : public ListModel { public: + AvatarListModel() : + ListModel() + { } + + A_DELETE_COPY(AvatarListModel) + virtual Avatar *getAvatarAt(const int i) A_WARN_UNUSED = 0; std::string getElementAt(int i) override final A_WARN_UNUSED diff --git a/src/gui/models/colorlistmodel.h b/src/gui/models/colorlistmodel.h index 51152b67c..bb2d413c2 100644 --- a/src/gui/models/colorlistmodel.h +++ b/src/gui/models/colorlistmodel.h @@ -62,6 +62,12 @@ const char *COLOR_NAME[14] = class ColorListModel final : public ListModel { public: + ColorListModel() : + ListModel() + { } + + A_DELETE_COPY(ColorListModel) + ~ColorListModel() { } diff --git a/src/gui/models/extendedlistmodel.h b/src/gui/models/extendedlistmodel.h index 4900b031f..981a96897 100644 --- a/src/gui/models/extendedlistmodel.h +++ b/src/gui/models/extendedlistmodel.h @@ -28,6 +28,12 @@ class ExtendedListModel notfinal : public ListModel { public: + ExtendedListModel() : + ListModel() + { } + + A_DELETE_COPY(ExtendedListModel) + virtual const Image *getImageAt(int i) A_WARN_UNUSED = 0; }; diff --git a/src/gui/models/fontsizechoicelistmodel.h b/src/gui/models/fontsizechoicelistmodel.h index 7f27aeda4..79aecf2fb 100644 --- a/src/gui/models/fontsizechoicelistmodel.h +++ b/src/gui/models/fontsizechoicelistmodel.h @@ -68,6 +68,12 @@ const char *SIZE_NAME[maxFontSizes] = class FontSizeChoiceListModel final : public ListModel { public: + FontSizeChoiceListModel() : + ListModel() + { } + + A_DELETE_COPY(FontSizeChoiceListModel) + ~FontSizeChoiceListModel() { } diff --git a/src/gui/models/fontsmodel.h b/src/gui/models/fontsmodel.h index a0966ae2b..b7f5fc4be 100644 --- a/src/gui/models/fontsmodel.h +++ b/src/gui/models/fontsmodel.h @@ -35,6 +35,8 @@ class FontsModel final : public NamesModel NamesModel() { Theme::fillFontsList(mNames); } + A_DELETE_COPY(FontsModel) + ~FontsModel() { } }; diff --git a/src/gui/models/ignorechoiceslistmodel.h b/src/gui/models/ignorechoiceslistmodel.h index ed597e4c5..b0010df31 100644 --- a/src/gui/models/ignorechoiceslistmodel.h +++ b/src/gui/models/ignorechoiceslistmodel.h @@ -34,6 +34,12 @@ class IgnoreChoicesListModel final : public ListModel { public: + IgnoreChoicesListModel() : + ListModel() + { } + + A_DELETE_COPY(IgnoreChoicesListModel) + ~IgnoreChoicesListModel() { } diff --git a/src/gui/models/langlistmodel.h b/src/gui/models/langlistmodel.h index f9070996a..839a836e7 100644 --- a/src/gui/models/langlistmodel.h +++ b/src/gui/models/langlistmodel.h @@ -32,6 +32,8 @@ struct Language final { + A_DEFAULT_COPY(Language) + std::string name; std::string value; std::string icon; diff --git a/src/gui/models/listmodel.h b/src/gui/models/listmodel.h index cbf99452f..df8db8b54 100644 --- a/src/gui/models/listmodel.h +++ b/src/gui/models/listmodel.h @@ -78,6 +78,11 @@ class ListModel notfinal { public: + ListModel() + { } + + A_DELETE_COPY(ListModel) + /** * Destructor. */ diff --git a/src/gui/models/magicschoolmodel.h b/src/gui/models/magicschoolmodel.h index 48cb1091e..2dcd01880 100644 --- a/src/gui/models/magicschoolmodel.h +++ b/src/gui/models/magicschoolmodel.h @@ -48,6 +48,12 @@ const char *MAGIC_SCHOOL_TEXT[6] = class MagicSchoolModel final : public ListModel { public: + MagicSchoolModel() : + ListModel() + { } + + A_DELETE_COPY(MagicSchoolModel) + ~MagicSchoolModel() { } diff --git a/src/gui/models/opengllistmodel.h b/src/gui/models/opengllistmodel.h index a6142ed23..085dd17a5 100644 --- a/src/gui/models/opengllistmodel.h +++ b/src/gui/models/opengllistmodel.h @@ -30,6 +30,12 @@ class OpenGLListModel final : public ListModel { public: + OpenGLListModel() : + ListModel() + { } + + A_DELETE_COPY(OpenGLListModel) + ~OpenGLListModel() { } diff --git a/src/gui/models/playerrelationlistmodel.h b/src/gui/models/playerrelationlistmodel.h index 0237ce1ec..5e58d4905 100644 --- a/src/gui/models/playerrelationlistmodel.h +++ b/src/gui/models/playerrelationlistmodel.h @@ -50,6 +50,12 @@ static const char *const RELATION_NAMES[PlayerRelation::RELATIONS_NR] = class PlayerRelationListModel final : public ListModel { public: + PlayerRelationListModel() : + ListModel() + { } + + A_DELETE_COPY(PlayerRelationListModel) + ~PlayerRelationListModel() { } diff --git a/src/gui/models/skillmodel.cpp b/src/gui/models/skillmodel.cpp index 50d01b786..13d2bb547 100644 --- a/src/gui/models/skillmodel.cpp +++ b/src/gui/models/skillmodel.cpp @@ -27,6 +27,7 @@ #include "debug.h" SkillModel::SkillModel() : + ListModel(), mSkills(), mVisibleSkills() { diff --git a/src/gui/models/skillmodel.h b/src/gui/models/skillmodel.h index f700c4213..c3331ed30 100644 --- a/src/gui/models/skillmodel.h +++ b/src/gui/models/skillmodel.h @@ -34,6 +34,8 @@ class SkillModel final : public ListModel public: SkillModel(); + A_DELETE_COPY(SkillModel) + SkillInfo *getSkillAt(const int i) const; std::string getElementAt(int i) override final; diff --git a/src/gui/models/sortlistmodelbuy.h b/src/gui/models/sortlistmodelbuy.h index 150bcd070..3af489222 100644 --- a/src/gui/models/sortlistmodelbuy.h +++ b/src/gui/models/sortlistmodelbuy.h @@ -48,6 +48,12 @@ static const char *const SORT_NAME_BUY[7] = class SortListModelBuy final : public ListModel { public: + SortListModelBuy() : + ListModel() + { } + + A_DELETE_COPY(SortListModelBuy) + ~SortListModelBuy() { } diff --git a/src/gui/models/sortlistmodelinv.h b/src/gui/models/sortlistmodelinv.h index c57a4a3b3..3561d2621 100644 --- a/src/gui/models/sortlistmodelinv.h +++ b/src/gui/models/sortlistmodelinv.h @@ -45,6 +45,12 @@ static const char *const SORT_NAME_INVENTORY[6] = class SortListModelInv final : public ListModel { public: + SortListModelInv() : + ListModel() + { } + + A_DELETE_COPY(SortListModelInv) + ~SortListModelInv() { } diff --git a/src/gui/models/soundsmodel.h b/src/gui/models/soundsmodel.h index 6f70b3294..ad66049a3 100644 --- a/src/gui/models/soundsmodel.h +++ b/src/gui/models/soundsmodel.h @@ -40,6 +40,8 @@ class SoundsModel final : public NamesModel Theme::fillSoundsList(mNames); } + A_DELETE_COPY(SoundsModel) + ~SoundsModel() { } }; diff --git a/src/gui/models/tablemodel.h b/src/gui/models/tablemodel.h index a742644f7..dc3462f19 100644 --- a/src/gui/models/tablemodel.h +++ b/src/gui/models/tablemodel.h @@ -38,6 +38,8 @@ class TableModelListener; class TableModel notfinal { public: + A_DELETE_COPY(TableModel) + virtual ~TableModel() { } diff --git a/src/gui/models/targettypemodel.h b/src/gui/models/targettypemodel.h index 32015ab3b..ec049bf66 100644 --- a/src/gui/models/targettypemodel.h +++ b/src/gui/models/targettypemodel.h @@ -39,6 +39,12 @@ const char *TARGET_TYPE_TEXT[3] = class TargetTypeModel final : public ListModel { public: + TargetTypeModel() : + ListModel() + { } + + A_DELETE_COPY(TargetTypeModel) + ~TargetTypeModel() { } diff --git a/src/gui/models/themesmodel.h b/src/gui/models/themesmodel.h index 4b2450990..c68cc0a2f 100644 --- a/src/gui/models/themesmodel.h +++ b/src/gui/models/themesmodel.h @@ -40,6 +40,8 @@ class ThemesModel final : public NamesModel Theme::fillSkinsList(mNames); } + A_DELETE_COPY(ThemesModel) + ~ThemesModel() { } }; diff --git a/src/gui/models/touchactionmodel.cpp b/src/gui/models/touchactionmodel.cpp index 46f0437c0..6238797e6 100644 --- a/src/gui/models/touchactionmodel.cpp +++ b/src/gui/models/touchactionmodel.cpp @@ -32,6 +32,8 @@ const int touchActionDataSize = 5; static class SortTouchActionFunctor final { public: + A_DEFAULT_COPY(SortTouchActionFunctor) + bool operator() (const SetupActionData *const data1, const SetupActionData *const data2) const { diff --git a/src/gui/models/typelistmodel.h b/src/gui/models/typelistmodel.h index 9e09966eb..681e019fc 100644 --- a/src/gui/models/typelistmodel.h +++ b/src/gui/models/typelistmodel.h @@ -30,9 +30,12 @@ class TypeListModel final : public ListModel { public: - TypeListModel() + TypeListModel() : + ListModel() { } + A_DELETE_COPY(TypeListModel) + /** * Used to get number of line in the list */ -- cgit v1.2.3-60-g2f50