Move itemsmodel into gui/models directory.

2 files changed, 87 insertions, 49 deletions

diff --git a/src/gui/models/itemsmodel.h b/src/gui/models/itemsmodel.h
new file mode 100644
index 000000000..383bb9c14
--- /dev/null
+++ b/src/gui/models/itemsmodel.h
@@ -0,0 +1,86 @@
+/*
+ *  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_ITEMSMODEL_H
+#define GUI_MODELS_ITEMSMODEL_H
+
+#include "gui/models/listmodel.h"
+
+#include "resources/iteminfo.h"
+
+#include "resources/db/itemdb.h"
+
+#include "utils/gettext.h"
+
+#include "debug.h"
+
+class ItemsModal final : public ListModel
+{
+    public:
+        ItemsModal() :
+            mStrings()
+        {
+            const std::map<int, ItemInfo*> &items = ItemDB::getItemInfos();
+            std::list<std::string> tempStrings;
+
+            for (std::map<int, ItemInfo*>::const_iterator
+                 i = items.begin(), i_end = items.end();
+                 i != i_end; ++i)
+            {
+                if (i->first < 0)
+                    continue;
+
+                const ItemInfo &info = *i->second;
+                const std::string name = info.getName();
+                if (name != "unnamed" && !info.getName().empty()
+                    && info.getName() != "unnamed")
+                {
+                    tempStrings.push_back(name);
+                }
+            }
+            tempStrings.sort();
+            FOR_EACH (std::list<std::string>::const_iterator, i, tempStrings)
+                mStrings.push_back(*i);
+        }
+
+        A_DELETE_COPY(ItemsModal)
+
+        ~ItemsModal()
+        { }
+
+        int getNumberOfElements() override final
+        {
+            return static_cast<int>(mStrings.size());
+        }
+
+        std::string getElementAt(int i) override final
+        {
+            if (i < 0 || i >= getNumberOfElements())
+                return "???";
+            return mStrings.at(i);
+        }
+
+    private:
+        StringVect mStrings;
+};
+
+#endif  // GUI_MODELS_ITEMSMODEL_H
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index b65d5481f..dba69b424 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -33,6 +33,7 @@
 #include "net/net.h"
 #include "gui/viewport.h"
 
+#include "gui/models/itemsmodel.h"
 #include "gui/models/listmodel.h"
 
 #include "gui/popups/itempopup.h"
@@ -52,55 +53,6 @@
 
 #include "debug.h"
 
-class ItemsModal final : public ListModel
-{
-public:
-    ItemsModal() :
-        mStrings()
-    {
-        const std::map<int, ItemInfo*> &items = ItemDB::getItemInfos();
-        std::list<std::string> tempStrings;
-
-        for (std::map<int, ItemInfo*>::const_iterator
-             i = items.begin(), i_end = items.end();
-             i != i_end; ++i)
-        {
-            if (i->first < 0)
-                continue;
-
-            const ItemInfo &info = *i->second;
-            const std::string name = info.getName();
-            if (name != "unnamed" && !info.getName().empty()
-                && info.getName() != "unnamed")
-            {
-                tempStrings.push_back(name);
-            }
-        }
-        tempStrings.sort();
-        FOR_EACH (std::list<std::string>::const_iterator, i, tempStrings)
-            mStrings.push_back(*i);
-    }
-
-    A_DELETE_COPY(ItemsModal)
-
-    ~ItemsModal()
-    { }
-
-    int getNumberOfElements() override final
-    {
-        return static_cast<int>(mStrings.size());
-    }
-
-    std::string getElementAt(int i) override final
-    {
-        if (i < 0 || i >= getNumberOfElements())
-            return "???";
-        return mStrings.at(i);
-    }
-private:
-    StringVect mStrings;
-};
-
 void ItemAmountWindow::finish(Item *const item, const int amount,
                               const int price, const Usage usage)
 {