From 311c175f3184103950c72bc5c775174597430b83 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
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/windows/shopwindow.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/gui/windows/shopwindow.cpp')

diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 9ff15b024..0e55bcca1 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -318,7 +318,7 @@ void ShopWindow::action(const ActionEvent &event)
             }
             else
             {
-                std::vector<ShopItem*> &items = mBuyShopItems->items();
+                STD_VECTOR<ShopItem*> &items = mBuyShopItems->items();
                 if (!items.empty())
                 {
                     buyingStoreHandler->create(mSellShopName,
@@ -337,12 +337,12 @@ void ShopWindow::action(const ActionEvent &event)
             }
             else
             {
-                std::vector<ShopItem*> &oldItems = mSellShopItems->items();
-                std::vector<ShopItem*> items;
+                STD_VECTOR<ShopItem*> &oldItems = mSellShopItems->items();
+                STD_VECTOR<ShopItem*> items;
                 const Inventory *const inv = PlayerInfo::getCartInventory();
                 if (inv == nullptr)
                     return;
-                FOR_EACH (std::vector<ShopItem*>::iterator, it, oldItems)
+                FOR_EACH (STD_VECTOR<ShopItem*>::iterator, it, oldItems)
                 {
                     ShopItem *const item = *it;
                     if (item == nullptr)
@@ -551,7 +551,7 @@ void ShopWindow::loadList()
             const std::string str = line;
             if (!str.empty())
             {
-                std::vector<int> tokens;
+                STD_VECTOR<int> tokens;
                 std::stringstream ss(str);
 
                 while (ss >> buf)
@@ -600,8 +600,8 @@ void ShopWindow::saveList() const
         return;
     }
 
-    std::vector<ShopItem*> items = mBuyShopItems->items();
-    FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+    STD_VECTOR<ShopItem*> items = mBuyShopItems->items();
+    FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
     {
         ShopItem *const item = *(it);
         if (item != nullptr)
@@ -609,7 +609,7 @@ void ShopWindow::saveList() const
     }
 
     items = mSellShopItems->items();
-    FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+    FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
     {
         if ((*it) == nullptr)
             continue;
@@ -672,9 +672,9 @@ void ShopWindow::announce(ShopItems *const list, const int mode)
     if (mAnnounceButton != nullptr)
         mAnnounceButton->setEnabled(false);
 
-    std::vector<ShopItem*> items = list->items();
+    STD_VECTOR<ShopItem*> items = list->items();
 
-    FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+    FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
     {
         const ShopItem *const item = *(it);
         if (item->getQuantity() > 1)
@@ -760,9 +760,9 @@ void ShopWindow::giveList(const std::string &nick, const int mode)
     if (inv == nullptr)
         return;
 
-    std::vector<ShopItem*> items = list->items();
+    STD_VECTOR<ShopItem*> items = list->items();
 
-    FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+    FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
     {
         const ShopItem *const item = *(it);
         if (item == nullptr)
@@ -1064,13 +1064,13 @@ bool ShopWindow::findShopItem(const ShopItem *const shopItem,
     if (shopItem == nullptr)
         return false;
 
-    std::vector<ShopItem*> items;
+    STD_VECTOR<ShopItem*> items;
     if (mode == SELL)
         items = mSellShopItems->items();
     else
         items = mBuyShopItems->items();
 
-    FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+    FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
     {
         const ShopItem *const item = *(it);
         if (item == nullptr)
-- 
cgit v1.2.3-60-g2f50