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.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui/models/shopitems.h') 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 &items() A_WARN_UNUSED + STD_VECTOR &items() A_WARN_UNUSED { return mShopItems; } - std::vector &allItems() A_WARN_UNUSED + STD_VECTOR &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::iterator &it, + bool findInAllItems(STD_VECTOR::iterator &it, const ShopItem *const item); /** The list of items in the shop. */ - std::vector mAllShopItems; + STD_VECTOR mAllShopItems; - std::vector mShopItems; + STD_VECTOR mShopItems; std::string mCurrency; -- cgit v1.2.3-60-g2f50