summaryrefslogtreecommitdiff
path: root/src/listeners
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/listeners
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadplus-311c175f3184103950c72bc5c775174597430b83.tar.gz
plus-311c175f3184103950c72bc5c775174597430b83.tar.bz2
plus-311c175f3184103950c72bc5c775174597430b83.tar.xz
plus-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/listeners')
-rw-r--r--src/listeners/arrowslistener.cpp2
-rw-r--r--src/listeners/attributelistener.cpp2
-rw-r--r--src/listeners/banklistener.cpp2
-rw-r--r--src/listeners/baselistener.hpp6
-rw-r--r--src/listeners/buyingstoremodelistener.cpp2
-rw-r--r--src/listeners/buyingstoreslotslistener.cpp2
-rw-r--r--src/listeners/debugmessagelistener.cpp2
-rw-r--r--src/listeners/gamemodifierlistener.cpp2
-rw-r--r--src/listeners/playerdeathlistener.cpp2
-rw-r--r--src/listeners/statlistener.cpp2
-rw-r--r--src/listeners/updatestatuslistener.cpp2
-rw-r--r--src/listeners/vendingmodelistener.cpp2
-rw-r--r--src/listeners/vendingslotslistener.cpp2
13 files changed, 15 insertions, 15 deletions
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<ArrowsListener*>::iterator,
+ FOR_EACH (STD_VECTOR<ArrowsListener*>::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<AttributeListener*>::iterator,
+ FOR_EACH (STD_VECTOR<AttributeListener*>::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<BankListener*>::iterator,
+ FOR_EACH (STD_VECTOR<BankListener*>::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*> name::mListeners; \
+ STD_VECTOR<name*> name::mListeners; \
\
name::name() \
{ \
@@ -44,7 +44,7 @@
\
void name::removeListener(const name *const listener) \
{ \
- std::vector<name*>::iterator it = mListeners.begin(); \
+ STD_VECTOR<name*>::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<name*> mListeners;
+ static STD_VECTOR<name*> 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<BuyingStoreModeListener*>::iterator,
+ FOR_EACH (STD_VECTOR<BuyingStoreModeListener*>::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<BuyingStoreSlotsListener*>::iterator,
+ FOR_EACH (STD_VECTOR<BuyingStoreSlotsListener*>::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<DebugMessageListener*>::iterator,
+ FOR_EACH (STD_VECTOR<DebugMessageListener*>::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<GameModifierListener*>::iterator,
+ FOR_EACH (STD_VECTOR<GameModifierListener*>::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<PlayerDeathListener*>::iterator,
+ FOR_EACH (STD_VECTOR<PlayerDeathListener*>::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<StatListener*>::iterator,
+ FOR_EACH (STD_VECTOR<StatListener*>::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<UpdateStatusListener*>::iterator,
+ FOR_EACH (STD_VECTOR<UpdateStatusListener*>::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<VendingModeListener*>::iterator,
+ FOR_EACH (STD_VECTOR<VendingModeListener*>::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<VendingSlotsListener*>::iterator,
+ FOR_EACH (STD_VECTOR<VendingSlotsListener*>::iterator,
it, mListeners)
{
VendingSlotsListener *const listener = *it;