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/Makefile.am | 4 +- src/actions/actions.cpp | 6 +-- src/actions/commands.cpp | 2 +- src/actormanager.cpp | 10 ++--- src/actormanager.h | 4 +- src/being/being.cpp | 24 ++++++------ src/being/being.h | 14 +++---- src/being/compoundsprite.h | 6 +-- src/being/localplayer.h | 2 +- src/being/playerrelations.cpp | 4 +- src/being/playerrelations.h | 4 +- src/effectmanager.cpp | 6 +-- src/effectmanager.h | 2 +- src/events/inputevent.h | 2 +- src/fs/virtfs/fs.cpp | 38 +++++++++---------- src/fs/virtfs/fs.h | 2 +- src/fs/virtfs/fszip.cpp | 42 ++++++++++----------- src/fs/virtfs/zipentry.h | 4 +- src/fs/virtfs/zipreader.cpp | 4 +- src/graphicsmanager.cpp | 4 +- src/gui/focushandler.h | 2 +- src/gui/models/beingslistmodel.h | 4 +- src/gui/models/colormodel.h | 2 +- src/gui/models/extendednamesmodel.cpp | 2 +- src/gui/models/extendednamesmodel.h | 4 +- src/gui/models/playertablemodel.h | 2 +- src/gui/models/serverslistmodel.h | 2 +- src/gui/models/shopitems.cpp | 14 +++---- src/gui/models/shopitems.h | 10 ++--- src/gui/models/tablemodel.h | 4 +- src/gui/models/touchactionmodel.cpp | 4 +- src/gui/models/touchactionmodel.h | 2 +- src/gui/models/updatelistmodel.h | 2 +- src/gui/palette.h | 4 +- src/gui/popups/beingpopup.cpp | 6 +-- src/gui/popups/beingpopup.h | 2 +- src/gui/popups/itempopup.cpp | 4 +- src/gui/popups/popupmenu.cpp | 22 +++++------ src/gui/popups/popupmenu.h | 2 +- src/gui/shortcut/spellshortcut.cpp | 4 +- src/gui/theme.h | 2 +- src/gui/viewport.cpp | 2 +- src/gui/widgets/basiccontainer.h | 2 +- src/gui/widgets/browserbox.h | 4 +- src/gui/widgets/characterviewnormal.cpp | 6 +-- src/gui/widgets/characterviewnormal.h | 4 +- src/gui/widgets/characterviewsmall.cpp | 8 ++-- src/gui/widgets/characterviewsmall.h | 4 +- src/gui/widgets/emotepage.cpp | 8 ++-- src/gui/widgets/emoteshortcutcontainer.h | 2 +- src/gui/widgets/equipmentpage.h | 2 +- src/gui/widgets/extendedlistbox.cpp | 2 +- src/gui/widgets/extendedlistbox.h | 4 +- src/gui/widgets/guitable.h | 2 +- src/gui/widgets/itemcontainer.cpp | 4 +- src/gui/widgets/itemlinkhandler.cpp | 2 +- src/gui/widgets/itemshortcutcontainer.cpp | 2 +- src/gui/widgets/layoutarray.cpp | 24 ++++++------ src/gui/widgets/layoutarray.h | 6 +-- src/gui/widgets/layoutcell.cpp | 6 +-- src/gui/widgets/setupitem.h | 2 +- src/gui/widgets/staticbrowserbox.h | 4 +- src/gui/widgets/statspage.cpp | 4 +- src/gui/widgets/statspagebasic.cpp | 4 +- src/gui/widgets/tabbedarea.cpp | 2 +- src/gui/widgets/tabbedarea.h | 4 +- src/gui/widgets/tabs/socialfriendstab.h | 4 +- src/gui/widgets/tabs/socialnavigationtab.h | 30 +++++++-------- src/gui/widgets/tabs/socialplayerstab.h | 10 ++--- src/gui/widgets/tabs/socialtabbase.h | 4 +- src/gui/widgets/textbox.h | 2 +- src/gui/widgets/vertcontainer.cpp | 2 +- src/gui/widgets/vertcontainer.h | 2 +- src/gui/widgets/windowcontainer.h | 2 +- src/gui/windowmenu.cpp | 8 ++-- src/gui/windowmenu.h | 8 ++-- src/gui/windows/buydialog.cpp | 8 ++-- src/gui/windows/charcreatedialog.cpp | 6 +-- src/gui/windows/charcreatedialog.h | 6 +-- src/gui/windows/charselectdialog.cpp | 2 +- src/gui/windows/charselectdialog.h | 2 +- src/gui/windows/emotewindow.cpp | 2 +- src/gui/windows/equipmentwindow.cpp | 34 ++++++++--------- src/gui/windows/equipmentwindow.h | 2 +- src/gui/windows/mailwindow.cpp | 8 ++-- src/gui/windows/mailwindow.h | 2 +- src/gui/windows/ministatuswindow.cpp | 2 +- src/gui/windows/ministatuswindow.h | 6 +-- src/gui/windows/npcdialog.cpp | 10 ++--- src/gui/windows/npcdialog.h | 4 +- src/gui/windows/outfitwindow.cpp | 6 +-- src/gui/windows/questswindow.cpp | 26 ++++++------- src/gui/windows/questswindow.h | 8 ++-- src/gui/windows/quitdialog.cpp | 4 +- src/gui/windows/quitdialog.h | 2 +- src/gui/windows/serverdialog.cpp | 2 +- src/gui/windows/serverinfowindow.cpp | 4 +- src/gui/windows/serverinfowindow.h | 2 +- src/gui/windows/setupwindow.cpp | 2 +- src/gui/windows/setupwindow.h | 2 +- src/gui/windows/shopwindow.cpp | 28 +++++++------- src/gui/windows/shortcutwindow.cpp | 2 +- src/gui/windows/shortcutwindow.h | 2 +- src/gui/windows/skilldialog.cpp | 6 +-- src/gui/windows/skilldialog.h | 2 +- src/gui/windows/statuswindow.cpp | 4 +- src/gui/windows/statuswindow.h | 2 +- src/gui/windows/updaterwindow.cpp | 26 ++++++------- src/gui/windows/updaterwindow.h | 6 +-- src/gui/windows/whoisonline.cpp | 12 +++--- src/gui/windows/whoisonline.h | 10 ++--- src/guild.h | 2 +- src/input/joystick.cpp | 2 +- src/input/joystick.h | 2 +- src/input/touch/touchmanager.h | 2 +- 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 +- src/logger.cpp | 2 +- src/logger.h | 2 +- src/navigationmanager.cpp | 2 +- src/net/buyingstorehandler.h | 2 +- src/net/cashshophandler.h | 2 +- src/net/charserverhandler.h | 2 +- src/net/ea/inventoryitem.h | 2 +- src/net/eathena/buyingstorehandler.cpp | 4 +- src/net/eathena/buyingstorehandler.h | 2 +- src/net/eathena/cashshophandler.cpp | 6 +-- src/net/eathena/cashshophandler.h | 2 +- src/net/eathena/charserverhandler.cpp | 2 +- src/net/eathena/charserverhandler.h | 2 +- src/net/eathena/inventoryhandler.cpp | 4 +- src/net/eathena/inventoryhandler.h | 2 +- src/net/eathena/markethandler.cpp | 6 +-- src/net/eathena/markethandler.h | 2 +- src/net/eathena/npchandler.cpp | 12 +++--- src/net/eathena/npchandler.h | 4 +- src/net/eathena/playerrecv.cpp | 2 +- src/net/eathena/vendinghandler.cpp | 10 ++--- src/net/eathena/vendinghandler.h | 4 +- src/net/inventoryhandler.h | 2 +- src/net/ipc.cpp | 4 +- src/net/ipc.h | 2 +- src/net/markethandler.h | 2 +- src/net/npchandler.h | 4 +- src/net/serverinfo.h | 12 +++--- src/net/tmwa/buyingstorehandler.cpp | 2 +- src/net/tmwa/buyingstorehandler.h | 2 +- src/net/tmwa/cashshophandler.cpp | 2 +- src/net/tmwa/cashshophandler.h | 2 +- src/net/tmwa/charserverhandler.cpp | 2 +- src/net/tmwa/charserverhandler.h | 2 +- src/net/tmwa/inventoryhandler.cpp | 2 +- src/net/tmwa/inventoryhandler.h | 2 +- src/net/tmwa/markethandler.cpp | 2 +- src/net/tmwa/markethandler.h | 2 +- src/net/tmwa/npchandler.cpp | 4 +- src/net/tmwa/npchandler.h | 4 +- src/net/tmwa/vendinghandler.cpp | 4 +- src/net/tmwa/vendinghandler.h | 4 +- src/net/vendinghandler.h | 4 +- src/net/worldinfo.h | 2 +- src/particle/particle.cpp | 4 +- src/particle/particleemitter.cpp | 4 +- src/particle/particleemitter.h | 4 +- src/particle/particleinfo.h | 4 +- src/particle/particlevector.cpp | 4 +- src/particle/particlevector.h | 2 +- src/party.h | 2 +- src/render/mobileopengl2graphics.cpp | 28 +++++++------- src/render/mobileopenglgraphics.cpp | 20 +++++----- src/render/modernopenglgraphics.cpp | 28 +++++++------- src/render/normalopenglgraphics.cpp | 26 ++++++------- src/render/nullopenglgraphics.cpp | 26 ++++++------- src/render/vertexes/imagevertexes.h | 4 +- src/render/vertexes/openglgraphicsvertexes.cpp | 8 ++-- src/render/vertexes/openglgraphicsvertexes.h | 22 +++++------ src/resources/animation/animation.h | 2 +- src/resources/atlas/atlasmanager.cpp | 46 +++++++++++------------ src/resources/atlas/atlasmanager.h | 12 +++--- src/resources/atlas/atlasresource.cpp | 6 +-- src/resources/atlas/atlasresource.h | 2 +- src/resources/atlas/textureatlas.h | 4 +- src/resources/beinginfo.cpp | 2 +- src/resources/beinginfo.h | 4 +- src/resources/db/chardb.cpp | 4 +- src/resources/db/chardb.h | 2 +- src/resources/db/deaddb.cpp | 2 +- src/resources/db/itemdb.cpp | 4 +- src/resources/db/itemdb.h | 2 +- src/resources/db/itemoptiondb.cpp | 10 ++--- src/resources/db/itemoptiondb.h | 4 +- src/resources/db/networkdb.h | 2 +- src/resources/db/questdb.cpp | 18 ++++----- src/resources/db/questdb.h | 4 +- src/resources/db/sounddb.cpp | 2 +- src/resources/db/statdb.cpp | 14 +++---- src/resources/db/statdb.h | 6 +-- src/resources/db/unitsdb.cpp | 2 +- src/resources/db/weaponsdb.h | 2 +- src/resources/dye/dyepalette.h | 2 +- src/resources/dye/dyepalette_replaceacolor.cpp | 18 ++++----- src/resources/dye/dyepalette_replaceaoglcolor.cpp | 22 +++++------ src/resources/dye/dyepalette_replacescolor.cpp | 18 ++++----- src/resources/dye/dyepalette_replacesoglcolor.cpp | 22 +++++------ src/resources/horseinfo.h | 4 +- src/resources/imageset.h | 6 +-- src/resources/item/complexitem.cpp | 2 +- src/resources/item/complexitem.h | 4 +- src/resources/iteminfo.h | 2 +- src/resources/map/map.cpp | 8 ++-- src/resources/map/map.h | 12 +++--- src/resources/map/maplayer.h | 2 +- src/resources/map/mapobjectlist.h | 2 +- src/resources/map/maprowvertexes.h | 2 +- src/resources/map/tileanimation.h | 2 +- src/resources/npcdialogmenuinfo.h | 6 +-- src/resources/questitem.h | 2 +- src/resources/skill/skillinfo.h | 2 +- src/resources/soundinfo.h | 2 +- src/resources/sprite/spritedisplay.h | 2 +- src/resources/sprite/spritereference.h | 2 +- src/resources/wallpaper.cpp | 4 +- src/settings.h | 2 +- src/spellmanager.cpp | 6 +-- src/spellmanager.h | 4 +- src/unittests/fs/virtfs/zip_unittest.cc | 16 ++++---- src/unittests/render/mockgraphics.h | 2 +- src/unittests/utils/stringutils_unittest.cc | 6 +-- src/unittests/utils/xmlutils_unittest.cc | 2 +- src/utils/browserboxtools.cpp | 2 +- src/utils/langs.h | 2 +- src/utils/stringutils.cpp | 2 +- src/utils/stringutils.h | 2 +- src/utils/stringvector.h | 2 +- src/utils/xmlutils.cpp | 2 +- src/utils/xmlutils.h | 2 +- 247 files changed, 724 insertions(+), 724 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index a4d45bed4..9c79c6169 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -133,8 +133,8 @@ dyecmd_SOURCES = endif if ENABLE_STLDEBUG -dyecmd_CXXFLAGS += -DENABLE_STL_DEBUG -manaplus_CXXFLAGS += -DENABLE_STL_DEBUG -DDEBUG_DUMP_LEAKS +dyecmd_CXXFLAGS += -DENABLE_STLDEBUG +manaplus_CXXFLAGS += -DENABLE_STLDEBUG manaplus_SOURCES += debug/mse/msemsevector.h \ debug/mse/msemstdvector.h \ diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index 8f2c8facc..9fd53d926 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -1479,7 +1479,7 @@ impHandler0(testSdlFont) timespec time1; timespec time2; NullOpenGLGraphics *nullGraphics = new NullOpenGLGraphics; - std::vector data; + STD_VECTOR data; volatile int width = 0; for (int f = 0; f < 300; f ++) @@ -1491,12 +1491,12 @@ impHandler0(testSdlFont) for (int f = 0; f < 500; f ++) { - FOR_EACH (std::vector::const_iterator, it, data) + FOR_EACH (STD_VECTOR::const_iterator, it, data) { width += font->getWidth(*it); font->drawString(nullGraphics, color, color, *it, 10, 10); } - FOR_EACH (std::vector::const_iterator, it, data) + FOR_EACH (STD_VECTOR::const_iterator, it, data) font->drawString(nullGraphics, color, color, *it, 10, 10); font->doClean(); diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp index 0107770fe..6b51d2270 100644 --- a/src/actions/commands.cpp +++ b/src/actions/commands.cpp @@ -294,7 +294,7 @@ impHandler(chatAdd) if (event.args.empty()) return true; - std::vector str; + STD_VECTOR str; splitToIntVector(str, event.args, ','); if (str.empty()) return true; diff --git a/src/actormanager.cpp b/src/actormanager.cpp index 66fc5485d..ebc3dc50e 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -576,7 +576,7 @@ Being *ActorManager::findBeingByPixel(const int x, const int y, } } -void ActorManager::findBeingsByPixel(std::vector &beings, +void ActorManager::findBeingsByPixel(STD_VECTOR &beings, const int x, const int y, const AllPlayers allPlayers) const { @@ -1181,7 +1181,7 @@ Being *ActorManager::findNearestLivingBeing(const Being *const aroundBeing, if (cycleSelect) { - std::vector sortedBeings; + STD_VECTOR sortedBeings; FOR_EACH (ActorSprites::iterator, i, mActors) { @@ -1264,7 +1264,7 @@ Being *ActorManager::findNearestLivingBeing(const Being *const aroundBeing, } beingEqualActorFinder.findBeing = localPlayer->getTarget(); - std::vector::const_iterator i = std::find_if( + STD_VECTOR::const_iterator i = std::find_if( sortedBeings.begin(), sortedBeings.end(), beingEqualActorFinder); if (i == sortedBeings.end() || ++i == sortedBeings.end()) @@ -1649,7 +1649,7 @@ void ActorManager::printBeingsToChat(const std::string &header) const } } -void ActorManager::printBeingsToChat(const std::vector &beings, +void ActorManager::printBeingsToChat(const STD_VECTOR &beings, const std::string &header) { if (debugChatTab == nullptr) @@ -1659,7 +1659,7 @@ void ActorManager::printBeingsToChat(const std::vector &beings, ChatMsgType::BY_SERVER); debugChatTab->chatLog(header, ChatMsgType::BY_SERVER); - FOR_EACH (std::vector::const_iterator, i, beings) + FOR_EACH (STD_VECTOR::const_iterator, i, beings) { if (*i == nullptr) continue; diff --git a/src/actormanager.h b/src/actormanager.h index 10ca749fb..6fdf8d64c 100644 --- a/src/actormanager.h +++ b/src/actormanager.h @@ -143,7 +143,7 @@ class ActorManager final: public ConfigListener /** * Returns a beings at the specific pixel. */ - void findBeingsByPixel(std::vector &beings, + void findBeingsByPixel(STD_VECTOR &beings, const int x, const int y, const AllPlayers allPlayers) const; @@ -271,7 +271,7 @@ class ActorManager final: public ConfigListener void printBeingsToChat(const std::string &header) const; - static void printBeingsToChat(const std::vector &beings, + static void printBeingsToChat(const STD_VECTOR &beings, const std::string &header); void getPlayerNames(StringVect &names, diff --git a/src/being/being.cpp b/src/being/being.cpp index 56f22a1d5..508104d27 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -156,7 +156,7 @@ static const unsigned int SPEECH_MAX_TIME = 800; for (int f = 0; f < BadgeIndex::BadgeIndexSize; f++) #define for_each_horses(name) \ - FOR_EACH (std::vector::const_iterator, it, name) + FOR_EACH (STD_VECTOR::const_iterator, it, name) Being::Being(const BeingId id, const ActorTypeT type) : @@ -3265,8 +3265,8 @@ void Being::setSpriteSlot(const unsigned int slot, void Being::dumpSprites() const restrict2 { - std::vector::const_iterator it1 = mSlots.begin(); - const std::vector::const_iterator it1_end = mSlots.end(); + STD_VECTOR::const_iterator it1 = mSlots.begin(); + const STD_VECTOR::const_iterator it1_end = mSlots.end(); logger->log("sprites"); for (; it1 != it1_end; @@ -4195,10 +4195,10 @@ void Being::recalcSpritesOrder() restrict2 if (sz < 1) return; - std::vector slotRemap; + STD_VECTOR slotRemap; IntMap itemSlotRemap; - std::vector::iterator it; + STD_VECTOR::iterator it; int oldHide[20]; bool updatedSprite[20]; int dir = mSpriteDirection; @@ -4471,7 +4471,7 @@ void Being::recalcSpritesOrder() restrict2 } } -int Being::searchSlotValue(const std::vector &restrict slotRemap, +int Being::searchSlotValue(const STD_VECTOR &restrict slotRemap, const int val) const restrict2 { const size_t sz = mSprites.size(); @@ -4483,14 +4483,14 @@ int Being::searchSlotValue(const std::vector &restrict slotRemap, return CompoundSprite::getNumberOfLayers() - 1; } -void Being::searchSlotValueItr(std::vector::iterator &restrict it, +void Being::searchSlotValueItr(STD_VECTOR::iterator &restrict it, int &restrict idx, - std::vector &restrict slotRemap, + STD_VECTOR &restrict slotRemap, const int val) { // logger->log("searching %d", val); it = slotRemap.begin(); - const std::vector::iterator it_end = slotRemap.end(); + const STD_VECTOR::iterator it_end = slotRemap.end(); idx = 0; while (it != it_end) { @@ -4974,7 +4974,7 @@ void Being::removeItemParticles(const int id) restrict2 ParticleInfo *restrict const pi = (*it).second; if (pi != nullptr) { - FOR_EACH (std::vector::const_iterator, itp, pi->particles) + FOR_EACH (STD_VECTOR::const_iterator, itp, pi->particles) mChildParticleEffects.removeLocally(*itp); delete pi; } @@ -4988,13 +4988,13 @@ void Being::recreateItemParticles() restrict2 ParticleInfo *restrict const pi = (*it).second; if ((pi != nullptr) && !pi->files.empty()) { - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, itp, pi->particles) { mChildParticleEffects.removeLocally(*itp); } - FOR_EACH (std::vector::const_iterator, str, pi->files) + FOR_EACH (STD_VECTOR::const_iterator, str, pi->files) { Particle *const p = particleEngine->addEffect( *str, 0, 0); diff --git a/src/being/being.h b/src/being/being.h index 8bba7548d..6f9e753d9 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -1184,7 +1184,7 @@ class Being notfinal : public ActorSprite, typedef std::map SpriteParticleInfo; typedef SpriteParticleInfo::iterator SpriteParticleInfoIter; - std::vector mSlots; + STD_VECTOR mSlots; SpriteParticleInfo mSpriteParticles; // Character guild information @@ -1226,12 +1226,12 @@ class Being notfinal : public ActorSprite, template int getOffset() const restrict2 A_WARN_UNUSED; - int searchSlotValue(const std::vector &restrict slotRemap, + int searchSlotValue(const STD_VECTOR &restrict slotRemap, const int val) const restrict2 A_WARN_UNUSED; - static void searchSlotValueItr(std::vector::iterator &restrict it, + static void searchSlotValueItr(STD_VECTOR::iterator &restrict it, int &idx, - std::vector &restrict slotRemap, + STD_VECTOR &restrict slotRemap, const int val); void addSpiritBalls(const unsigned int balls, @@ -1286,9 +1286,9 @@ class Being notfinal : public ActorSprite, Particle *restrict mSpecialParticle; ChatObject *restrict mChat; HorseInfo *restrict mHorseInfo; - std::vector mDownHorseSprites; - std::vector mUpHorseSprites; - std::vector mSpiritParticles; + STD_VECTOR mDownHorseSprites; + STD_VECTOR mUpHorseSprites; + STD_VECTOR mSpiritParticles; int mX; // position in tiles int mY; // position in tiles diff --git a/src/being/compoundsprite.h b/src/being/compoundsprite.h index 92474025a..bf6679963 100644 --- a/src/being/compoundsprite.h +++ b/src/being/compoundsprite.h @@ -36,8 +36,8 @@ class Image; class CompoundSprite notfinal : public Sprite { public: - typedef std::vector::iterator SpriteIterator; - typedef std::vector::const_iterator SpriteConstIterator; + typedef STD_VECTOR::iterator SpriteIterator; + typedef STD_VECTOR::const_iterator SpriteConstIterator; CompoundSprite(); @@ -107,7 +107,7 @@ class CompoundSprite notfinal : public Sprite int getStartTime() const noexcept2 A_WARN_UNUSED { return mStartTime; } - std::vector mSprites; + STD_VECTOR mSprites; protected: void redraw() const; diff --git a/src/being/localplayer.h b/src/being/localplayer.h index 76a8c913b..fced5be26 100644 --- a/src/being/localplayer.h +++ b/src/being/localplayer.h @@ -471,7 +471,7 @@ class LocalPlayer final : public Being, int mLastAction; // Time stamp of the last action, -1 if none. - std::vector mStatusEffectIcons; + STD_VECTOR mStatusEffectIcons; typedef std::pair MessagePair; /** Queued messages*/ diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp index 8911ef3e7..8da47f36b 100644 --- a/src/being/playerrelations.cpp +++ b/src/being/playerrelations.cpp @@ -181,7 +181,7 @@ static const char *const DEFAULT_PERMISSIONS = "default-player-permissions"; int PlayerRelationsManager::getPlayerIgnoreStrategyIndex( const std::string &name) { - const std::vector *const strategies + const STD_VECTOR *const strategies = getPlayerIgnoreStrategies(); if (strategies == nullptr) @@ -576,7 +576,7 @@ class PIS_emote final : public PlayerIgnoreStrategy uint8_t mEmotion; }; -std::vector * +STD_VECTOR * PlayerRelationsManager::getPlayerIgnoreStrategies() { if (mIgnoreStrategies.empty()) diff --git a/src/being/playerrelations.h b/src/being/playerrelations.h index c9e5952f2..d1db4a003 100644 --- a/src/being/playerrelations.h +++ b/src/being/playerrelations.h @@ -118,7 +118,7 @@ class PlayerRelationsManager final * The player ignore strategies are allocated statically and must * not be deleted. */ - std::vector *getPlayerIgnoreStrategies() + STD_VECTOR *getPlayerIgnoreStrategies() A_WARN_UNUSED; /** @@ -202,7 +202,7 @@ class PlayerRelationsManager final PlayerIgnoreStrategy *mIgnoreStrategy; std::map mRelations; std::list mListeners; - std::vector mIgnoreStrategies; + STD_VECTOR mIgnoreStrategies; }; diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp index 383f997ab..79886293f 100644 --- a/src/effectmanager.cpp +++ b/src/effectmanager.cpp @@ -124,7 +124,7 @@ bool EffectManager::trigger(const int id, BLOCK_START("EffectManager::trigger") bool rValue = false; - FOR_EACH (std::vector::const_iterator, i, mEffects) + FOR_EACH (STD_VECTOR::const_iterator, i, mEffects) { const EffectDescription &effect = *i; if (effect.id == id) @@ -156,7 +156,7 @@ Particle *EffectManager::triggerReturn(const int id, return nullptr; Particle *rValue = nullptr; - FOR_EACH (std::vector::const_iterator, i, mEffects) + FOR_EACH (STD_VECTOR::const_iterator, i, mEffects) { const EffectDescription &effect = *i; if (effect.id == id) @@ -187,7 +187,7 @@ bool EffectManager::trigger(const int id, return false; bool rValue = false; - FOR_EACH (std::vector::const_iterator, i, mEffects) + FOR_EACH (STD_VECTOR::const_iterator, i, mEffects) { const EffectDescription &effect = *i; if (effect.id == id) diff --git a/src/effectmanager.h b/src/effectmanager.h index 5030b175f..5882e6933 100644 --- a/src/effectmanager.h +++ b/src/effectmanager.h @@ -92,7 +92,7 @@ class EffectManager final void clear(); private: - std::vector mEffects; + STD_VECTOR mEffects; std::list mTimers; }; diff --git a/src/events/inputevent.h b/src/events/inputevent.h index 1078b2ae8..68600143b 100644 --- a/src/events/inputevent.h +++ b/src/events/inputevent.h @@ -32,7 +32,7 @@ class ChatTab; -typedef std::vector KeysVector; +typedef STD_VECTOR KeysVector; typedef KeysVector::iterator KeysVectorIter; typedef KeysVector::const_iterator KeysVectorCIter; diff --git a/src/fs/virtfs/fs.cpp b/src/fs/virtfs/fs.cpp index 9fe755560..2ec75ac05 100644 --- a/src/fs/virtfs/fs.cpp +++ b/src/fs/virtfs/fs.cpp @@ -51,7 +51,7 @@ namespace VirtFs { namespace { - std::vector mEntries; + STD_VECTOR mEntries; } // namespace void init(const std::string &restrict name) @@ -85,7 +85,7 @@ namespace VirtFs return FsDir::getUserDir(); } - std::vector &getEntries() + STD_VECTOR &getEntries() { return mEntries; } @@ -93,7 +93,7 @@ namespace VirtFs FsEntry *searchByRootInternal(const std::string &restrict root, const std::string &restrict subDir) { - FOR_EACH (std::vector::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR::const_iterator, it, mEntries) { const FsEntry *const entry = *it; if (entry->root == root && @@ -108,7 +108,7 @@ namespace VirtFs FsEntry *searchByTypeInternal(const std::string &restrict root, const FsEntryTypeT type) { - FOR_EACH (std::vector::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR::const_iterator, it, mEntries) { const FsEntry *const entry = *it; if (entry->root == root && @@ -134,7 +134,7 @@ namespace VirtFs if (findLast(rootDir, std::string(dirSeparator)) == false) rootDir += dirSeparator; - FOR_EACH (std::vector::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR::const_iterator, it, mEntries) { FsEntry *const entry = *it; if (entry->funcs->exists(entry, name, rootDir) == true) @@ -159,7 +159,7 @@ namespace VirtFs rootDir += dirSeparator; StringVect &names = list->names; - FOR_EACH (std::vector::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR::const_iterator, it, mEntries) { FsEntry *const entry = *it; entry->funcs->enumerate(entry, rootDir, names); @@ -183,7 +183,7 @@ namespace VirtFs if (findLast(rootDir, std::string(dirSeparator)) == false) rootDir += dirSeparator; - FOR_EACH (std::vector::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR::const_iterator, it, mEntries) { FsEntry *const entry = *it; entry->funcs->getFiles(entry, rootDir, list); @@ -205,7 +205,7 @@ namespace VirtFs if (findLast(rootDir, std::string(dirSeparator)) == false) rootDir += dirSeparator; - FOR_EACH (std::vector::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR::const_iterator, it, mEntries) { FsEntry *const entry = *it; entry->funcs->getFilesWithDir(entry, rootDir, list); @@ -228,7 +228,7 @@ namespace VirtFs if (findLast(rootDir, std::string(dirSeparator)) == false) rootDir += dirSeparator; - FOR_EACH (std::vector::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR::const_iterator, it, mEntries) { FsEntry *const entry = *it; entry->funcs->getDirs(entry, rootDir, list); @@ -248,7 +248,7 @@ namespace VirtFs if (findLast(dirName, std::string(dirSeparator)) == false) dirName += dirSeparator; - FOR_EACH (std::vector::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR::const_iterator, it, mEntries) { FsEntry *const entry = *it; bool isDirFlag(false); @@ -279,7 +279,7 @@ namespace VirtFs filename.c_str()); return nullptr; } - FOR_EACH (std::vector::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR::const_iterator, it, mEntries) { FsEntry *const entry = *it; File *const file = entry->funcs->openRead(entry, filename); @@ -298,7 +298,7 @@ namespace VirtFs filename.c_str()); return nullptr; } - FOR_EACH (std::vector::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR::const_iterator, it, mEntries) { FsEntry *const entry = *it; File *const file = entry->funcs->openWrite(entry, filename); @@ -317,7 +317,7 @@ namespace VirtFs filename.c_str()); return nullptr; } - FOR_EACH (std::vector::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR::const_iterator, it, mEntries) { FsEntry *const entry = *it; File *const file = entry->funcs->openAppend(entry, filename); @@ -487,7 +487,7 @@ namespace VirtFs { subDir += dirSeparator; } - FOR_EACH (std::vector::iterator, it, mEntries) + FOR_EACH (STD_VECTOR::iterator, it, mEntries) { FsEntry *const entry = *it; if (entry->root == oldDir && @@ -679,7 +679,7 @@ namespace VirtFs reportAlways("Called unmount without zip archive"); return false; } - FOR_EACH (std::vector::iterator, it, mEntries) + FOR_EACH (STD_VECTOR::iterator, it, mEntries) { FsEntry *const entry = *it; if (entry->root == oldDir && @@ -719,7 +719,7 @@ namespace VirtFs { subDir += dirSeparator; } - FOR_EACH (std::vector::iterator, it, mEntries) + FOR_EACH (STD_VECTOR::iterator, it, mEntries) { FsEntry *const entry = *it; if (entry->root == oldDir && @@ -756,7 +756,7 @@ namespace VirtFs if (findLast(rootDir, std::string(dirSeparator)) == false) rootDir += dirSeparator; - FOR_EACH (std::vector::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR::const_iterator, it, mEntries) { FsEntry *const entry = *it; std::string realDir; @@ -785,7 +785,7 @@ namespace VirtFs { FsDir::deinit(); FsZip::deinit(); - FOR_EACH (std::vector::iterator, it, mEntries) + FOR_EACH (STD_VECTOR::iterator, it, mEntries) { FsEntry *const entry = *it; if (entry->type == FsEntryType::Dir) @@ -865,7 +865,7 @@ namespace VirtFs filename.c_str()); return nullptr; } - FOR_EACH (std::vector::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR::const_iterator, it, mEntries) { FsEntry *const entry = *it; const char *const buf = entry->funcs->loadFile(entry, diff --git a/src/fs/virtfs/fs.h b/src/fs/virtfs/fs.h index ca67117ea..326a88d90 100644 --- a/src/fs/virtfs/fs.h +++ b/src/fs/virtfs/fs.h @@ -98,7 +98,7 @@ namespace VirtFs const Append append); bool unmountDirInternal(std::string oldDir, std::string subDir); - std::vector &getEntries(); + STD_VECTOR &getEntries(); FsEntry *searchByRootInternal(const std::string &restrict root, const std::string &restrict subDir); FsEntry *searchByTypeInternal(const std::string &restrict root, diff --git a/src/fs/virtfs/fszip.cpp b/src/fs/virtfs/fszip.cpp index 830909778..148df66fc 100644 --- a/src/fs/virtfs/fszip.cpp +++ b/src/fs/virtfs/fszip.cpp @@ -102,7 +102,7 @@ namespace FsZip filename = pathJoin(subDir, filename); dirName = pathJoin(subDir, dirName); } - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it2, zipEntry->mHeaders) { @@ -112,7 +112,7 @@ namespace FsZip return true; } } - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it2, zipEntry->mDirs) { @@ -136,14 +136,14 @@ namespace FsZip filename = pathJoin(subDir, filename); dirName = pathJoin(subDir, dirName); } - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it2, zipEntry->mHeaders) { if ((*it2)->fileName == filename) return true; } - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it2, zipEntry->mDirs) { @@ -163,7 +163,7 @@ namespace FsZip dirName = pathJoin(subDir, dirName); if (dirName == dirSeparator) { - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it2, zipEntry->mHeaders) { @@ -188,7 +188,7 @@ namespace FsZip } else { - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it2, zipEntry->mHeaders) { @@ -226,7 +226,7 @@ namespace FsZip dirName = pathJoin(subDir, dirName); if (dirName == dirSeparator) { - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it2, zipEntry->mHeaders) { @@ -250,7 +250,7 @@ namespace FsZip std::string dirName2 = pathJoin(dirName, fileName); if (findLast(dirName2, std::string(dirSeparator)) == false) dirName2 += dirSeparator; - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it, zipEntry->mDirs) { @@ -267,7 +267,7 @@ namespace FsZip } else { - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it2, zipEntry->mHeaders) { @@ -296,7 +296,7 @@ namespace FsZip { dirName2 += dirSeparator; } - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it, zipEntry->mDirs) { @@ -327,7 +327,7 @@ namespace FsZip dirNameFull = dirName; if (dirNameFull == dirSeparator) { - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it2, zipEntry->mHeaders) { @@ -351,7 +351,7 @@ namespace FsZip std::string dirName2 = pathJoin(dirNameFull, fileName); if (findLast(dirName2, std::string(dirSeparator)) == false) dirName2 += dirSeparator; - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it, zipEntry->mDirs) { @@ -368,7 +368,7 @@ namespace FsZip } else { - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it2, zipEntry->mHeaders) { @@ -397,7 +397,7 @@ namespace FsZip { dirName2 += dirSeparator; } - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it, zipEntry->mDirs) { @@ -425,7 +425,7 @@ namespace FsZip dirName = pathJoin(subDir, dirName); if (dirName == dirSeparator) { - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it2, zipEntry->mHeaders) { @@ -449,7 +449,7 @@ namespace FsZip std::string dirName2 = pathJoin(dirName, fileName); if (findLast(dirName2, std::string(dirSeparator)) == false) dirName2 += dirSeparator; - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it, zipEntry->mDirs) { @@ -466,7 +466,7 @@ namespace FsZip } else { - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it2, zipEntry->mHeaders) { @@ -495,7 +495,7 @@ namespace FsZip { dirName2 += dirSeparator; } - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it, zipEntry->mDirs) { @@ -521,7 +521,7 @@ namespace FsZip std::string subDir = zipEntry->subDir; if (!subDir.empty()) dirName = pathJoin(subDir, dirName); - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it2, zipEntry->mDirs) { @@ -546,7 +546,7 @@ namespace FsZip std::string subDir = zipEntry->subDir; if (!subDir.empty()) filename = pathJoin(subDir, filename); - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it2, zipEntry->mHeaders) { @@ -679,7 +679,7 @@ namespace FsZip const std::string subDir = zipEntry->subDir; if (!subDir.empty()) filename = pathJoin(subDir, filename); - FOR_EACH (std::vector::const_iterator, + FOR_EACH (STD_VECTOR::const_iterator, it2, zipEntry->mHeaders) { diff --git a/src/fs/virtfs/zipentry.h b/src/fs/virtfs/zipentry.h index ddb742b4f..3d8a21ced 100644 --- a/src/fs/virtfs/zipentry.h +++ b/src/fs/virtfs/zipentry.h @@ -42,8 +42,8 @@ struct ZipEntry final : public FsEntry ~ZipEntry(); - std::vector mHeaders; - std::vector mDirs; + STD_VECTOR mHeaders; + STD_VECTOR mDirs; }; } // namespace VirtFs diff --git a/src/fs/virtfs/zipreader.cpp b/src/fs/virtfs/zipreader.cpp index 3302fd7c0..017686e6b 100644 --- a/src/fs/virtfs/zipreader.cpp +++ b/src/fs/virtfs/zipreader.cpp @@ -82,8 +82,8 @@ namespace ZipReader return false; } const std::string archiveName = entry->root; - std::vector &restrict headers = entry->mHeaders; - std::vector &restrict dirs = entry->mDirs; + STD_VECTOR &restrict headers = entry->mHeaders; + STD_VECTOR &restrict dirs = entry->mDirs; FILE *restrict const arcFile = fopen(archiveName.c_str(), "rb"); if (arcFile == nullptr) diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index 0cf99019e..008cc2d9f 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -462,7 +462,7 @@ void GraphicsManager::setVideoMode() SDL::getAllVideoModes(videoModes); if (videoModes.empty()) logger->error("no video modes detected"); - std::vector res; + STD_VECTOR res; splitToIntVector(res, videoModes[0], 'x'); if (res.size() != 2) logger->error("no video modes detected"); @@ -589,7 +589,7 @@ void GraphicsManager::initGraphics() } #if !defined(ANDROID) && !defined(__APPLE__) const std::string str = config.getStringValue("textureSize"); - std::vector sizes; + STD_VECTOR sizes; splitToIntVector(sizes, str, ','); const size_t pos = CAST_SIZE(openGLMode); if (sizes.size() <= pos) diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h index 346abc7b8..248ae8f71 100644 --- a/src/gui/focushandler.h +++ b/src/gui/focushandler.h @@ -345,7 +345,7 @@ class FocusHandler final /** * Typedef. */ - typedef std::vector WidgetVector; + typedef STD_VECTOR WidgetVector; /** * Typedef. diff --git a/src/gui/models/beingslistmodel.h b/src/gui/models/beingslistmodel.h index db17f4833..a0a9d2920 100644 --- a/src/gui/models/beingslistmodel.h +++ b/src/gui/models/beingslistmodel.h @@ -45,7 +45,7 @@ class BeingsListModel final : public AvatarListModel mMembers.clear(); } - std::vector *getMembers() RETURNS_NONNULL A_WARN_UNUSED + STD_VECTOR *getMembers() RETURNS_NONNULL A_WARN_UNUSED { return &mMembers; } @@ -60,7 +60,7 @@ class BeingsListModel final : public AvatarListModel return CAST_S32(mMembers.size()); } - std::vector mMembers; + STD_VECTOR mMembers; }; #endif // GUI_MODELS_BEINGSLISTMODEL_H diff --git a/src/gui/models/colormodel.h b/src/gui/models/colormodel.h index 225bc6536..9d621dfbe 100644 --- a/src/gui/models/colormodel.h +++ b/src/gui/models/colormodel.h @@ -63,7 +63,7 @@ class ColorModel final : public ListModel protected: StringVect mNames; - std::vector mColors; + STD_VECTOR mColors; }; #endif // GUI_MODELS_COLORMODEL_H diff --git a/src/gui/models/extendednamesmodel.cpp b/src/gui/models/extendednamesmodel.cpp index 146473a91..76191ae5a 100644 --- a/src/gui/models/extendednamesmodel.cpp +++ b/src/gui/models/extendednamesmodel.cpp @@ -59,7 +59,7 @@ const Image *ExtendedNamesModel::getImageAt(int i) void ExtendedNamesModel::clear() { mNames.clear(); - FOR_EACH (std::vector::iterator, it, mImages) + FOR_EACH (STD_VECTOR::iterator, it, mImages) { if (*it != nullptr) (*it)->decRef(); diff --git a/src/gui/models/extendednamesmodel.h b/src/gui/models/extendednamesmodel.h index cf1d13f6e..2e85a4b2b 100644 --- a/src/gui/models/extendednamesmodel.h +++ b/src/gui/models/extendednamesmodel.h @@ -43,7 +43,7 @@ class ExtendedNamesModel notfinal : public ExtendedListModel StringVect &getNames() A_WARN_UNUSED { return mNames; } - std::vector &getImages() A_WARN_UNUSED + STD_VECTOR &getImages() A_WARN_UNUSED { return mImages; } size_t size() A_WARN_UNUSED @@ -56,7 +56,7 @@ class ExtendedNamesModel notfinal : public ExtendedListModel protected: StringVect mNames; - std::vector mImages; + STD_VECTOR mImages; }; #endif // GUI_MODELS_EXTENDEDNAMESMODEL_H diff --git a/src/gui/models/playertablemodel.h b/src/gui/models/playertablemodel.h index 4c8792bc7..dfb00eeb4 100644 --- a/src/gui/models/playertablemodel.h +++ b/src/gui/models/playertablemodel.h @@ -61,7 +61,7 @@ class PlayerTableModel final : public Widget2, protected: StringVect *mPlayers; - std::vector mWidgets; + STD_VECTOR mWidgets; PlayerRelationListModel *mListModel; }; diff --git a/src/gui/models/serverslistmodel.h b/src/gui/models/serverslistmodel.h index 206daa02a..8e236ebe0 100644 --- a/src/gui/models/serverslistmodel.h +++ b/src/gui/models/serverslistmodel.h @@ -109,7 +109,7 @@ class ServersListModel final : public ListModel } private: - typedef std::vector VersionStrings; + typedef STD_VECTOR VersionStrings; ServerInfos *mServers; VersionStrings mVersionStrings; diff --git a/src/gui/models/shopitems.cpp b/src/gui/models/shopitems.cpp index 763b75390..27e05ff12 100644 --- a/src/gui/models/shopitems.cpp +++ b/src/gui/models/shopitems.cpp @@ -133,10 +133,10 @@ ShopItem *ShopItems::at(const size_t i) const return mShopItems.at(i); } -bool ShopItems::findInAllItems(std::vector::iterator &it, +bool ShopItems::findInAllItems(STD_VECTOR::iterator &it, const ShopItem *const item) { - const std::vector::iterator it_end = mAllShopItems.end(); + const STD_VECTOR::iterator it_end = mAllShopItems.end(); for (it = mAllShopItems.begin(); it != it_end; ++ it) { if (*it == item) @@ -151,7 +151,7 @@ void ShopItems::erase(const unsigned int i) return; const ShopItem *const item = *(mShopItems.begin() + i); - std::vector::iterator it; + STD_VECTOR::iterator it; if (findInAllItems(it, item)) mAllShopItems.erase(it); mShopItems.erase(mShopItems.begin() + i); @@ -163,7 +163,7 @@ void ShopItems::del(const unsigned int i) return; ShopItem *item = *(mShopItems.begin() + i); - std::vector::iterator it; + STD_VECTOR::iterator it; if (findInAllItems(it, item)) mAllShopItems.erase(it); mShopItems.erase(mShopItems.begin() + i); @@ -180,8 +180,8 @@ void ShopItems::clear() ShopItem *ShopItems::findItem(const int id, const ItemColor color) const { - std::vector::const_iterator it = mShopItems.begin(); - const std::vector::const_iterator e = mShopItems.end(); + STD_VECTOR::const_iterator it = mShopItems.begin(); + const STD_VECTOR::const_iterator e = mShopItems.end(); while (it != e) { ShopItem *const item = *it; @@ -197,7 +197,7 @@ ShopItem *ShopItems::findItem(const int id, void ShopItems::updateList() { mShopItems.clear(); - FOR_EACH (std::vector::iterator, it, mAllShopItems) + FOR_EACH (STD_VECTOR::iterator, it, mAllShopItems) { ShopItem *const item = *it; if ((item != nullptr) && item->isVisible()) diff --git a/src/gui/models/shopitems.h b/src/gui/models/shopitems.h index 8bb6719d7..26c5a94e4 100644 --- a/src/gui/models/shopitems.h +++ b/src/gui/models/shopitems.h @@ -132,10 +132,10 @@ class ShopItems final : public ListModel */ void clear(); - std::vector &items() A_WARN_UNUSED + STD_VECTOR &items() A_WARN_UNUSED { return mShopItems; } - std::vector &allItems() A_WARN_UNUSED + STD_VECTOR &allItems() A_WARN_UNUSED { return mAllShopItems; } void setMergeDuplicates(const bool b) @@ -153,13 +153,13 @@ class ShopItems final : public ListModel ShopItem *findItem(const int id, const ItemColor color) const A_WARN_UNUSED; - bool findInAllItems(std::vector::iterator &it, + bool findInAllItems(STD_VECTOR::iterator &it, const ShopItem *const item); /** The list of items in the shop. */ - std::vector mAllShopItems; + STD_VECTOR mAllShopItems; - std::vector mShopItems; + STD_VECTOR mShopItems; std::string mCurrency; diff --git a/src/gui/models/tablemodel.h b/src/gui/models/tablemodel.h index f28a60a6f..23f286c2e 100644 --- a/src/gui/models/tablemodel.h +++ b/src/gui/models/tablemodel.h @@ -146,8 +146,8 @@ class StaticTableModel final : public TableModel int mRows; int mColumns; int mHeight; - std::vector mTableModel; - std::vector mWidths; + STD_VECTOR mTableModel; + STD_VECTOR mWidths; }; #endif // GUI_MODELS_TABLEMODEL_H diff --git a/src/gui/models/touchactionmodel.cpp b/src/gui/models/touchactionmodel.cpp index 7f6b68ef7..1998d2752 100644 --- a/src/gui/models/touchactionmodel.cpp +++ b/src/gui/models/touchactionmodel.cpp @@ -50,7 +50,7 @@ TouchActionsModel::TouchActionsModel() : mActionId(), mActionToSelection() { - std::vector data; + STD_VECTOR data; for (int f = 0, fsz = touchActionDataSize; f < fsz; f ++) { @@ -64,7 +64,7 @@ TouchActionsModel::TouchActionsModel() : std::sort(data.begin(), data.end(), touchActionSorter); int cnt = 0; - FOR_EACH (std::vector::iterator, it, data) + FOR_EACH (STD_VECTOR::iterator, it, data) { const SetupActionData *const data1 = *it; mNames.push_back(data1->name); diff --git a/src/gui/models/touchactionmodel.h b/src/gui/models/touchactionmodel.h index a3ea05c9d..2d8cff02a 100644 --- a/src/gui/models/touchactionmodel.h +++ b/src/gui/models/touchactionmodel.h @@ -42,7 +42,7 @@ class TouchActionsModel final : public NamesModel int getSelectionFromAction(const InputActionT action) const; private: - std::vector mActionId; + STD_VECTOR mActionId; std::map mActionToSelection; }; diff --git a/src/gui/models/updatelistmodel.h b/src/gui/models/updatelistmodel.h index f50072112..cd4ba50c3 100644 --- a/src/gui/models/updatelistmodel.h +++ b/src/gui/models/updatelistmodel.h @@ -40,7 +40,7 @@ class UpdateListModel final : public ListModel mNames(), mServer(server) { - FOR_EACH(std::vector::const_iterator, + FOR_EACH(STD_VECTOR::const_iterator, it, server->updateHosts) { diff --git a/src/gui/palette.h b/src/gui/palette.h index f75f3f8fb..048dacf54 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -148,11 +148,11 @@ class Palette notfinal committedColor.b; } }; - typedef std::vector Colors; + typedef STD_VECTOR Colors; typedef std::map CharColors; Colors mColors; CharColors mCharColors; - std::vector mGradVector; + STD_VECTOR mGradVector; }; #endif // GUI_PALETTE_H diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp index 251848ed8..299683f6d 100644 --- a/src/gui/popups/beingpopup.cpp +++ b/src/gui/popups/beingpopup.cpp @@ -67,7 +67,7 @@ void BeingPopup::postInit() { Popup::postInit(); add(mBeingName); - FOR_EACH (std::vector::iterator, it, mLabels) + FOR_EACH (STD_VECTOR::iterator, it, mLabels) { add(*it); } @@ -124,7 +124,7 @@ void BeingPopup::show(const int x, const int y, Being *const b) } mBeingName->adjustSize(); - FOR_EACH (std::vector::iterator, it, mLabels) + FOR_EACH (STD_VECTOR::iterator, it, mLabels) { (*it)->setCaption(std::string()); } @@ -311,7 +311,7 @@ void BeingPopup::show(const int x, const int y, Being *const b) int minWidth = mBeingName->getWidth(); const int height1 = getFont()->getHeight(); int height = height1; - FOR_EACH (std::vector::iterator, it, mLabels) + FOR_EACH (STD_VECTOR::iterator, it, mLabels) { const Label *const label = *it; if (label != nullptr) diff --git a/src/gui/popups/beingpopup.h b/src/gui/popups/beingpopup.h index 8c218da2a..a14f44568 100644 --- a/src/gui/popups/beingpopup.h +++ b/src/gui/popups/beingpopup.h @@ -60,7 +60,7 @@ class BeingPopup final : public Popup void addLabels(const int fontHeight); Label *mBeingName A_NONNULLPOINTER; - std::vector mLabels; + STD_VECTOR mLabels; }; extern BeingPopup *beingPopup; diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index 5179627e1..eedead83d 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -382,12 +382,12 @@ std::string ItemPopup::getOptionsString(const ItemOptionsList *const options) const ItemOption &option = options->get(f); if (option.index == 0) continue; - const std::vector &fields = ItemOptionDb::getFields( + const STD_VECTOR &fields = ItemOptionDb::getFields( option.index); if (fields.empty()) continue; const std::string valueStr = toString(option.value); - FOR_EACH (std::vector::const_iterator, it, fields) + FOR_EACH (STD_VECTOR::const_iterator, it, fields) { const ItemFieldType *const field = *it; std::string value = valueStr; diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 2f2df70c3..8b11b0c2f 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -460,8 +460,8 @@ bool PopupMenu::addBeingMenu() if (info == nullptr) return false; - const std::vector &menu = info->getMenu(); - FOR_EACH (std::vector::const_iterator, it, menu) + const STD_VECTOR &menu = info->getMenu(); + FOR_EACH (STD_VECTOR::const_iterator, it, menu) { const BeingMenuItem &item = *it; mBrowserBox->addRow("/" + item.command, item.name.c_str()); @@ -499,14 +499,14 @@ void PopupMenu::setMousePos2() } void PopupMenu::showPopup(const int x, const int y, - const std::vector &beings) + const STD_VECTOR &beings) { mX = x; mY = y; mBrowserBox->clearRows(); // TRANSLATORS: popup menu header mBrowserBox->addRow(_("Players")); - FOR_EACH (std::vector::const_iterator, it, beings) + FOR_EACH (STD_VECTOR::const_iterator, it, beings) { const Being *const being = dynamic_cast(*it); const ActorSprite *const actor = *it; @@ -1806,8 +1806,8 @@ void PopupMenu::showPopup(const int x, const int y, Button *const button) mY = y; mBrowserBox->clearRows(); - std::vector