diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-27 10:47:28 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-27 12:15:49 +0100 |
commit | 58b33406b1354e6814ed29d55a55a36053445ecd (patch) | |
tree | 2c8d1afcc84ff5a1f3ba28618422d4d617baa226 /src/gui | |
parent | e64b5a25a54f56bc836af57223e37449a1daffe8 (diff) | |
download | mana-client-58b33406b1354e6814ed29d55a55a36053445ecd.tar.gz mana-client-58b33406b1354e6814ed29d55a55a36053445ecd.tar.bz2 mana-client-58b33406b1354e6814ed29d55a55a36053445ecd.tar.xz mana-client-58b33406b1354e6814ed29d55a55a36053445ecd.zip |
Include statement cleanup for net/ea/ directory.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/buy.cpp | 1 | ||||
-rw-r--r-- | src/gui/sell.cpp | 1 | ||||
-rw-r--r-- | src/gui/shop.cpp | 6 | ||||
-rw-r--r-- | src/gui/shop.h | 29 | ||||
-rw-r--r-- | src/gui/shoplistbox.cpp | 15 | ||||
-rw-r--r-- | src/gui/shoplistbox.h | 2 |
6 files changed, 26 insertions, 28 deletions
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp index 2fc59aec..6df2ae25 100644 --- a/src/gui/buy.cpp +++ b/src/gui/buy.cpp @@ -31,6 +31,7 @@ #include "gui/widgets/layout.h" #include "npc.h" +#include "shopitem.h" #include "units.h" #ifdef TMWSERV_SUPPORT diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp index be352a66..e7671110 100644 --- a/src/gui/sell.cpp +++ b/src/gui/sell.cpp @@ -31,6 +31,7 @@ #include "gui/widgets/layout.h" #include "npc.h" +#include "shopitem.h" #include "units.h" #include "net/messageout.h" diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp index 300c91b8..4799ea42 100644 --- a/src/gui/shop.cpp +++ b/src/gui/shop.cpp @@ -19,9 +19,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "shop.h" +#include "gui/shop.h" -#include "../utils/dtor.h" +#include "shopitem.h" + +#include "utils/dtor.h" ShopItems::ShopItems(bool mergeDuplicates) : mMergeDuplicates(mergeDuplicates) diff --git a/src/gui/shop.h b/src/gui/shop.h index 6c3031af..190ef655 100644 --- a/src/gui/shop.h +++ b/src/gui/shop.h @@ -19,15 +19,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _SHOP_H -#define _SHOP_H - -#include <string> -#include <vector> +#ifndef SHOP_H +#define SHOP_H #include <guichan/listmodel.hpp> -#include "../shopitem.h" +#include <string> +#include <vector> class ShopItem; @@ -44,16 +42,13 @@ class ShopItems : public gcn::ListModel { public: /** - * Constructor. Creates a new ShopItems instance. + * Constructor. * * @param mergeDuplicates lets the Shop look for duplicate entries and * merges them to one item. */ ShopItems(bool mergeDuplicates = false); - /** - * Destructor. - */ ~ShopItems(); /** @@ -76,8 +71,6 @@ class ShopItems : public gcn::ListModel /** * Returns the number of items in the shop. - * - * @return the number of items in the shop */ int getNumberOfElements(); @@ -91,7 +84,7 @@ class ShopItems : public gcn::ListModel /** * Returns the item number i in the shop. */ - ShopItem* at(int i) const; + ShopItem *at(int i) const; /** * Removes an element from the shop. @@ -101,7 +94,7 @@ class ShopItems : public gcn::ListModel void erase(int i); /** - * Clear the vector. + * Clears the list of items in the shop. */ void clear(); @@ -112,13 +105,13 @@ class ShopItems : public gcn::ListModel * * @return the item found or 0 */ - ShopItem* findItem(int id); + ShopItem *findItem(int id); - /** the shop storage */ + /** The list of items in the shop. */ std::vector<ShopItem*> mShopItems; - /** Look for duplicate entries on addition */ + /** Look for duplicate entries on addition. */ bool mMergeDuplicates; }; -#endif +#endif // SHOP_H diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp index aa42c294..db39e82d 100644 --- a/src/gui/shoplistbox.cpp +++ b/src/gui/shoplistbox.cpp @@ -19,15 +19,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <guichan/font.hpp> -#include <guichan/listmodel.hpp> +#include "gui/palette.h" +#include "gui/shop.h" +#include "gui/shoplistbox.h" -#include "palette.h" -#include "shop.h" -#include "shoplistbox.h" +#include "configuration.h" +#include "graphics.h" +#include "shopitem.h" -#include "../configuration.h" -#include "../graphics.h" +#include <guichan/font.hpp> +#include <guichan/listmodel.hpp> const int ITEM_ICON_SIZE = 32; diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h index 5d3378b1..0b28b2f1 100644 --- a/src/gui/shoplistbox.h +++ b/src/gui/shoplistbox.h @@ -88,4 +88,4 @@ class ShopListBox : public ListBox bool mPriceCheck; }; -#endif +#endif // SHOPLISTBOX_H |