summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/skillinfo.cpp3
-rw-r--r--src/gui/widgets/skillmodel.cpp62
-rw-r--r--src/gui/widgets/skillmodel.h55
3 files changed, 2 insertions, 118 deletions
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