Move shopitems into gui/models.

3 files changed, 1 insertions, 274 deletions

diff --git a/src/gui/widgets/shopitems.cpp b/src/gui/widgets/shopitems.cpp
deleted file mode 100644
index 2ac65253d..000000000
--- a/src/gui/widgets/shopitems.cpp
+++ /dev/null
@@ -1,132 +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/shopitems.h"
-
-#include "shopitem.h"
-
-#include "utils/dtor.h"
-
-#include "debug.h"
-
-ShopItems::ShopItems(const bool mergeDuplicates) :
-    mShopItems(),
-    mMergeDuplicates(mergeDuplicates)
-{
-}
-
-ShopItems::~ShopItems()
-{
-    clear();
-}
-
-std::string ShopItems::getElementAt(int i)
-{
-    if (i < 0 || static_cast<unsigned>(i) >= mShopItems.size()
-        || !mShopItems.at(i))
-    {
-        return "";
-    }
-
-    return mShopItems.at(i)->getDisplayName();
-}
-
-void ShopItems::addItem(const int id, const unsigned char color,
-                        const int amount, const int price)
-{
-    mShopItems.push_back(new ShopItem(-1, id, color, amount, price));
-}
-
-void ShopItems::addItemNoDup(const int id, const unsigned char color,
-                             const int amount, const int price)
-{
-    const ShopItem *const item = findItem(id, color);
-    if (!item)
-        mShopItems.push_back(new ShopItem(-1, id, color, amount, price));
-}
-
-void ShopItems::addItem2(const int inventoryIndex, const int id,
-                         const unsigned char color,
-                         const int quantity, const int price)
-{
-    ShopItem *item = nullptr;
-    if (mMergeDuplicates)
-        item = findItem(id, color);
-
-    if (item)
-    {
-        item->addDuplicate(inventoryIndex, quantity);
-    }
-    else
-    {
-        item = new ShopItem(inventoryIndex, id, color, quantity, price);
-        mShopItems.push_back(item);
-    }
-}
-
-ShopItem *ShopItems::at(unsigned int i) const
-{
-    if (i >= mShopItems.size())
-        return nullptr;
-
-    return mShopItems.at(i);
-}
-
-void ShopItems::erase(const unsigned int i)
-{
-    if (i >= mShopItems.size())
-        return;
-
-    mShopItems.erase(mShopItems.begin() + i);
-}
-
-void ShopItems::del(const unsigned int i)
-{
-    if (i >= mShopItems.size())
-        return;
-
-    ShopItem *item = *(mShopItems.begin() + i);
-    mShopItems.erase(mShopItems.begin() + i);
-    delete item;
-}
-
-void ShopItems::clear()
-{
-    delete_all(mShopItems);
-    mShopItems.clear();
-}
-
-ShopItem *ShopItems::findItem(const int id, const unsigned char color) const
-{
-    std::vector<ShopItem*>::const_iterator it = mShopItems.begin();
-    const std::vector<ShopItem*>::const_iterator e = mShopItems.end();
-    while (it != e)
-    {
-        ShopItem *const item = *it;
-        if (item->getId() == id && item->getColor() == color)
-            return item;
-
-        ++it;
-    }
-
-    return nullptr;
-}
diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h
deleted file mode 100644
index d1fa1ca98..000000000
--- a/src/gui/widgets/shopitems.h
+++ /dev/null
@@ -1,141 +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_SHOPITEMS_H
-#define GUI_WIDGETS_SHOPITEMS_H
-
-#include "gui/models/listmodel.h"
-
-#include <string>
-#include <vector>
-
-#include "localconsts.h"
-
-class ShopItem;
-
-/**
- * This class handles the list of items available in a shop.
- *
- * The addItem routine can automatically check, if an item already exists and
- * only adds duplicates to the old item, if one is found. The original
- * distribution of the duplicates can be retrieved from the item.
- *
- * This functionality can be enabled in the constructor.
- */
-class ShopItems final : public ListModel
-{
-    public:
-        /**
-         * Constructor.
-         *
-         * @param mergeDuplicates lets the Shop look for duplicate entries and
-         *                        merges them to one item.
-         */
-        explicit ShopItems(const bool mergeDuplicates = false);
-
-        A_DELETE_COPY(ShopItems)
-
-        ~ShopItems();
-
-        /**
-         * Adds an item to the list.
-         */
-        void addItem(const int id, const unsigned char color,
-                     const int amount, const int price);
-
-        /**
-         * Adds an item to the list (used by sell dialog). Looks for
-         * duplicate entries, if mergeDuplicates was turned on.
-         *
-         * @param inventoryIndex the inventory index of the item
-         * @param id the id of the item
-         * @param quantity number of available copies of the item
-         * @param price price of the item
-         */
-        void addItem2(const int inventoryIndex, const int id,
-                      const unsigned char color,
-                      const int amount, const int price);
-
-        void addItemNoDup(const int id, const unsigned char color,
-                          const int amount, const int price);
-
-        /**
-         * Returns the number of items in the shop.
-         */
-        int getNumberOfElements() override final A_WARN_UNUSED
-        { return static_cast<int>(mShopItems.size()); }
-
-        bool empty() const A_WARN_UNUSED
-        { return mShopItems.empty(); }
-
-        /**
-         * Returns the name of item number i in the shop.
-         *
-         * @param i the index to retrieve
-         */
-        std::string getElementAt(int i) override final A_WARN_UNUSED;
-
-        /**
-         * Returns the item number i in the shop.
-         */
-        ShopItem *at(unsigned int i) const A_WARN_UNUSED;
-
-        /**
-         * Removes an element from the shop.
-         *
-         * @param i index to remove
-         */
-        void erase(const unsigned int i);
-
-        /**
-         * Removes an element from the shop and destroy it.
-         *
-         * @param i index to remove
-         */
-        void del(const unsigned int i);
-
-        /**
-         * Clears the list of items in the shop.
-         */
-        void clear();
-
-        std::vector<ShopItem*> &items() A_WARN_UNUSED
-        { return mShopItems; }
-
-    private:
-        /**
-         * Searches the current items in the shop for the specified
-         * id and returns the item if found, or 0 else.
-         * 
-         * @return the item found or 0
-         */
-        ShopItem *findItem(const int id,
-                           const unsigned char color) const A_WARN_UNUSED;
-
-        /** The list of items in the shop. */
-        std::vector<ShopItem*> mShopItems;
-
-        /** Look for duplicate entries on addition. */
-        bool mMergeDuplicates;
-};
-
-#endif  // GUI_WIDGETS_SHOPITEMS_H
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index ff45e5297..36104241d 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -32,7 +32,7 @@
 
 #include "gui/popups/itempopup.h"
 
-#include "gui/widgets/shopitems.h"
+#include "gui/models/shopitems.h"
 
 #include "resources/image.h"