From 311c175f3184103950c72bc5c775174597430b83 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 14 Jul 2017 01:31:22 +0300 Subject: 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. --- src/gui/models/shopitems.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gui/models/shopitems.cpp') diff --git a/src/gui/models/shopitems.cpp b/src/gui/models/shopitems.cpp index 763b75390..27e05ff12 100644 --- a/src/gui/models/shopitems.cpp +++ b/src/gui/models/shopitems.cpp @@ -133,10 +133,10 @@ ShopItem *ShopItems::at(const size_t i) const return mShopItems.at(i); } -bool ShopItems::findInAllItems(std::vector::iterator &it, +bool ShopItems::findInAllItems(STD_VECTOR::iterator &it, const ShopItem *const item) { - const std::vector::iterator it_end = mAllShopItems.end(); + const STD_VECTOR::iterator it_end = mAllShopItems.end(); for (it = mAllShopItems.begin(); it != it_end; ++ it) { if (*it == item) @@ -151,7 +151,7 @@ void ShopItems::erase(const unsigned int i) return; const ShopItem *const item = *(mShopItems.begin() + i); - std::vector::iterator it; + STD_VECTOR::iterator it; if (findInAllItems(it, item)) mAllShopItems.erase(it); mShopItems.erase(mShopItems.begin() + i); @@ -163,7 +163,7 @@ void ShopItems::del(const unsigned int i) return; ShopItem *item = *(mShopItems.begin() + i); - std::vector::iterator it; + STD_VECTOR::iterator it; if (findInAllItems(it, item)) mAllShopItems.erase(it); mShopItems.erase(mShopItems.begin() + i); @@ -180,8 +180,8 @@ void ShopItems::clear() ShopItem *ShopItems::findItem(const int id, const ItemColor color) const { - std::vector::const_iterator it = mShopItems.begin(); - const std::vector::const_iterator e = mShopItems.end(); + STD_VECTOR::const_iterator it = mShopItems.begin(); + const STD_VECTOR::const_iterator e = mShopItems.end(); while (it != e) { ShopItem *const item = *it; @@ -197,7 +197,7 @@ ShopItem *ShopItems::findItem(const int id, void ShopItems::updateList() { mShopItems.clear(); - FOR_EACH (std::vector::iterator, it, mAllShopItems) + FOR_EACH (STD_VECTOR::iterator, it, mAllShopItems) { ShopItem *const item = *it; if ((item != nullptr) && item->isVisible()) -- cgit v1.2.3-70-g09d2