summaryrefslogtreecommitdiff
path: root/src/gui/widgets/tabs
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/gui/widgets/tabs
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadmv-311c175f3184103950c72bc5c775174597430b83.tar.gz
mv-311c175f3184103950c72bc5c775174597430b83.tar.bz2
mv-311c175f3184103950c72bc5c775174597430b83.tar.xz
mv-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/gui/widgets/tabs')
-rw-r--r--src/gui/widgets/tabs/socialfriendstab.h4
-rw-r--r--src/gui/widgets/tabs/socialnavigationtab.h30
-rw-r--r--src/gui/widgets/tabs/socialplayerstab.h10
-rw-r--r--src/gui/widgets/tabs/socialtabbase.h4
4 files changed, 24 insertions, 24 deletions
diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h
index 017f465c7..d1cd942cd 100644
--- a/src/gui/widgets/tabs/socialfriendstab.h
+++ b/src/gui/widgets/tabs/socialfriendstab.h
@@ -75,9 +75,9 @@ class SocialFriendsTab final : public SocialTab
if (actorManager == nullptr)
return;
- std::vector<Avatar*> *const avatars = mBeings->getMembers();
+ STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
- std::vector<Avatar*>::iterator ia = avatars->begin();
+ STD_VECTOR<Avatar*>::iterator ia = avatars->begin();
while (ia != avatars->end())
{
delete *ia;
diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h
index 80b5910f3..3bd584991 100644
--- a/src/gui/widgets/tabs/socialnavigationtab.h
+++ b/src/gui/widgets/tabs/socialnavigationtab.h
@@ -82,13 +82,13 @@ class SocialNavigationTab final : public SocialTab
if (socialWindow->getProcessedPortals())
return;
- std::vector<Avatar*> *const avatars = mBeings->getMembers();
- std::vector<MapItem*> portals = map->getPortals();
+ STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
+ STD_VECTOR<MapItem*> portals = map->getPortals();
- std::vector<MapItem*>::const_iterator i = portals.begin();
+ STD_VECTOR<MapItem*>::const_iterator i = portals.begin();
const SpecialLayer *const specialLayer = map->getSpecialLayer();
- std::vector<Avatar*>::iterator ia = avatars->begin();
+ STD_VECTOR<Avatar*>::iterator ia = avatars->begin();
while (ia != avatars->end())
{
@@ -170,7 +170,7 @@ class SocialNavigationTab final : public SocialTab
if (localPlayer == nullptr)
return;
- std::vector<Avatar*> *const avatars = mBeings->getMembers();
+ STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
if (avatars->size() <= CAST_SIZE(num))
return;
@@ -184,14 +184,14 @@ class SocialNavigationTab final : public SocialTab
if (socialWindow == nullptr)
return;
- std::vector<Avatar*> *const avatars = mBeings->getMembers();
+ STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
const Map *const map = socialWindow->getMap();
if (map == nullptr)
return;
- std::vector<Avatar*>::const_iterator i = avatars->begin();
- const std::vector<Avatar*>::const_iterator i_end = avatars->end();
+ STD_VECTOR<Avatar*>::const_iterator i = avatars->begin();
+ const STD_VECTOR<Avatar*>::const_iterator i_end = avatars->end();
while (i != i_end)
{
Avatar *const ava = *i;
@@ -218,13 +218,13 @@ class SocialNavigationTab final : public SocialTab
if (socialWindow == nullptr)
return -1;
- std::vector<Avatar*> *const avatars = mBeings->getMembers();
+ STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
const Map *const map = socialWindow->getMap();
if (map == nullptr)
return -1;
- std::vector<Avatar*>::const_iterator i = avatars->begin();
- const std::vector<Avatar*>::const_iterator i_end = avatars->end();
+ STD_VECTOR<Avatar*>::const_iterator i = avatars->begin();
+ const STD_VECTOR<Avatar*>::const_iterator i_end = avatars->end();
unsigned num = 0;
while (i != i_end)
{
@@ -250,7 +250,7 @@ class SocialNavigationTab final : public SocialTab
if (map == nullptr)
return;
- std::vector<Avatar*> *const avatars = mBeings->getMembers();
+ STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
const MapItem *const portal = map->findPortalXY(x, y);
if (portal == nullptr)
return;
@@ -279,9 +279,9 @@ class SocialNavigationTab final : public SocialTab
if (map == nullptr)
return;
- std::vector<Avatar*> *const avatars = mBeings->getMembers();
- std::vector<Avatar*>::iterator i = avatars->begin();
- const std::vector<Avatar*>::iterator i_end = avatars->end();
+ STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
+ STD_VECTOR<Avatar*>::iterator i = avatars->begin();
+ const STD_VECTOR<Avatar*>::iterator i_end = avatars->end();
while (i != i_end)
{
diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h
index 87b0335c1..c43093fca 100644
--- a/src/gui/widgets/tabs/socialplayerstab.h
+++ b/src/gui/widgets/tabs/socialplayerstab.h
@@ -119,10 +119,10 @@ class SocialPlayersTab final : public SocialTab
Avatar* findAvatarbyName(const std::string &name)
{
- std::vector<Avatar*> *const avatars = mBeings->getMembers();
+ STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
Avatar *ava = nullptr;
- std::vector<Avatar*>::const_iterator i = avatars->begin();
- const std::vector<Avatar*>::const_iterator i_end = avatars->end();
+ STD_VECTOR<Avatar*>::const_iterator i = avatars->begin();
+ const STD_VECTOR<Avatar*>::const_iterator i_end = avatars->end();
while (i != i_end)
{
ava = (*i);
@@ -138,13 +138,13 @@ class SocialPlayersTab final : public SocialTab
void getPlayersAvatars()
{
- std::vector<Avatar*> *const avatars = mBeings->getMembers();
+ STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
if (actorManager != nullptr)
{
StringVect names;
actorManager->getPlayerNames(names, NpcNames_false);
- std::vector<Avatar*>::iterator ai = avatars->begin();
+ STD_VECTOR<Avatar*>::iterator ai = avatars->begin();
while (ai != avatars->end())
{
bool finded = false;
diff --git a/src/gui/widgets/tabs/socialtabbase.h b/src/gui/widgets/tabs/socialtabbase.h
index 9cffcae89..03a02bb1f 100644
--- a/src/gui/widgets/tabs/socialtabbase.h
+++ b/src/gui/widgets/tabs/socialtabbase.h
@@ -68,8 +68,8 @@ ENUMS_RESOURCES_MAP_MAPITEMTYPE_H
#define updateAtkListStart() \
if (!socialWindow || !localPlayer || !actorManager)\
return;\
- std::vector<Avatar*> *const avatars = mBeings->getMembers();\
- std::vector<Avatar*>::iterator ia = avatars->begin();\
+ STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();\
+ STD_VECTOR<Avatar*>::iterator ia = avatars->begin();\
while (ia != avatars->end())\
{\
delete *ia;\