summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-23 12:25:16 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-23 12:25:16 +0300
commit2da15d7db0aa51bf2d64802fdeee08b0b8a5a161 (patch)
treef44ed9dfdc30ee777f433135f8d3e53df4d5508b
parent0d6d3d8c02aa4979577bbcd932c875d6463046b4 (diff)
downloadplus-2da15d7db0aa51bf2d64802fdeee08b0b8a5a161.tar.gz
plus-2da15d7db0aa51bf2d64802fdeee08b0b8a5a161.tar.bz2
plus-2da15d7db0aa51bf2d64802fdeee08b0b8a5a161.tar.xz
plus-2da15d7db0aa51bf2d64802fdeee08b0b8a5a161.zip
Move magicschoolmodel into gui/model directory.
-rw-r--r--src/gui/models/magicschoolmodel.h67
-rw-r--r--src/gui/windows/textcommandeditor.cpp36
2 files changed, 68 insertions, 35 deletions
diff --git a/src/gui/models/magicschoolmodel.h b/src/gui/models/magicschoolmodel.h
new file mode 100644
index 000000000..b30147f3d
--- /dev/null
+++ b/src/gui/models/magicschoolmodel.h
@@ -0,0 +1,67 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 Andrei Karas
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_MODELS_MAGICSCHOOLMODEL_H
+#define GUI_MODELS_MAGICSCHOOLMODEL_H
+
+#include "gui/models/listmodel.h"
+
+#include "utils/gettext.h"
+
+#include "debug.h"
+
+const char *MAGIC_SCHOOL_TEXT[6] =
+{
+ // TRANSLATORS: magic school
+ N_("General Magic"),
+ // TRANSLATORS: magic school
+ N_("Life Magic"),
+ // TRANSLATORS: magic school
+ N_("War Magic"),
+ // TRANSLATORS: magic school
+ N_("Transmute Magic"),
+ // TRANSLATORS: magic school
+ N_("Nature Magic"),
+ // TRANSLATORS: magic school
+ N_("Astral Magic")
+};
+
+class MagicSchoolModel final : public ListModel
+{
+ public:
+ ~MagicSchoolModel()
+ { }
+
+ int getNumberOfElements() override final
+ {
+ return 6;
+ }
+
+ std::string getElementAt(int i) override final
+ {
+ if (i >= getNumberOfElements() || i < 0)
+ return "???";
+ return MAGIC_SCHOOL_TEXT[i];
+ }
+};
+
+#endif // GUI_MODELS_MAGICSCHOOLMODEL_H
diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp
index 1a3094701..17703388f 100644
--- a/src/gui/windows/textcommandeditor.cpp
+++ b/src/gui/windows/textcommandeditor.cpp
@@ -29,6 +29,7 @@
#include "gui/models/iconsmodel.h"
#include "gui/models/listmodel.h"
+#include "gui/models/magicschoolmodel.h"
#include "gui/models/targettypemodel.h"
#include "gui/widgets/button.h"
@@ -46,41 +47,6 @@
#include "debug.h"
-const char *MAGIC_SCHOOL_TEXT[6] =
-{
- // TRANSLATORS: magic school
- N_("General Magic"),
- // TRANSLATORS: magic school
- N_("Life Magic"),
- // TRANSLATORS: magic school
- N_("War Magic"),
- // TRANSLATORS: magic school
- N_("Transmute Magic"),
- // TRANSLATORS: magic school
- N_("Nature Magic"),
- // TRANSLATORS: magic school
- N_("Astral Magic")
-};
-
-class MagicSchoolModel final : public ListModel
-{
-public:
- ~MagicSchoolModel()
- { }
-
- int getNumberOfElements() override final
- {
- return 6;
- }
-
- std::string getElementAt(int i) override final
- {
- if (i >= getNumberOfElements() || i < 0)
- return "???";
- return MAGIC_SCHOOL_TEXT[i];
- }
-};
-
TextCommandEditor::TextCommandEditor(TextCommand *const command) :
// TRANSLATORS: command editor name
Window(_("Command Editor"), false, nullptr, "commandeditor.xml"),