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/widgets/tabs/socialnavigationtab.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/gui/widgets/tabs/socialnavigationtab.h') 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 *const avatars = mBeings->getMembers(); - std::vector portals = map->getPortals(); + STD_VECTOR *const avatars = mBeings->getMembers(); + STD_VECTOR portals = map->getPortals(); - std::vector::const_iterator i = portals.begin(); + STD_VECTOR::const_iterator i = portals.begin(); const SpecialLayer *const specialLayer = map->getSpecialLayer(); - std::vector::iterator ia = avatars->begin(); + STD_VECTOR::iterator ia = avatars->begin(); while (ia != avatars->end()) { @@ -170,7 +170,7 @@ class SocialNavigationTab final : public SocialTab if (localPlayer == nullptr) return; - std::vector *const avatars = mBeings->getMembers(); + STD_VECTOR *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 *const avatars = mBeings->getMembers(); + STD_VECTOR *const avatars = mBeings->getMembers(); const Map *const map = socialWindow->getMap(); if (map == nullptr) return; - std::vector::const_iterator i = avatars->begin(); - const std::vector::const_iterator i_end = avatars->end(); + STD_VECTOR::const_iterator i = avatars->begin(); + const STD_VECTOR::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 *const avatars = mBeings->getMembers(); + STD_VECTOR *const avatars = mBeings->getMembers(); const Map *const map = socialWindow->getMap(); if (map == nullptr) return -1; - std::vector::const_iterator i = avatars->begin(); - const std::vector::const_iterator i_end = avatars->end(); + STD_VECTOR::const_iterator i = avatars->begin(); + const STD_VECTOR::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 *const avatars = mBeings->getMembers(); + STD_VECTOR *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 *const avatars = mBeings->getMembers(); - std::vector::iterator i = avatars->begin(); - const std::vector::iterator i_end = avatars->end(); + STD_VECTOR *const avatars = mBeings->getMembers(); + STD_VECTOR::iterator i = avatars->begin(); + const STD_VECTOR::iterator i_end = avatars->end(); while (i != i_end) { -- cgit v1.2.3-70-g09d2