summaryrefslogtreecommitdiff
path: root/src/gui/models/shopitems.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
committerAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
commit311c175f3184103950c72bc5c775174597430b83 (patch)
treead022dc44a1c4177b3d53bf0d7eaa5a1736c8cf1 /src/gui/models/shopitems.h
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadmv-311c175f3184103950c72bc5c775174597430b83.tar.gz
mv-311c175f3184103950c72bc5c775174597430b83.tar.bz2
mv-311c175f3184103950c72bc5c775174597430b83.tar.xz
mv-311c175f3184103950c72bc5c775174597430b83.zip
Replace std::vector into macro STD_VECTOR.
In most case it equal to std::vector except debug modes. Now it can be also mse::mstd::vector, but sadly this class not support all required features.
Diffstat (limited to 'src/gui/models/shopitems.h')
-rw-r--r--src/gui/models/shopitems.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/models/shopitems.h b/src/gui/models/shopitems.h
index 8bb6719d7..26c5a94e4 100644
--- a/src/gui/models/shopitems.h
+++ b/src/gui/models/shopitems.h
@@ -132,10 +132,10 @@ class ShopItems final : public ListModel
*/
void clear();
- std::vector<ShopItem*> &items() A_WARN_UNUSED
+ STD_VECTOR<ShopItem*> &items() A_WARN_UNUSED
{ return mShopItems; }
- std::vector<ShopItem*> &allItems() A_WARN_UNUSED
+ STD_VECTOR<ShopItem*> &allItems() A_WARN_UNUSED
{ return mAllShopItems; }
void setMergeDuplicates(const bool b)
@@ -153,13 +153,13 @@ class ShopItems final : public ListModel
ShopItem *findItem(const int id,
const ItemColor color) const A_WARN_UNUSED;
- bool findInAllItems(std::vector<ShopItem*>::iterator &it,
+ bool findInAllItems(STD_VECTOR<ShopItem*>::iterator &it,
const ShopItem *const item);
/** The list of items in the shop. */
- std::vector<ShopItem*> mAllShopItems;
+ STD_VECTOR<ShopItem*> mAllShopItems;
- std::vector<ShopItem*> mShopItems;
+ STD_VECTOR<ShopItem*> mShopItems;
std::string mCurrency;