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/listeners/arrowslistener.cpp | 2 +- src/listeners/attributelistener.cpp | 2 +- src/listeners/banklistener.cpp | 2 +- src/listeners/baselistener.hpp | 6 +++--- src/listeners/buyingstoremodelistener.cpp | 2 +- src/listeners/buyingstoreslotslistener.cpp | 2 +- src/listeners/debugmessagelistener.cpp | 2 +- src/listeners/gamemodifierlistener.cpp | 2 +- src/listeners/playerdeathlistener.cpp | 2 +- src/listeners/statlistener.cpp | 2 +- src/listeners/updatestatuslistener.cpp | 2 +- src/listeners/vendingmodelistener.cpp | 2 +- src/listeners/vendingslotslistener.cpp | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/listeners') diff --git a/src/listeners/arrowslistener.cpp b/src/listeners/arrowslistener.cpp index 9ae92b93d..3a647f6c1 100644 --- a/src/listeners/arrowslistener.cpp +++ b/src/listeners/arrowslistener.cpp @@ -28,7 +28,7 @@ defineListener(ArrowsListener) void ArrowsListener::distributeEvent() { - FOR_EACH (std::vector::iterator, + FOR_EACH (STD_VECTOR::iterator, it, mListeners) { ArrowsListener *const listener = *it; diff --git a/src/listeners/attributelistener.cpp b/src/listeners/attributelistener.cpp index 0e12052e9..0680a27eb 100644 --- a/src/listeners/attributelistener.cpp +++ b/src/listeners/attributelistener.cpp @@ -30,7 +30,7 @@ void AttributeListener::distributeEvent(const AttributesT id, const int oldVal, const int newVal) { - FOR_EACH (std::vector::iterator, + FOR_EACH (STD_VECTOR::iterator, it, mListeners) { AttributeListener *const listener = *it; diff --git a/src/listeners/banklistener.cpp b/src/listeners/banklistener.cpp index e3cac0067..8dfe1d808 100644 --- a/src/listeners/banklistener.cpp +++ b/src/listeners/banklistener.cpp @@ -28,7 +28,7 @@ defineListener(BankListener) void BankListener::distributeEvent(const int money) { - FOR_EACH (std::vector::iterator, + FOR_EACH (STD_VECTOR::iterator, it, mListeners) { BankListener *const listener = *it; diff --git a/src/listeners/baselistener.hpp b/src/listeners/baselistener.hpp index 908bc9585..7afb429d5 100644 --- a/src/listeners/baselistener.hpp +++ b/src/listeners/baselistener.hpp @@ -24,7 +24,7 @@ #include "utils/vector.h" #define defineListener(name) \ - std::vector name::mListeners; \ + STD_VECTOR name::mListeners; \ \ name::name() \ { \ @@ -44,7 +44,7 @@ \ void name::removeListener(const name *const listener) \ { \ - std::vector::iterator it = mListeners.begin(); \ + STD_VECTOR::iterator it = mListeners.begin(); \ while (it != mListeners.end()) \ { \ if (*it == listener) \ @@ -65,6 +65,6 @@ static void removeListener(const name *const listener); \ \ private: \ - static std::vector mListeners; + static STD_VECTOR mListeners; #endif // LISTENERS_BASELISTENER_HPP diff --git a/src/listeners/buyingstoremodelistener.cpp b/src/listeners/buyingstoremodelistener.cpp index b6723f5c5..7ce95033c 100644 --- a/src/listeners/buyingstoremodelistener.cpp +++ b/src/listeners/buyingstoremodelistener.cpp @@ -28,7 +28,7 @@ defineListener(BuyingStoreModeListener) void BuyingStoreModeListener::distributeEvent(const bool b) { - FOR_EACH (std::vector::iterator, + FOR_EACH (STD_VECTOR::iterator, it, mListeners) { BuyingStoreModeListener *const listener = *it; diff --git a/src/listeners/buyingstoreslotslistener.cpp b/src/listeners/buyingstoreslotslistener.cpp index fc7c307a4..5afeaaa48 100644 --- a/src/listeners/buyingstoreslotslistener.cpp +++ b/src/listeners/buyingstoreslotslistener.cpp @@ -28,7 +28,7 @@ defineListener(BuyingStoreSlotsListener) void BuyingStoreSlotsListener::distributeEvent(const int slots) { - FOR_EACH (std::vector::iterator, + FOR_EACH (STD_VECTOR::iterator, it, mListeners) { BuyingStoreSlotsListener *const listener = *it; diff --git a/src/listeners/debugmessagelistener.cpp b/src/listeners/debugmessagelistener.cpp index 362c58a67..b759e7c14 100644 --- a/src/listeners/debugmessagelistener.cpp +++ b/src/listeners/debugmessagelistener.cpp @@ -28,7 +28,7 @@ defineListener(DebugMessageListener) void DebugMessageListener::distributeEvent(const std::string &msg) { - FOR_EACH (std::vector::iterator, + FOR_EACH (STD_VECTOR::iterator, it, mListeners) { DebugMessageListener *const listener = *it; diff --git a/src/listeners/gamemodifierlistener.cpp b/src/listeners/gamemodifierlistener.cpp index c914c2da3..ad17b186b 100644 --- a/src/listeners/gamemodifierlistener.cpp +++ b/src/listeners/gamemodifierlistener.cpp @@ -28,7 +28,7 @@ defineListener(GameModifierListener) void GameModifierListener::distributeEvent() { - FOR_EACH (std::vector::iterator, + FOR_EACH (STD_VECTOR::iterator, it, mListeners) { GameModifierListener *const listener = *it; diff --git a/src/listeners/playerdeathlistener.cpp b/src/listeners/playerdeathlistener.cpp index edd53e009..5a20d64e9 100644 --- a/src/listeners/playerdeathlistener.cpp +++ b/src/listeners/playerdeathlistener.cpp @@ -28,7 +28,7 @@ defineListener(PlayerDeathListener) void PlayerDeathListener::distributeEvent() { - FOR_EACH (std::vector::iterator, + FOR_EACH (STD_VECTOR::iterator, it, mListeners) { PlayerDeathListener *const listener = *it; diff --git a/src/listeners/statlistener.cpp b/src/listeners/statlistener.cpp index 8aff6b6a8..7d973d6aa 100644 --- a/src/listeners/statlistener.cpp +++ b/src/listeners/statlistener.cpp @@ -30,7 +30,7 @@ void StatListener::distributeEvent(const AttributesT id, const int oldVal1, const int oldVal2) { - FOR_EACH (std::vector::iterator, + FOR_EACH (STD_VECTOR::iterator, it, mListeners) { StatListener *const listener = *it; diff --git a/src/listeners/updatestatuslistener.cpp b/src/listeners/updatestatuslistener.cpp index fbc044cf5..511ba9c7a 100644 --- a/src/listeners/updatestatuslistener.cpp +++ b/src/listeners/updatestatuslistener.cpp @@ -28,7 +28,7 @@ defineListener(UpdateStatusListener) void UpdateStatusListener::distributeEvent() { - FOR_EACH (std::vector::iterator, + FOR_EACH (STD_VECTOR::iterator, it, mListeners) { UpdateStatusListener *const listener = *it; diff --git a/src/listeners/vendingmodelistener.cpp b/src/listeners/vendingmodelistener.cpp index 4e9b4d3d0..aa532099f 100644 --- a/src/listeners/vendingmodelistener.cpp +++ b/src/listeners/vendingmodelistener.cpp @@ -28,7 +28,7 @@ defineListener(VendingModeListener) void VendingModeListener::distributeEvent(const bool b) { - FOR_EACH (std::vector::iterator, + FOR_EACH (STD_VECTOR::iterator, it, mListeners) { VendingModeListener *const listener = *it; diff --git a/src/listeners/vendingslotslistener.cpp b/src/listeners/vendingslotslistener.cpp index 1618480ee..2f6b90c4a 100644 --- a/src/listeners/vendingslotslistener.cpp +++ b/src/listeners/vendingslotslistener.cpp @@ -28,7 +28,7 @@ defineListener(VendingSlotsListener) void VendingSlotsListener::distributeEvent(const int slots) { - FOR_EACH (std::vector::iterator, + FOR_EACH (STD_VECTOR::iterator, it, mListeners) { VendingSlotsListener *const listener = *it; -- cgit v1.2.3-70-g09d2