From 23e954851812b1121d6f3d98a6b7b396bca17dc9 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 22 Feb 2014 17:20:21 +0300
Subject: Move skillmodel into gui/models directory.
---
src/CMakeLists.txt | 4 +--
src/Makefile.am | 4 +--
src/gui/models/skillmodel.cpp | 62 +++++++++++++++++++++++++++++++++++++++++
src/gui/models/skillmodel.h | 55 ++++++++++++++++++++++++++++++++++++
src/gui/widgets/skillinfo.cpp | 3 +-
src/gui/widgets/skillmodel.cpp | 62 -----------------------------------------
src/gui/widgets/skillmodel.h | 55 ------------------------------------
src/gui/windows/skilldialog.cpp | 3 +-
8 files changed, 125 insertions(+), 123 deletions(-)
create mode 100644 src/gui/models/skillmodel.cpp
create mode 100644 src/gui/models/skillmodel.h
delete mode 100644 src/gui/widgets/skillmodel.cpp
delete mode 100644 src/gui/widgets/skillmodel.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 42c1e5b85..0a9fafdec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -214,8 +214,8 @@ SET(SRCS
gui/widgets/skilldata.h
gui/widgets/skillinfo.cpp
gui/widgets/skillinfo.h
- gui/widgets/skillmodel.cpp
- gui/widgets/skillmodel.h
+ gui/models/skillmodel.cpp
+ gui/models/skillmodel.h
gui/widgets/slider.cpp
gui/widgets/slider.h
gui/widgets/sliderlist.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 7051ae052..7caa67529 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -312,8 +312,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/skilldata.h \
gui/widgets/skillinfo.cpp \
gui/widgets/skillinfo.h \
- gui/widgets/skillmodel.cpp \
- gui/widgets/skillmodel.h \
+ gui/models/skillmodel.cpp \
+ gui/models/skillmodel.h \
gui/widgets/slider.cpp \
gui/widgets/slider.h \
gui/widgets/sliderlist.cpp \
diff --git a/src/gui/models/skillmodel.cpp b/src/gui/models/skillmodel.cpp
new file mode 100644
index 000000000..706bbdee2
--- /dev/null
+++ b/src/gui/models/skillmodel.cpp
@@ -0,0 +1,62 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * 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/>.
+ */
+
+#include "gui/models/skillmodel.h"
+
+#include "gui/widgets/skilldata.h"
+
+#include <string>
+
+#include "debug.h"
+
+SkillModel::SkillModel() :
+ mSkills(),
+ mVisibleSkills()
+{
+}
+
+SkillInfo *SkillModel::getSkillAt(const int i) const
+{
+ if (i < 0 || i >= static_cast<int>(mVisibleSkills.size()))
+ return nullptr;
+ return mVisibleSkills.at(i);
+}
+
+std::string SkillModel::getElementAt(int i)
+{
+ const SkillInfo *const info = getSkillAt(i);
+ if (info)
+ return info->data->name;
+ else
+ return std::string();
+}
+
+void SkillModel::updateVisibilities()
+{
+ mVisibleSkills.clear();
+
+ FOR_EACH (SkillList::const_iterator, it, mSkills)
+ {
+ if ((*it) && (*it)->visible)
+ mVisibleSkills.push_back((*it));
+ }
+}
diff --git a/src/gui/models/skillmodel.h b/src/gui/models/skillmodel.h
new file mode 100644
index 000000000..11746118e
--- /dev/null
+++ b/src/gui/models/skillmodel.h
@@ -0,0 +1,55 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * 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_SKILLMODEL_H
+#define GUI_MODELS_SKILLMODEL_H
+
+#include "gui/widgets/skillinfo.h"
+#include "gui/models/listmodel.h"
+
+#include <string>
+
+#include "localconsts.h"
+
+class SkillModel final : public ListModel
+{
+ public:
+ SkillModel();
+
+ SkillInfo *getSkillAt(const int i) const;
+
+ std::string getElementAt(int i) override final;
+
+ int getNumberOfElements() override final
+ { return static_cast<int>(mVisibleSkills.size()); }
+
+ void addSkill(SkillInfo *const info)
+ { mSkills.push_back(info); }
+
+ void updateVisibilities();
+
+ private:
+ SkillList mSkills;
+ SkillList mVisibleSkills;
+};
+
+#endif // GUI_MODELS_SKILLMODEL_H
diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp
index 46a3f425f..a009d623a 100644
--- a/src/gui/widgets/skillinfo.cpp
+++ b/src/gui/widgets/skillinfo.cpp
@@ -27,7 +27,8 @@
#include "gui/theme.h"
#include "gui/widgets/skilldata.h"
-#include "gui/widgets/skillmodel.h"
+
+#include "gui/models/skillmodel.h"
#include "utils/gettext.h"
#include "utils/stringutils.h"
diff --git a/src/gui/widgets/skillmodel.cpp b/src/gui/widgets/skillmodel.cpp
deleted file mode 100644
index 3244feec4..000000000
--- a/src/gui/widgets/skillmodel.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2004-2009 The Mana World Development Team
- * Copyright (C) 2009-2010 The Mana Developers
- * 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/>.
- */
-
-#include "gui/widgets/skillmodel.h"
-
-#include "gui/widgets/skilldata.h"
-
-#include <string>
-
-#include "debug.h"
-
-SkillModel::SkillModel() :
- mSkills(),
- mVisibleSkills()
-{
-}
-
-SkillInfo *SkillModel::getSkillAt(const int i) const
-{
- if (i < 0 || i >= static_cast<int>(mVisibleSkills.size()))
- return nullptr;
- return mVisibleSkills.at(i);
-}
-
-std::string SkillModel::getElementAt(int i)
-{
- const SkillInfo *const info = getSkillAt(i);
- if (info)
- return info->data->name;
- else
- return std::string();
-}
-
-void SkillModel::updateVisibilities()
-{
- mVisibleSkills.clear();
-
- FOR_EACH (SkillList::const_iterator, it, mSkills)
- {
- if ((*it) && (*it)->visible)
- mVisibleSkills.push_back((*it));
- }
-}
diff --git a/src/gui/widgets/skillmodel.h b/src/gui/widgets/skillmodel.h
deleted file mode 100644
index 38e36c2f1..000000000
--- a/src/gui/widgets/skillmodel.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2004-2009 The Mana World Development Team
- * Copyright (C) 2009-2010 The Mana Developers
- * 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_WIDGETS_SKILLMODEL_H
-#define GUI_WIDGETS_SKILLMODEL_H
-
-#include "gui/widgets/skillinfo.h"
-#include "gui/models/listmodel.h"
-
-#include <string>
-
-#include "localconsts.h"
-
-class SkillModel final : public ListModel
-{
- public:
- SkillModel();
-
- SkillInfo *getSkillAt(const int i) const;
-
- std::string getElementAt(int i) override final;
-
- int getNumberOfElements() override final
- { return static_cast<int>(mVisibleSkills.size()); }
-
- void addSkill(SkillInfo *const info)
- { mSkills.push_back(info); }
-
- void updateVisibilities();
-
- private:
- SkillList mSkills;
- SkillList mVisibleSkills;
-};
-
-#endif // GUI_WIDGETS_SKILLMODEL_H
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index f5f233402..d39d7061b 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -34,6 +34,8 @@
#include "gui/popups/textpopup.h"
+#include "gui/models/skillmodel.h"
+
#include "gui/windows/setupwindow.h"
#include "gui/windows/shortcutwindow.h"
@@ -41,7 +43,6 @@
#include "gui/widgets/label.h"
#include "gui/widgets/listbox.h"
#include "gui/widgets/scrollarea.h"
-#include "gui/widgets/skillmodel.h"
#include "gui/widgets/tabs/tab.h"
#include "gui/widgets/tabbedarea.h"
--
cgit v1.2.3-70-g09d2