From 7898171f05a06df0541031d7491127493947c939 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 22 Feb 2014 18:08:37 +0300 Subject: Move shopitems into gui/models. --- src/CMakeLists.txt | 4 +- src/Makefile.am | 4 +- src/gui/models/shopitems.cpp | 132 +++++++++++++++++++++++++++++++++++++ src/gui/models/shopitems.h | 141 ++++++++++++++++++++++++++++++++++++++++ src/gui/widgets/shopitems.cpp | 132 ------------------------------------- src/gui/widgets/shopitems.h | 141 ---------------------------------------- src/gui/widgets/shoplistbox.cpp | 2 +- src/gui/windows/buydialog.cpp | 3 +- src/gui/windows/selldialog.cpp | 3 +- src/gui/windows/shopwindow.cpp | 3 +- 10 files changed, 284 insertions(+), 281 deletions(-) create mode 100644 src/gui/models/shopitems.cpp create mode 100644 src/gui/models/shopitems.h delete mode 100644 src/gui/widgets/shopitems.cpp delete mode 100644 src/gui/widgets/shopitems.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 297713e72..e5ddcd8f8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -204,8 +204,8 @@ SET(SRCS gui/widgets/tabs/setuptabscroll.h gui/widgets/setuptouchitem.cpp gui/widgets/setuptouchitem.h - gui/widgets/shopitems.cpp - gui/widgets/shopitems.h + gui/models/shopitems.cpp + gui/models/shopitems.h gui/widgets/shoplistbox.cpp gui/widgets/shoplistbox.h gui/widgets/shortcutcontainer.cpp diff --git a/src/Makefile.am b/src/Makefile.am index ebfb1c59f..4a788fa77 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -302,8 +302,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/tabs/setuptabscroll.h \ gui/widgets/setuptouchitem.cpp \ gui/widgets/setuptouchitem.h \ - gui/widgets/shopitems.cpp \ - gui/widgets/shopitems.h \ + gui/models/shopitems.cpp \ + gui/models/shopitems.h \ gui/widgets/shoplistbox.cpp \ gui/widgets/shoplistbox.h \ gui/widgets/shortcutcontainer.cpp \ diff --git a/src/gui/models/shopitems.cpp b/src/gui/models/shopitems.cpp new file mode 100644 index 000000000..492409e76 --- /dev/null +++ b/src/gui/models/shopitems.cpp @@ -0,0 +1,132 @@ +/* + * 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 . + */ + +#include "gui/models/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(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::const_iterator it = mShopItems.begin(); + const std::vector::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/models/shopitems.h b/src/gui/models/shopitems.h new file mode 100644 index 000000000..925354960 --- /dev/null +++ b/src/gui/models/shopitems.h @@ -0,0 +1,141 @@ +/* + * 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 . + */ + +#ifndef GUI_MODELS_SHOPITEMS_H +#define GUI_MODELS_SHOPITEMS_H + +#include "gui/models/listmodel.h" + +#include +#include + +#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(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 &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 mShopItems; + + /** Look for duplicate entries on addition. */ + bool mMergeDuplicates; +}; + +#endif // GUI_MODELS_SHOPITEMS_H 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 . - */ - -#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(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::const_iterator it = mShopItems.begin(); - const std::vector::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 . - */ - -#ifndef GUI_WIDGETS_SHOPITEMS_H -#define GUI_WIDGETS_SHOPITEMS_H - -#include "gui/models/listmodel.h" - -#include -#include - -#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(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 &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 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" diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index ac8187fc3..e64a7489b 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -28,13 +28,14 @@ #include "gui/windows/tradewindow.h" +#include "gui/models/shopitems.h" + #include "gui/widgets/button.h" #include "gui/widgets/dropdown.h" #include "gui/widgets/inttextfield.h" #include "gui/widgets/label.h" #include "gui/widgets/layout.h" #include "gui/widgets/scrollarea.h" -#include "gui/widgets/shopitems.h" #include "gui/widgets/shoplistbox.h" #include "gui/widgets/slider.h" diff --git a/src/gui/windows/selldialog.cpp b/src/gui/windows/selldialog.cpp index a89f7655a..525e3f133 100644 --- a/src/gui/windows/selldialog.cpp +++ b/src/gui/windows/selldialog.cpp @@ -30,11 +30,12 @@ #include "gui/windows/confirmdialog.h" #include "gui/windows/tradewindow.h" +#include "gui/models/shopitems.h" + #include "gui/widgets/button.h" #include "gui/widgets/label.h" #include "gui/widgets/layout.h" #include "gui/widgets/scrollarea.h" -#include "gui/widgets/shopitems.h" #include "gui/widgets/shoplistbox.h" #include "gui/widgets/slider.h" diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 706438f61..32e249d35 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -27,12 +27,13 @@ #include "gui/windows/selldialog.h" #include "gui/windows/tradewindow.h" +#include "gui/models/shopitems.h" + #include "gui/widgets/button.h" #include "gui/widgets/checkbox.h" #include "gui/widgets/label.h" #include "gui/widgets/layout.h" #include "gui/widgets/scrollarea.h" -#include "gui/widgets/shopitems.h" #include "gui/widgets/shoplistbox.h" #include "gui/widgets/tabs/chattab.h" -- cgit v1.2.3-70-g09d2