3 files changed, 1 insertions, 171 deletions
diff --git a/src/gui/widgets/colormodel.cpp b/src/gui/widgets/colormodel.cpp
deleted file mode 100644
index 3a71a93cc..000000000
--- a/src/gui/widgets/colormodel.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2012-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/colormodel.h"
-
-#include "gui/widgets/widget2.h"
-
-#include "utils/gettext.h"
-
-#include "debug.h"
-
-ColorModel::ColorModel() :
-    mNames(),
-    mColors()
-{
-}
-
-ColorModel::~ColorModel()
-{
-}
-
-int ColorModel::getNumberOfElements()
-{
-    return static_cast<int>(mNames.size());
-}
-
-std::string ColorModel::getElementAt(int i)
-{
-    if (i >= getNumberOfElements() || i < 0)
-        return "???";
-    return mNames[i];
-}
-
-const ColorPair *ColorModel::getColorAt(const int i) const
-{
-    if (i >= static_cast<int>(mColors.size()) || i < 0)
-        return nullptr;
-
-    return &mColors[i];
-}
-
-void ColorModel::add(const std::string &name, const Color *const color1,
-                     const Color *const color2)
-{
-    mNames.push_back(name);
-    mColors.push_back(ColorPair(color1, color2));
-}
-
-#define addColor(name, color) \
-    model->add(name, &widget->getThemeColor(Theme::color), \
-        &widget->getThemeColor(Theme::color##_OUTLINE));
-
-ColorModel *ColorModel::createDefault(const Widget2 *const widget)
-{
-    ColorModel *const model = new ColorModel();
-    // TRANSLATORS: color name
-    addColor(_("black"), BLACK);
-    // TRANSLATORS: color name
-    addColor(_("red"), RED);
-    // TRANSLATORS: color name
-    addColor(_("green"), GREEN);
-    // TRANSLATORS: color name
-    addColor(_("blue"), BLUE);
-    // TRANSLATORS: color name
-    addColor(_("gold"), ORANGE);
-    // TRANSLATORS: color name
-    addColor(_("yellow"), YELLOW);
-    // TRANSLATORS: color name
-    addColor(_("pink"), PINK);
-    // TRANSLATORS: color name
-    addColor(_("purple"), PURPLE);
-    // TRANSLATORS: color name
-    addColor(_("grey"), GRAY);
-    // TRANSLATORS: color name
-    addColor(_("brown"), BROWN);
-    return model;
-}
diff --git a/src/gui/widgets/colormodel.h b/src/gui/widgets/colormodel.h
deleted file mode 100644
index ba68e94e2..000000000
--- a/src/gui/widgets/colormodel.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2012-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_COLORMODEL_H
-#define GUI_WIDGETS_COLORMODEL_H
-
-#include "utils/stringvector.h"
-
-#include "gui/models/listmodel.h"
-
-#include "localconsts.h"
-
-class Color;
-class Widget2;
-
-struct ColorPair
-{
-    ColorPair(const Color* c1, const Color* c2) :
-        color1(c1),
-        color2(c2)
-    {
-    }
-
-    const Color* color1;
-    const Color* color2;
-};
-
-class ColorModel : public ListModel
-{
-    public:
-        ColorModel();
-
-        A_DELETE_COPY(ColorModel)
-
-        virtual ~ColorModel();
-
-        virtual int getNumberOfElements() override final A_WARN_UNUSED;
-
-        virtual std::string getElementAt(int i) override final A_WARN_UNUSED;
-
-        virtual const ColorPair *getColorAt(const int i) const A_WARN_UNUSED;
-
-        StringVect &getNames() A_WARN_UNUSED
-        { return mNames; }
-
-        size_t size() A_WARN_UNUSED
-        { return mNames.size(); }
-
-        void add(const std::string &name, const Color *const color1,
-                 const Color *const color2);
-
-        static ColorModel *createDefault(const Widget2 *const widget);
-
-    protected:
-        StringVect mNames;
-        std::vector<ColorPair> mColors;
-};
-
-#endif  // GUI_WIDGETS_COLORMODEL_H
diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp
index 8196dead4..5e10b885c 100644
--- a/src/gui/widgets/colorpage.cpp
+++ b/src/gui/widgets/colorpage.cpp
@@ -20,7 +20,7 @@
 
 #include "gui/widgets/colorpage.h"
 
-#include "gui/widgets/colormodel.h"
+#include "gui/models/colormodel.h"
 
 #include "gui/font.h"