diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-07-14 01:31:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-07-14 01:31:22 +0300 |
| commit | 311c175f3184103950c72bc5c775174597430b83 (patch) | |
| tree | ad022dc44a1c4177b3d53bf0d7eaa5a1736c8cf1 | |
| parent | 16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff) | |
| download | plus-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.
247 files changed, 724 insertions, 724 deletions
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<std::string> data; + STD_VECTOR<std::string> 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<std::string>::const_iterator, it, data) + FOR_EACH (STD_VECTOR<std::string>::const_iterator, it, data) { width += font->getWidth(*it); font->drawString(nullGraphics, color, color, *it, 10, 10); } - FOR_EACH (std::vector<std::string>::const_iterator, it, data) + FOR_EACH (STD_VECTOR<std::string>::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<int> str; + STD_VECTOR<int> 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<ActorSprite*> &beings, +void ActorManager::findBeingsByPixel(STD_VECTOR<ActorSprite*> &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<Being*> sortedBeings; + STD_VECTOR<Being*> sortedBeings; FOR_EACH (ActorSprites::iterator, i, mActors) { @@ -1264,7 +1264,7 @@ Being *ActorManager::findNearestLivingBeing(const Being *const aroundBeing, } beingEqualActorFinder.findBeing = localPlayer->getTarget(); - std::vector<Being*>::const_iterator i = std::find_if( + STD_VECTOR<Being*>::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<Being*> &beings, +void ActorManager::printBeingsToChat(const STD_VECTOR<Being*> &beings, const std::string &header) { if (debugChatTab == nullptr) @@ -1659,7 +1659,7 @@ void ActorManager::printBeingsToChat(const std::vector<Being*> &beings, ChatMsgType::BY_SERVER); debugChatTab->chatLog(header, ChatMsgType::BY_SERVER); - FOR_EACH (std::vector<Being*>::const_iterator, i, beings) + FOR_EACH (STD_VECTOR<Being*>::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<ActorSprite*> &beings, + void findBeingsByPixel(STD_VECTOR<ActorSprite*> &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<Being*> &beings, + static void printBeingsToChat(const STD_VECTOR<Being*> &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<AnimatedSprite*>::const_iterator, it, name) + FOR_EACH (STD_VECTOR<AnimatedSprite*>::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<BeingSlot>::const_iterator it1 = mSlots.begin(); - const std::vector<BeingSlot>::const_iterator it1_end = mSlots.end(); + STD_VECTOR<BeingSlot>::const_iterator it1 = mSlots.begin(); + const STD_VECTOR<BeingSlot>::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<int> slotRemap; + STD_VECTOR<int> slotRemap; IntMap itemSlotRemap; - std::vector<int>::iterator it; + STD_VECTOR<int>::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<int> &restrict slotRemap, +int Being::searchSlotValue(const STD_VECTOR<int> &restrict slotRemap, const int val) const restrict2 { const size_t sz = mSprites.size(); @@ -4483,14 +4483,14 @@ int Being::searchSlotValue(const std::vector<int> &restrict slotRemap, return CompoundSprite::getNumberOfLayers() - 1; } -void Being::searchSlotValueItr(std::vector<int>::iterator &restrict it, +void Being::searchSlotValueItr(STD_VECTOR<int>::iterator &restrict it, int &restrict idx, - std::vector<int> &restrict slotRemap, + STD_VECTOR<int> &restrict slotRemap, const int val) { // logger->log("searching %d", val); it = slotRemap.begin(); - const std::vector<int>::iterator it_end = slotRemap.end(); + const STD_VECTOR<int>::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<Particle*>::const_iterator, itp, pi->particles) + FOR_EACH (STD_VECTOR<Particle*>::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<Particle*>::const_iterator, + FOR_EACH (STD_VECTOR<Particle*>::const_iterator, itp, pi->particles) { mChildParticleEffects.removeLocally(*itp); } - FOR_EACH (std::vector<std::string>::const_iterator, str, pi->files) + FOR_EACH (STD_VECTOR<std::string>::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<int, ParticleInfo*> SpriteParticleInfo; typedef SpriteParticleInfo::iterator SpriteParticleInfoIter; - std::vector<BeingSlot> mSlots; + STD_VECTOR<BeingSlot> mSlots; SpriteParticleInfo mSpriteParticles; // Character guild information @@ -1226,12 +1226,12 @@ class Being notfinal : public ActorSprite, template<signed char pos, signed char neg> int getOffset() const restrict2 A_WARN_UNUSED; - int searchSlotValue(const std::vector<int> &restrict slotRemap, + int searchSlotValue(const STD_VECTOR<int> &restrict slotRemap, const int val) const restrict2 A_WARN_UNUSED; - static void searchSlotValueItr(std::vector<int>::iterator &restrict it, + static void searchSlotValueItr(STD_VECTOR<int>::iterator &restrict it, int &idx, - std::vector<int> &restrict slotRemap, + STD_VECTOR<int> &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<AnimatedSprite*> mDownHorseSprites; - std::vector<AnimatedSprite*> mUpHorseSprites; - std::vector<Particle*> mSpiritParticles; + STD_VECTOR<AnimatedSprite*> mDownHorseSprites; + STD_VECTOR<AnimatedSprite*> mUpHorseSprites; + STD_VECTOR<Particle*> 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<Sprite*>::iterator SpriteIterator; - typedef std::vector<Sprite*>::const_iterator SpriteConstIterator; + typedef STD_VECTOR<Sprite*>::iterator SpriteIterator; + typedef STD_VECTOR<Sprite*>::const_iterator SpriteConstIterator; CompoundSprite(); @@ -107,7 +107,7 @@ class CompoundSprite notfinal : public Sprite int getStartTime() const noexcept2 A_WARN_UNUSED { return mStartTime; } - std::vector<Sprite*> mSprites; + STD_VECTOR<Sprite*> 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<int32_t> mStatusEffectIcons; + STD_VECTOR<int32_t> mStatusEffectIcons; typedef std::pair<std::string, UserColorIdT> 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<PlayerIgnoreStrategy *> *const strategies + const STD_VECTOR<PlayerIgnoreStrategy *> *const strategies = getPlayerIgnoreStrategies(); if (strategies == nullptr) @@ -576,7 +576,7 @@ class PIS_emote final : public PlayerIgnoreStrategy uint8_t mEmotion; }; -std::vector<PlayerIgnoreStrategy *> * +STD_VECTOR<PlayerIgnoreStrategy *> * 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<PlayerIgnoreStrategy *> *getPlayerIgnoreStrategies() + STD_VECTOR<PlayerIgnoreStrategy *> *getPlayerIgnoreStrategies() A_WARN_UNUSED; /** @@ -202,7 +202,7 @@ class PlayerRelationsManager final PlayerIgnoreStrategy *mIgnoreStrategy; std::map<std::string, PlayerRelation *> mRelations; std::list<PlayerRelationsListener *> mListeners; - std::vector<PlayerIgnoreStrategy *> mIgnoreStrategies; + STD_VECTOR<PlayerIgnoreStrategy *> 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<EffectDescription>::const_iterator, i, mEffects) + FOR_EACH (STD_VECTOR<EffectDescription>::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<EffectDescription>::const_iterator, i, mEffects) + FOR_EACH (STD_VECTOR<EffectDescription>::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<EffectDescription>::const_iterator, i, mEffects) + FOR_EACH (STD_VECTOR<EffectDescription>::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<EffectDescription> mEffects; + STD_VECTOR<EffectDescription> mEffects; std::list<ParticleTimer> 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<InputActionT> KeysVector; +typedef STD_VECTOR<InputActionT> 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<FsEntry*> mEntries; + STD_VECTOR<FsEntry*> mEntries; } // namespace void init(const std::string &restrict name) @@ -85,7 +85,7 @@ namespace VirtFs return FsDir::getUserDir(); } - std::vector<FsEntry*> &getEntries() + STD_VECTOR<FsEntry*> &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<FsEntry*>::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*>::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*>::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*>::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*>::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*>::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*>::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*>::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*>::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*>::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*>::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*>::iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*>::iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::iterator, it, mEntries) { FsEntry *const entry = *it; if (entry->root == oldDir && @@ -719,7 +719,7 @@ namespace VirtFs { subDir += dirSeparator; } - FOR_EACH (std::vector<FsEntry*>::iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*>::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*>::iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*>::const_iterator, it, mEntries) + FOR_EACH (STD_VECTOR<FsEntry*>::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<FsEntry*> &getEntries(); + STD_VECTOR<FsEntry*> &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<ZipLocalHeader*>::const_iterator, + FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator, it2, zipEntry->mHeaders) { @@ -112,7 +112,7 @@ namespace FsZip return true; } } - FOR_EACH (std::vector<std::string>::const_iterator, + FOR_EACH (STD_VECTOR<std::string>::const_iterator, it2, zipEntry->mDirs) { @@ -136,14 +136,14 @@ namespace FsZip filename = pathJoin(subDir, filename); dirName = pathJoin(subDir, dirName); } - FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator, + FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator, it2, zipEntry->mHeaders) { if ((*it2)->fileName == filename) return true; } - FOR_EACH (std::vector<std::string>::const_iterator, + FOR_EACH (STD_VECTOR<std::string>::const_iterator, it2, zipEntry->mDirs) { @@ -163,7 +163,7 @@ namespace FsZip dirName = pathJoin(subDir, dirName); if (dirName == dirSeparator) { - FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator, + FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator, it2, zipEntry->mHeaders) { @@ -188,7 +188,7 @@ namespace FsZip } else { - FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator, + FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator, it2, zipEntry->mHeaders) { @@ -226,7 +226,7 @@ namespace FsZip dirName = pathJoin(subDir, dirName); if (dirName == dirSeparator) { - FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator, + FOR_EACH (STD_VECTOR<ZipLocalHeader*>::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<std::string>::const_iterator, + FOR_EACH (STD_VECTOR<std::string>::const_iterator, it, zipEntry->mDirs) { @@ -267,7 +267,7 @@ namespace FsZip } else { - FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator, + FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator, it2, zipEntry->mHeaders) { @@ -296,7 +296,7 @@ namespace FsZip { dirName2 += dirSeparator; } - FOR_EACH (std::vector<std::string>::const_iterator, + FOR_EACH (STD_VECTOR<std::string>::const_iterator, it, zipEntry->mDirs) { @@ -327,7 +327,7 @@ namespace FsZip dirNameFull = dirName; if (dirNameFull == dirSeparator) { - FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator, + FOR_EACH (STD_VECTOR<ZipLocalHeader*>::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<std::string>::const_iterator, + FOR_EACH (STD_VECTOR<std::string>::const_iterator, it, zipEntry->mDirs) { @@ -368,7 +368,7 @@ namespace FsZip } else { - FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator, + FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator, it2, zipEntry->mHeaders) { @@ -397,7 +397,7 @@ namespace FsZip { dirName2 += dirSeparator; } - FOR_EACH (std::vector<std::string>::const_iterator, + FOR_EACH (STD_VECTOR<std::string>::const_iterator, it, zipEntry->mDirs) { @@ -425,7 +425,7 @@ namespace FsZip dirName = pathJoin(subDir, dirName); if (dirName == dirSeparator) { - FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator, + FOR_EACH (STD_VECTOR<ZipLocalHeader*>::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<std::string>::const_iterator, + FOR_EACH (STD_VECTOR<std::string>::const_iterator, it, zipEntry->mDirs) { @@ -466,7 +466,7 @@ namespace FsZip } else { - FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator, + FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator, it2, zipEntry->mHeaders) { @@ -495,7 +495,7 @@ namespace FsZip { dirName2 += dirSeparator; } - FOR_EACH (std::vector<std::string>::const_iterator, + FOR_EACH (STD_VECTOR<std::string>::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<std::string>::const_iterator, + FOR_EACH (STD_VECTOR<std::string>::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<ZipLocalHeader*>::const_iterator, + FOR_EACH (STD_VECTOR<ZipLocalHeader*>::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<ZipLocalHeader*>::const_iterator, + FOR_EACH (STD_VECTOR<ZipLocalHeader*>::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<ZipLocalHeader*> mHeaders; - std::vector<std::string> mDirs; + STD_VECTOR<ZipLocalHeader*> mHeaders; + STD_VECTOR<std::string> 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<ZipLocalHeader*> &restrict headers = entry->mHeaders; - std::vector<std::string> &restrict dirs = entry->mDirs; + STD_VECTOR<ZipLocalHeader*> &restrict headers = entry->mHeaders; + STD_VECTOR<std::string> &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<int> res; + STD_VECTOR<int> 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<int> sizes; + STD_VECTOR<int> 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<Widget*> WidgetVector; + typedef STD_VECTOR<Widget*> 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<Avatar*> *getMembers() RETURNS_NONNULL A_WARN_UNUSED + STD_VECTOR<Avatar*> *getMembers() RETURNS_NONNULL A_WARN_UNUSED { return &mMembers; } @@ -60,7 +60,7 @@ class BeingsListModel final : public AvatarListModel return CAST_S32(mMembers.size()); } - std::vector<Avatar*> mMembers; + STD_VECTOR<Avatar*> 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<ColorPair> mColors; + STD_VECTOR<ColorPair> 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<Image*>::iterator, it, mImages) + FOR_EACH (STD_VECTOR<Image*>::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<Image*> &getImages() A_WARN_UNUSED + STD_VECTOR<Image*> &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<Image*> mImages; + STD_VECTOR<Image*> 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<Widget *> mWidgets; + STD_VECTOR<Widget *> 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<VersionString> VersionStrings; + typedef STD_VECTOR<VersionString> 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<ShopItem*>::iterator &it, +bool ShopItems::findInAllItems(STD_VECTOR<ShopItem*>::iterator &it, const ShopItem *const item) { - const std::vector<ShopItem*>::iterator it_end = mAllShopItems.end(); + const STD_VECTOR<ShopItem*>::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<ShopItem*>::iterator it; + STD_VECTOR<ShopItem*>::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<ShopItem*>::iterator it; + STD_VECTOR<ShopItem*>::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<ShopItem*>::const_iterator it = mShopItems.begin(); - const std::vector<ShopItem*>::const_iterator e = mShopItems.end(); + STD_VECTOR<ShopItem*>::const_iterator it = mShopItems.begin(); + const STD_VECTOR<ShopItem*>::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<ShopItem*>::iterator, it, mAllShopItems) + FOR_EACH (STD_VECTOR<ShopItem*>::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<ShopItem*> &items() A_WARN_UNUSED + STD_VECTOR<ShopItem*> &items() A_WARN_UNUSED { return mShopItems; } - std::vector<ShopItem*> &allItems() A_WARN_UNUSED + STD_VECTOR<ShopItem*> &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<ShopItem*>::iterator &it, + bool findInAllItems(STD_VECTOR<ShopItem*>::iterator &it, const ShopItem *const item); /** The list of items in the shop. */ - std::vector<ShopItem*> mAllShopItems; + STD_VECTOR<ShopItem*> mAllShopItems; - std::vector<ShopItem*> mShopItems; + STD_VECTOR<ShopItem*> 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<Widget *> mTableModel; - std::vector<int> mWidths; + STD_VECTOR<Widget *> mTableModel; + STD_VECTOR<int> 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<SetupActionData*> data; + STD_VECTOR<SetupActionData*> 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<SetupActionData*>::iterator, it, data) + FOR_EACH (STD_VECTOR<SetupActionData*>::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<InputActionT> mActionId; + STD_VECTOR<InputActionT> mActionId; std::map<InputActionT, int> 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<HostsGroup>::const_iterator, + FOR_EACH(STD_VECTOR<HostsGroup>::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<ColorElem> Colors; + typedef STD_VECTOR<ColorElem> Colors; typedef std::map<unsigned char, int> CharColors; Colors mColors; CharColors mCharColors; - std::vector<ColorElem*> mGradVector; + STD_VECTOR<ColorElem*> 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<Label*>::iterator, it, mLabels) + FOR_EACH (STD_VECTOR<Label*>::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<Label*>::iterator, it, mLabels) + FOR_EACH (STD_VECTOR<Label*>::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<Label*>::iterator, it, mLabels) + FOR_EACH (STD_VECTOR<Label*>::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<Label*> mLabels; + STD_VECTOR<Label*> 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<ItemFieldType*> &fields = ItemOptionDb::getFields( + const STD_VECTOR<ItemFieldType*> &fields = ItemOptionDb::getFields( option.index); if (fields.empty()) continue; const std::string valueStr = toString(option.value); - FOR_EACH (std::vector<ItemFieldType*>::const_iterator, it, fields) + FOR_EACH (STD_VECTOR<ItemFieldType*>::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<BeingMenuItem> &menu = info->getMenu(); - FOR_EACH (std::vector<BeingMenuItem>::const_iterator, it, menu) + const STD_VECTOR<BeingMenuItem> &menu = info->getMenu(); + FOR_EACH (STD_VECTOR<BeingMenuItem>::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<ActorSprite*> &beings) + const STD_VECTOR<ActorSprite*> &beings) { mX = x; mY = y; mBrowserBox->clearRows(); // TRANSLATORS: popup menu header mBrowserBox->addRow(_("Players")); - FOR_EACH (std::vector<ActorSprite*>::const_iterator, it, beings) + FOR_EACH (STD_VECTOR<ActorSprite*>::const_iterator, it, beings) { const Being *const being = dynamic_cast<const Being*>(*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<Button *> names = windowMenu->getButtons(); - for (std::vector<Button *>::const_iterator it = names.begin(), + STD_VECTOR<Button *> names = windowMenu->getButtons(); + for (STD_VECTOR<Button *>::const_iterator it = names.begin(), it_end = names.end(); it != it_end; ++ it) { const Button *const btn = *it; @@ -1848,12 +1848,12 @@ void PopupMenu::showPopup(const int x, const int y, const ProgressBar *const b) mY = y; mBrowserBox->clearRows(); - std::vector <ProgressBar*> bars = miniStatusWindow->getBars(); + STD_VECTOR <ProgressBar*> bars = miniStatusWindow->getBars(); ProgressBar *onlyBar = nullptr; int cnt = 0; // search for alone visible bar - for (std::vector <ProgressBar*>::const_iterator it = bars.begin(), + for (STD_VECTOR <ProgressBar*>::const_iterator it = bars.begin(), it_end = bars.end(); it != it_end; ++it) { ProgressBar *const bar = *it; @@ -1869,7 +1869,7 @@ void PopupMenu::showPopup(const int x, const int y, const ProgressBar *const b) if (cnt > 1) onlyBar = nullptr; - for (std::vector <ProgressBar*>::const_iterator it = bars.begin(), + for (STD_VECTOR <ProgressBar*>::const_iterator it = bars.begin(), it_end = bars.end(); it != it_end; ++it) { ProgressBar *const bar = *it; @@ -2107,11 +2107,11 @@ void PopupMenu::showWindowsPopup() { setMousePos(); mBrowserBox->clearRows(); - const std::vector<ButtonText*> &names = windowMenu->getButtonTexts(); + const STD_VECTOR<ButtonText*> &names = windowMenu->getButtonTexts(); // TRANSLATORS: popup menu header mBrowserBox->addRow(_("Show window")); - FOR_EACH (std::vector<ButtonText*>::const_iterator, it, names) + FOR_EACH (STD_VECTOR<ButtonText*>::const_iterator, it, names) { const ButtonText *const btn = *it; if (btn == nullptr) diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h index 8c090d1f9..9816afb93 100644 --- a/src/gui/popups/popupmenu.h +++ b/src/gui/popups/popupmenu.h @@ -83,7 +83,7 @@ class PopupMenu final : public Popup, public LinkHandler * Shows the beings related popup menu at the specified mouse coords. */ void showPopup(const int x, const int y, - const std::vector<ActorSprite*> &beings); + const STD_VECTOR<ActorSprite*> &beings); void showPlayerPopup(const std::string &nick); diff --git a/src/gui/shortcut/spellshortcut.cpp b/src/gui/shortcut/spellshortcut.cpp index ef6815a2c..14eaa2f48 100644 --- a/src/gui/shortcut/spellshortcut.cpp +++ b/src/gui/shortcut/spellshortcut.cpp @@ -47,10 +47,10 @@ void SpellShortcut::load() if (spellManager == nullptr) return; - const std::vector<TextCommand*> &spells = spellManager->getAll(); + const STD_VECTOR<TextCommand*> &spells = spellManager->getAll(); unsigned k = 0; - for (std::vector<TextCommand*>::const_iterator i = spells.begin(), + for (STD_VECTOR<TextCommand*>::const_iterator i = spells.begin(), i_end = spells.end(); i != i_end && k < SPELLS_SIZE; ++i) { mItems[k++] = (*i)->getId(); diff --git a/src/gui/theme.h b/src/gui/theme.h index 9ef477452..8618468d9 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -200,7 +200,7 @@ class Theme final : public Palette, */ float mMinimumOpacity; - typedef std::vector<DyePalette*> ProgressColors; + typedef STD_VECTOR<DyePalette*> ProgressColors; ProgressColors mProgressColors; }; diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 1e9035cee..08d2bfb91 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -389,7 +389,7 @@ bool Viewport::openContextMenu(const MouseEvent &event) validateSpeed(); if (actorManager != nullptr) { - std::vector<ActorSprite*> beings; + STD_VECTOR<ActorSprite*> beings; const int x = mMouseX + mPixelViewX; const int y = mMouseY + mPixelViewY; actorManager->findBeingsByPixel(beings, x, y, AllPlayers_true); diff --git a/src/gui/widgets/basiccontainer.h b/src/gui/widgets/basiccontainer.h index ba2681bdc..9ab658a76 100644 --- a/src/gui/widgets/basiccontainer.h +++ b/src/gui/widgets/basiccontainer.h @@ -180,7 +180,7 @@ class BasicContainer notfinal : public Widget, /** * Typedef. */ - typedef std::vector<Widget *> WidgetList; + typedef STD_VECTOR<Widget *> WidgetList; /** * Typedef. diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index 04cff5aff..45502ba5a 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -167,12 +167,12 @@ class BrowserBox final : public Widget, TextRows mTextRows; std::list<int> mTextRowLinksCount; - typedef std::vector<LinePart> LinePartList; + typedef STD_VECTOR<LinePart> LinePartList; typedef LinePartList::iterator LinePartIterator; typedef LinePartList::const_iterator LinePartCIter; LinePartList mLineParts; - typedef std::vector<BrowserLink> Links; + typedef STD_VECTOR<BrowserLink> Links; typedef Links::iterator LinkIterator; Links mLinks; diff --git a/src/gui/widgets/characterviewnormal.cpp b/src/gui/widgets/characterviewnormal.cpp index 35032c4c9..c52616b85 100644 --- a/src/gui/widgets/characterviewnormal.cpp +++ b/src/gui/widgets/characterviewnormal.cpp @@ -34,7 +34,7 @@ namespace } // namespace CharacterViewNormal::CharacterViewNormal(CharSelectDialog *const widget, - std::vector<CharacterDisplay*> + STD_VECTOR<CharacterDisplay*> *const entries, const int padding) : CharacterViewBase(widget, padding), @@ -44,8 +44,8 @@ CharacterViewNormal::CharacterViewNormal(CharSelectDialog *const widget, addKeyListener(widget); if (entries != nullptr) { - FOR_EACHP (std::vector<CharacterDisplay*>::iterator, - it, entries) + FOR_EACHP (STD_VECTOR<CharacterDisplay*>::iterator, + it, entries) { CharacterDisplay *const character = *it; add(character); diff --git a/src/gui/widgets/characterviewnormal.h b/src/gui/widgets/characterviewnormal.h index 4a48a725b..344549092 100644 --- a/src/gui/widgets/characterviewnormal.h +++ b/src/gui/widgets/characterviewnormal.h @@ -29,7 +29,7 @@ class CharacterViewNormal final : public CharacterViewBase { public: CharacterViewNormal(CharSelectDialog *const widget, - std::vector<CharacterDisplay*> *const entries, + STD_VECTOR<CharacterDisplay*> *const entries, const int padding); A_DELETE_COPY(CharacterViewNormal) @@ -43,7 +43,7 @@ class CharacterViewNormal final : public CharacterViewBase void action(const ActionEvent &event A_UNUSED) override final A_CONST; private: - std::vector<CharacterDisplay*> *mCharacterEntries; + STD_VECTOR<CharacterDisplay*> *mCharacterEntries; int mRows; }; diff --git a/src/gui/widgets/characterviewsmall.cpp b/src/gui/widgets/characterviewsmall.cpp index 81580f9e1..a2fbdc8d4 100644 --- a/src/gui/widgets/characterviewsmall.cpp +++ b/src/gui/widgets/characterviewsmall.cpp @@ -30,7 +30,7 @@ #include "debug.h" CharacterViewSmall::CharacterViewSmall(CharSelectDialog *const widget, - std::vector<CharacterDisplay*> + STD_VECTOR<CharacterDisplay*> *const entries, const int padding) : CharacterViewBase(widget, padding), @@ -43,7 +43,7 @@ CharacterViewSmall::CharacterViewSmall(CharSelectDialog *const widget, addKeyListener(widget); if (entries != nullptr) { - FOR_EACHP (std::vector<CharacterDisplay*>::iterator, + FOR_EACHP (STD_VECTOR<CharacterDisplay*>::iterator, it, entries) { add(*it); @@ -106,8 +106,8 @@ void CharacterViewSmall::resize() const int h = mDimension.height; const int x = (w - firtChar->getWidth()) / 2; const int y = (h - firtChar->getHeight()) / 2; - FOR_EACHP (std::vector<CharacterDisplay*>::iterator, - it, mCharacterEntries) + FOR_EACHP (STD_VECTOR<CharacterDisplay*>::iterator, + it, mCharacterEntries) { (*it)->setPosition(x, y); } diff --git a/src/gui/widgets/characterviewsmall.h b/src/gui/widgets/characterviewsmall.h index a10978981..f363c608e 100644 --- a/src/gui/widgets/characterviewsmall.h +++ b/src/gui/widgets/characterviewsmall.h @@ -31,7 +31,7 @@ class CharacterViewSmall final : public CharacterViewBase { public: CharacterViewSmall(CharSelectDialog *const widget, - std::vector<CharacterDisplay*> *const entries, + STD_VECTOR<CharacterDisplay*> *const entries, const int padding); A_DELETE_COPY(CharacterViewSmall) @@ -48,7 +48,7 @@ class CharacterViewSmall final : public CharacterViewBase Button *mPrevious; Button *mNext; Label *mNumber; - std::vector<CharacterDisplay*> *mCharacterEntries; + STD_VECTOR<CharacterDisplay*> *mCharacterEntries; }; #endif // GUI_WIDGETS_CHARACTERVIEWSMALL_H diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp index afd165219..27721a86c 100644 --- a/src/gui/widgets/emotepage.cpp +++ b/src/gui/widgets/emotepage.cpp @@ -72,7 +72,7 @@ void EmotePage::draw(Graphics *const graphics) if (mEmotes == nullptr) return; - const std::vector<Image*> &images = mEmotes->getImages(); + const STD_VECTOR<Image*> &images = mEmotes->getImages(); const unsigned int width = mDimension.width; unsigned int x = 0; @@ -80,7 +80,7 @@ void EmotePage::draw(Graphics *const graphics) mRedraw = false; mVertexes->clear(); - FOR_EACH (std::vector<Image*>::const_iterator, it, images) + FOR_EACH (STD_VECTOR<Image*>::const_iterator, it, images) { const Image *const image = *it; if (image != nullptr) @@ -108,13 +108,13 @@ void EmotePage::safeDraw(Graphics *const graphics) if (mEmotes == nullptr) return; - const std::vector<Image*> &images = mEmotes->getImages(); + const STD_VECTOR<Image*> &images = mEmotes->getImages(); const unsigned int width = mDimension.width; unsigned int x = 0; unsigned int y = 0; - FOR_EACH (std::vector<Image*>::const_iterator, it, images) + FOR_EACH (STD_VECTOR<Image*>::const_iterator, it, images) { const Image *const image = *it; if (image != nullptr) diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h index 2916a0140..14895d7a0 100644 --- a/src/gui/widgets/emoteshortcutcontainer.h +++ b/src/gui/widgets/emoteshortcutcontainer.h @@ -83,7 +83,7 @@ class EmoteShortcutContainer final : public ShortcutContainer restrict2 override final; private: - std::vector<const EmoteSprite*> mEmoteImg; + STD_VECTOR<const EmoteSprite*> mEmoteImg; bool mEmoteClicked; unsigned char mEmoteMoved; diff --git a/src/gui/widgets/equipmentpage.h b/src/gui/widgets/equipmentpage.h index 33cbbf13f..f868478fb 100644 --- a/src/gui/widgets/equipmentpage.h +++ b/src/gui/widgets/equipmentpage.h @@ -42,7 +42,7 @@ struct EquipmentPage final A_DELETE_COPY(EquipmentPage) - std::vector<EquipmentBox*> boxes; + STD_VECTOR<EquipmentBox*> boxes; int x; int y; int width; diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp index ebbb07bf3..01967712c 100644 --- a/src/gui/widgets/extendedlistbox.cpp +++ b/src/gui/widgets/extendedlistbox.cpp @@ -84,7 +84,7 @@ void ExtendedListBox::draw(Graphics *const graphics) if (image != nullptr) strWidth += image->getWidth() + mImagePadding; - std::vector<ExtendedListBoxItem> &list = + STD_VECTOR<ExtendedListBoxItem> &list = row == mSelected ? mSelectedItems : mListItems; if (insideWidth < strWidth) diff --git a/src/gui/widgets/extendedlistbox.h b/src/gui/widgets/extendedlistbox.h index 380cf76fa..6d97ee6d3 100644 --- a/src/gui/widgets/extendedlistbox.h +++ b/src/gui/widgets/extendedlistbox.h @@ -54,8 +54,8 @@ class ExtendedListBox final : public ListBox int mImagePadding; int mSpacing; int mHeight; - std::vector<ExtendedListBoxItem> mListItems; - std::vector<ExtendedListBoxItem> mSelectedItems; + STD_VECTOR<ExtendedListBoxItem> mListItems; + STD_VECTOR<ExtendedListBoxItem> mSelectedItems; }; #endif // GUI_WIDGETS_EXTENDEDLISTBOX_H diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h index aa040f094..30eb73523 100644 --- a/src/gui/widgets/guitable.h +++ b/src/gui/widgets/guitable.h @@ -188,7 +188,7 @@ class GuiTable final : public Widget, Widget *mTopWidget; /** Vector for compactness; used as a list in practice. */ - std::vector<GuiTableActionListener *> mActionListeners2; + STD_VECTOR<GuiTableActionListener *> mActionListeners2; /** * Holds the background color of the table. diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 7193ce0f1..f53af32a6 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -1093,7 +1093,7 @@ void ItemContainer::updateMatrix() delete []mShowMatrix; mShowMatrix = new int[CAST_SIZE(mGridRows * mGridColumns)]; - std::vector<ItemIdPair*> sortedItems; + STD_VECTOR<ItemIdPair*> sortedItems; int i = 0; int j = 0; @@ -1156,7 +1156,7 @@ void ItemContainer::updateMatrix() int jMult = j * mGridColumns; const int maxSize = mGridRows * mGridColumns; - FOR_EACH (std::vector<ItemIdPair*>::const_iterator, iter, sortedItems) + FOR_EACH (STD_VECTOR<ItemIdPair*>::const_iterator, iter, sortedItems) { if (jMult >= maxSize) break; diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index 295e41d16..403573daf 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -138,7 +138,7 @@ void ItemLinkHandler::handleItemLink(const std::string &link) if (ch < '0' || ch > '9') return; - std::vector<int> str; + STD_VECTOR<int> str; splitToIntVector(str, link, ','); if (str.empty()) return; diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 3990137e0..1f50637e4 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -606,7 +606,7 @@ void ItemShortcutContainer::mouseMoved(MouseEvent &event) int offsetY = 0; if (!data.empty()) { - std::vector<int> vect; + STD_VECTOR<int> vect; splitToIntVector(vect, data, ' '); const size_t sz = vect.size(); if (sz > 0) diff --git a/src/gui/widgets/layoutarray.cpp b/src/gui/widgets/layoutarray.cpp index de9c8cd30..6269d8b5b 100644 --- a/src/gui/widgets/layoutarray.cpp +++ b/src/gui/widgets/layoutarray.cpp @@ -39,14 +39,14 @@ LayoutArray::LayoutArray() : LayoutArray::~LayoutArray() { - std::vector <std::vector <LayoutCell *> >::iterator + STD_VECTOR <STD_VECTOR <LayoutCell *> >::iterator i = mCells.begin(); - const std::vector <std::vector <LayoutCell *> >::iterator + const STD_VECTOR <STD_VECTOR <LayoutCell *> >::iterator i_end = mCells.end(); while (i != i_end) { - std::vector< LayoutCell * >::iterator j = i->begin(); - const std::vector< LayoutCell * >::iterator j_end = i->end(); + STD_VECTOR< LayoutCell * >::iterator j = i->begin(); + const STD_VECTOR< LayoutCell * >::iterator j_end = i->end(); while (j != j_end) { delete *j; @@ -85,9 +85,9 @@ void LayoutArray::resizeGrid(int w, const int h) if (extW) mSizes[0].resize(CAST_SIZE(w), LayoutType::DEF); - std::vector <std::vector <LayoutCell *> >::iterator + STD_VECTOR <STD_VECTOR <LayoutCell *> >::iterator i = mCells.begin(); - const std::vector <std::vector <LayoutCell *> >::iterator + const STD_VECTOR <STD_VECTOR <LayoutCell *> >::iterator i_end = mCells.end(); while (i != i_end) { @@ -111,7 +111,7 @@ void LayoutArray::setRowHeight(const int n, const int h) void LayoutArray::matchColWidth(const int n1, const int n2) { resizeGrid(std::max(n1, n2) + 1, 0); - const std::vector<int> widths = getSizes(0, LayoutType::DEF); + const STD_VECTOR<int> widths = getSizes(0, LayoutType::DEF); const int s = std::max(widths[CAST_SIZE(n1)], widths[CAST_SIZE(n2)]); mSizes[0][CAST_SIZE(n1)] = s; @@ -192,14 +192,14 @@ void LayoutArray::align(int &restrict pos, int &restrict size, const int dim, } } -std::vector<int> LayoutArray::getSizes(const int dim, int upp) const +STD_VECTOR<int> LayoutArray::getSizes(const int dim, int upp) const { if (dim < 0 || dim >= 2) return mSizes[1]; const int gridW = CAST_S32(mSizes[0].size()); const int gridH = CAST_S32(mSizes[1].size()); - std::vector<int> sizes = mSizes[dim]; + STD_VECTOR<int> sizes = mSizes[dim]; // Compute minimum sizes. for (int gridY = 0; gridY < gridH; ++gridY) @@ -266,7 +266,7 @@ std::vector<int> LayoutArray::getSizes(const int dim, int upp) const int LayoutArray::getSize(const int dim) const { - std::vector<int> sizes = getSizes(dim, LayoutType::DEF); + STD_VECTOR<int> sizes = getSizes(dim, LayoutType::DEF); int size = 0; const int nb = CAST_S32(sizes.size()); for (int i = 0; i < nb; ++i) @@ -284,8 +284,8 @@ void LayoutArray::reflow(const int nx, const int ny, const int gridW = CAST_S32(mSizes[0].size()); const int gridH = CAST_S32(mSizes[1].size()); - std::vector<int> widths = getSizes(0, nw); - std::vector<int> heights = getSizes(1, nh); + STD_VECTOR<int> widths = getSizes(0, nw); + STD_VECTOR<int> heights = getSizes(1, nh); const int szW = CAST_S32(widths.size()); const int szH = CAST_S32(heights.size()); diff --git a/src/gui/widgets/layoutarray.h b/src/gui/widgets/layoutarray.h index 2a35635dc..cca05e091 100644 --- a/src/gui/widgets/layoutarray.h +++ b/src/gui/widgets/layoutarray.h @@ -111,15 +111,15 @@ class LayoutArray final * Gets the column/row sizes along a given axis. * @param upp target size for the array. Ignored if AUTO_DEF. */ - std::vector<int> getSizes(const int dim, int upp) const A_WARN_UNUSED; + STD_VECTOR<int> getSizes(const int dim, int upp) const A_WARN_UNUSED; /** * Gets the total size along a given axis. */ int getSize(const int dim) const A_WARN_UNUSED; - std::vector<int> mSizes[2]; - std::vector< std::vector < LayoutCell * > > mCells; + STD_VECTOR<int> mSizes[2]; + STD_VECTOR< STD_VECTOR < LayoutCell * > > mCells; int mSpacing; }; diff --git a/src/gui/widgets/layoutcell.cpp b/src/gui/widgets/layoutcell.cpp index b898b1dfc..7db5d0783 100644 --- a/src/gui/widgets/layoutcell.cpp +++ b/src/gui/widgets/layoutcell.cpp @@ -80,13 +80,13 @@ void LayoutCell::computeSizes() if (mType != ARRAY) return; - std::vector <std::vector <LayoutCell *> >::const_iterator + STD_VECTOR <STD_VECTOR <LayoutCell *> >::const_iterator i = mArray->mCells.begin(); - const std::vector <std::vector <LayoutCell *> >::const_iterator + const STD_VECTOR <STD_VECTOR <LayoutCell *> >::const_iterator i_end = mArray->mCells.end(); while (i != i_end) { - std::vector <LayoutCell *>::const_iterator j = i->begin(); + STD_VECTOR <LayoutCell *>::const_iterator j = i->begin(); while (j != i->end()) { LayoutCell *const cell = *j; diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index 4ad4ea3cf..a60c970c9 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -403,7 +403,7 @@ class SetupItemSlider final : public SetupItem OnTheFly mOnTheFly; }; -typedef std::vector<std::string> SetupItemNames; +typedef STD_VECTOR<std::string> SetupItemNames; typedef SetupItemNames::iterator SetupItemNamesIter; typedef SetupItemNames::const_iterator SetupItemNamesConstIter; diff --git a/src/gui/widgets/staticbrowserbox.h b/src/gui/widgets/staticbrowserbox.h index 7698ec5ff..93d05049f 100644 --- a/src/gui/widgets/staticbrowserbox.h +++ b/src/gui/widgets/staticbrowserbox.h @@ -152,12 +152,12 @@ class StaticBrowserBox final : public Widget, TextRows mTextRows; std::list<int> mTextRowLinksCount; - typedef std::vector<LinePart> LinePartList; + typedef STD_VECTOR<LinePart> LinePartList; typedef LinePartList::iterator LinePartIterator; typedef LinePartList::const_iterator LinePartCIter; LinePartList mLineParts; - typedef std::vector<BrowserLink> Links; + typedef STD_VECTOR<BrowserLink> Links; typedef Links::iterator LinkIterator; Links mLinks; diff --git a/src/gui/widgets/statspage.cpp b/src/gui/widgets/statspage.cpp index 65d322c05..5fa58f2e5 100644 --- a/src/gui/widgets/statspage.cpp +++ b/src/gui/widgets/statspage.cpp @@ -50,8 +50,8 @@ StatsPage::StatsPage(const Widget2 *const widget, mAttrCont->setSelectable(false); add(mAttrScroll); - const std::vector<BasicStat> &basicStats = StatDb::getStats(page); - FOR_EACH (std::vector<BasicStat>::const_iterator, it, basicStats) + const STD_VECTOR<BasicStat> &basicStats = StatDb::getStats(page); + FOR_EACH (STD_VECTOR<BasicStat>::const_iterator, it, basicStats) { const BasicStat &stat = *it; AttrDisplay *disp = new DerDisplay(this, diff --git a/src/gui/widgets/statspagebasic.cpp b/src/gui/widgets/statspagebasic.cpp index 2996e5f12..ec00026d4 100644 --- a/src/gui/widgets/statspagebasic.cpp +++ b/src/gui/widgets/statspagebasic.cpp @@ -54,8 +54,8 @@ StatsPageBasic::StatsPageBasic(const Widget2 *const widget) : mAttrCont->setSelectable(false); add(mAttrScroll); - const std::vector<BasicStat> &basicStats = StatDb::getBasicStats(); - FOR_EACH (std::vector<BasicStat>::const_iterator, it, basicStats) + const STD_VECTOR<BasicStat> &basicStats = StatDb::getBasicStats(); + FOR_EACH (STD_VECTOR<BasicStat>::const_iterator, it, basicStats) { const BasicStat &stat = *it; AttrDisplay *disp = new ChangeDisplay(this, diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index f63772907..ced56cea0 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -337,7 +337,7 @@ void TabbedArea::removeTab(Tab *const tab) } } - for (std::vector<Tab*>::iterator iter2 = mTabsToDelete.begin(); + for (STD_VECTOR<Tab*>::iterator iter2 = mTabsToDelete.begin(); iter2 != mTabsToDelete.end(); ++iter2) { if (*iter2 == tab) diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 4e609970d..c971da391 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -244,7 +244,7 @@ class TabbedArea final : public ActionListener, { return mWidgetContainer; } private: - typedef std::vector <std::pair<Tab*, Widget*> > TabContainer; + typedef STD_VECTOR <std::pair<Tab*, Widget*> > TabContainer; /** The tab arrows */ Button *mArrowButton[2] A_NONNULLPOINTER; @@ -261,7 +261,7 @@ class TabbedArea final : public ActionListener, Tab* mSelectedTab; BasicContainer2* mTabContainer A_NONNULLPOINTER; BasicContainer2* mWidgetContainer A_NONNULLPOINTER; - std::vector<Tab*> mTabsToDelete; + STD_VECTOR<Tab*> mTabsToDelete; TabContainer mTabs; /** 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;\ diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h index fefd862a0..6ce28ed4b 100644 --- a/src/gui/widgets/textbox.h +++ b/src/gui/widgets/textbox.h @@ -301,7 +301,7 @@ class TextBox final : public Widget, /** * Holds all the rows of the text. */ - std::vector<std::string> mTextRows; + STD_VECTOR<std::string> mTextRows; /** * Holds the current column of the caret. diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp index 714daae23..53e082501 100644 --- a/src/gui/widgets/vertcontainer.cpp +++ b/src/gui/widgets/vertcontainer.cpp @@ -84,6 +84,6 @@ void VertContainer::clear() void VertContainer::widgetResized(const Event &event A_UNUSED) { - FOR_EACH (std::vector<Widget*>::const_iterator, it, mResizableWidgets) + FOR_EACH (STD_VECTOR<Widget*>::const_iterator, it, mResizableWidgets) (*it)->setWidth(getWidth()); } diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h index 41b3ed217..c0dd118cf 100644 --- a/src/gui/widgets/vertcontainer.h +++ b/src/gui/widgets/vertcontainer.h @@ -54,7 +54,7 @@ class VertContainer final : public Container, void widgetResized(const Event &event) override final; private: - std::vector<Widget*> mResizableWidgets; + STD_VECTOR<Widget*> mResizableWidgets; int mVerticalItemSize; int mCount; int mNextY; diff --git a/src/gui/widgets/windowcontainer.h b/src/gui/widgets/windowcontainer.h index 5947994ab..98a62ac28 100644 --- a/src/gui/widgets/windowcontainer.h +++ b/src/gui/widgets/windowcontainer.h @@ -64,7 +64,7 @@ class WindowContainer notfinal : public Container /** * List of widgets that are scheduled to be deleted. */ - typedef std::vector<Widget*> Widgets; + typedef STD_VECTOR<Widget*> Widgets; typedef Widgets::iterator WidgetIterator; Widgets mDeathList; }; diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 73a40531a..477aa719d 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -222,7 +222,7 @@ WindowMenu::~WindowMenu() delete (*it).second; } mButtonNames.clear(); - FOR_EACH (std::vector <Button*>::iterator, it, mButtons) + FOR_EACH (STD_VECTOR <Button*>::iterator, it, mButtons) { Button *const btn = *it; if (btn == nullptr) @@ -362,10 +362,10 @@ void WindowMenu::updateButtons() { int x = mPadding; int h = 0; - FOR_EACH (std::vector <Button*>::const_iterator, it, mButtons) + FOR_EACH (STD_VECTOR <Button*>::const_iterator, it, mButtons) safeRemove(*it); const int pad2 = 2 * mPadding; - FOR_EACH (std::vector <Button*>::iterator, it, mButtons) + FOR_EACH (STD_VECTOR <Button*>::iterator, it, mButtons) { Button *const btn = *it; if (btn == nullptr) @@ -439,7 +439,7 @@ void WindowMenu::loadButtons() void WindowMenu::saveButtons() const { int i = 0; - FOR_EACH (std::vector <Button*>::const_iterator, it, mButtons) + FOR_EACH (STD_VECTOR <Button*>::const_iterator, it, mButtons) { const Button *const btn = *it; if ((btn != nullptr) && btn->mVisible == Visible_false) diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h index 106c33e25..780fe29ea 100644 --- a/src/gui/windowmenu.h +++ b/src/gui/windowmenu.h @@ -68,10 +68,10 @@ class WindowMenu final : public Container, std::map <std::string, ButtonInfo*> &getButtonNames() A_WARN_UNUSED { return mButtonNames; } - std::vector <Button*> &getButtons() A_WARN_UNUSED + STD_VECTOR <Button*> &getButtons() A_WARN_UNUSED { return mButtons; } - std::vector <ButtonText*> &getButtonTexts() A_WARN_UNUSED + STD_VECTOR <ButtonText*> &getButtonTexts() A_WARN_UNUSED { return mButtonTexts; } void showButton(const std::string &name, const Visible visible); @@ -105,8 +105,8 @@ class WindowMenu final : public Container, Skin *mSkin; int mPadding; int mSpacing; - std::vector <Button*> mButtons; - std::vector <ButtonText*> mButtonTexts; + STD_VECTOR <Button*> mButtons; + STD_VECTOR <ButtonText*> mButtonTexts; std::map <std::string, ButtonInfo*> mButtonNames; bool mHaveMouse; int mAutoHide; diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index b2249f66c..fe980dd33 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -462,7 +462,7 @@ void BuyDialog::sort() { if ((mSortDropDown != nullptr) && (mShopItems != nullptr)) { - std::vector<ShopItem*> &items = mShopItems->items(); + STD_VECTOR<ShopItem*> &items = mShopItems->items(); switch (mSortDropDown->getSelected()) { case 1: @@ -646,7 +646,7 @@ void BuyDialog::action(const ActionEvent &event) } else if (eventId == "confirm") { - std::vector<ShopItem*> &items = mShopItems->allItems(); + STD_VECTOR<ShopItem*> &items = mShopItems->allItems(); if (mNpcId == fromInt(Market, BeingId)) { @@ -773,10 +773,10 @@ void BuyDialog::closeAll() void BuyDialog::applyNameFilter(const std::string &filter) { - std::vector<ShopItem*> &items = mShopItems->allItems(); + STD_VECTOR<ShopItem*> &items = mShopItems->allItems(); std::string filterStr = filter; toLower(filterStr); - FOR_EACH (std::vector<ShopItem*>::iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::iterator, it, items) { ShopItem *const item = *it; if (item == nullptr) diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 4d4e7b35b..9037ac614 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -149,9 +149,9 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, setContentSize(w, h); mPlayer->setGender(Gender::MALE); - const std::vector<BeingSlot> &items = CharDB::getDefaultItems(); + const STD_VECTOR<BeingSlot> &items = CharDB::getDefaultItems(); int i = 1; - for (std::vector<BeingSlot>::const_iterator it = items.begin(), + for (STD_VECTOR<BeingSlot>::const_iterator it = items.begin(), it_fend = items.end(); it != it_fend; ++ it, i ++) @@ -443,7 +443,7 @@ void CharCreateDialog::action(const ActionEvent &event) // Attempt to create the character mCreateButton->setEnabled(false); - std::vector<int> atts; + STD_VECTOR<int> atts; const size_t sz = mAttributeSlider.size(); for (size_t i = 0; i < sz; i++) { diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h index 6775adc9f..5c4fdfcc3 100644 --- a/src/gui/windows/charcreatedialog.h +++ b/src/gui/windows/charcreatedialog.h @@ -127,9 +127,9 @@ class CharCreateDialog final : public Window, Button *mActionButton; Button *mRotateButton; - std::vector<Slider*> mAttributeSlider; - std::vector<Label*> mAttributeLabel; - std::vector<Label*> mAttributeValue; + STD_VECTOR<Slider*> mAttributeSlider; + STD_VECTOR<Label*> mAttributeLabel; + STD_VECTOR<Label*> mAttributeValue; Label *mAttributesLeft; Button *mCreateButton; diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 00fafdf1f..c44464de1 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -491,7 +491,7 @@ void CharSelectDialog::attemptCharacterSelect(const int index) void CharSelectDialog::setCharacters(const Net::Characters &characters) { // Reset previous characters - FOR_EACH (std::vector<CharacterDisplay*>::const_iterator, + FOR_EACH (STD_VECTOR<CharacterDisplay*>::const_iterator, iter, mCharacterEntries) { if (*iter != nullptr) diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h index 23d0d22cd..9cf56bfd6 100644 --- a/src/gui/windows/charselectdialog.h +++ b/src/gui/windows/charselectdialog.h @@ -124,7 +124,7 @@ class CharSelectDialog final : public Window, Button *mRenameButton; CharacterViewBase *mCharacterView; - std::vector<CharacterDisplay*> mCharacterEntries; + STD_VECTOR<CharacterDisplay*> mCharacterEntries; Net::CharServerHandler *mCharServerHandler; TextDialog *mDeleteDialog; diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp index 981fb0b11..e82d9986f 100644 --- a/src/gui/windows/emotewindow.cpp +++ b/src/gui/windows/emotewindow.cpp @@ -169,7 +169,7 @@ void EmoteWindow::show() if (dictionary != nullptr) { mTextModel->clear(); - const std::vector<std::string> &texts = TextDb::getTexts(); + const STD_VECTOR<std::string> &texts = TextDb::getTexts(); FOR_EACH (StringVectCIter, it, texts) { mTextModel->add(dictionary->getStr(*it)); diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index 1a95f4eee..a859ef02b 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -159,9 +159,9 @@ EquipmentWindow::~EquipmentWindow() delete mEquipment->getBackend(); delete2(mEquipment) } - FOR_EACH (std::vector<EquipmentPage*>::iterator, it, mPages) + FOR_EACH (STD_VECTOR<EquipmentPage*>::iterator, it, mPages) { - std::vector<EquipmentBox*> &boxes = (*it)->boxes; + STD_VECTOR<EquipmentBox*> &boxes = (*it)->boxes; delete_all(boxes); boxes.clear(); delete *it; @@ -187,12 +187,12 @@ void EquipmentWindow::draw(Graphics *const graphics) int i = 0; Font *const font = getFont(); const int fontHeight = font->getHeight(); - const std::vector<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes; + const STD_VECTOR<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes; if (mLastRedraw) { mVertexes->clear(); - FOR_EACH (std::vector<EquipmentBox*>::const_iterator, it, boxes) + FOR_EACH (STD_VECTOR<EquipmentBox*>::const_iterator, it, boxes) { const EquipmentBox *const box = *it; if (box == nullptr) @@ -226,7 +226,7 @@ void EquipmentWindow::draw(Graphics *const graphics) i = 0; const int projSlot = inventoryHandler->getProjectileSlot(); - for (std::vector<EquipmentBox*>::const_iterator it = boxes.begin(), + for (STD_VECTOR<EquipmentBox*>::const_iterator it = boxes.begin(), it_end = boxes.end(); it != it_end; ++ it, ++ i) { const EquipmentBox *const box = *it; @@ -274,9 +274,9 @@ void EquipmentWindow::safeDraw(Graphics *const graphics) int i = 0; Font *const font = getFont(); const int fontHeight = font->getHeight(); - const std::vector<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes; + const STD_VECTOR<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes; - for (std::vector<EquipmentBox*>::const_iterator it = boxes.begin(), + for (STD_VECTOR<EquipmentBox*>::const_iterator it = boxes.begin(), it_end = boxes.end(); it != it_end; ++ it, ++ i) { const EquipmentBox *const box = *it; @@ -301,7 +301,7 @@ void EquipmentWindow::safeDraw(Graphics *const graphics) i = 0; const int projSlot = inventoryHandler->getProjectileSlot(); - for (std::vector<EquipmentBox*>::const_iterator it = boxes.begin(), + for (STD_VECTOR<EquipmentBox*>::const_iterator it = boxes.begin(), it_end = boxes.end(); it != it_end; ++ it, ++ i) { const EquipmentBox *const box = *it; @@ -408,8 +408,8 @@ const Item *EquipmentWindow::getItem(const int x, const int y) const int i = 0; - std::vector<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes; - for (std::vector<EquipmentBox*>::const_iterator it = boxes.begin(), + STD_VECTOR<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes; + for (STD_VECTOR<EquipmentBox*>::const_iterator it = boxes.begin(), it_end = boxes.end(); it != it_end; ++ it, ++ i) { const EquipmentBox *const box = *it; @@ -446,8 +446,8 @@ void EquipmentWindow::mousePressed(MouseEvent& event) bool inBox(false); - std::vector<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes; - for (std::vector<EquipmentBox*>::const_iterator it = boxes.begin(), + STD_VECTOR<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes; + for (STD_VECTOR<EquipmentBox*>::const_iterator it = boxes.begin(), it_end = boxes.end(); it != it_end; ++ it, ++ i) { const EquipmentBox *const box = *it; @@ -535,8 +535,8 @@ void EquipmentWindow::mouseReleased(MouseEvent &event) { const int x = event.getX(); const int y = event.getY(); - std::vector<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes; - for (std::vector<EquipmentBox*>::const_iterator + STD_VECTOR<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes; + for (STD_VECTOR<EquipmentBox*>::const_iterator it = boxes.begin(), it_end = boxes.end(); it != it_end; ++ it) { @@ -712,7 +712,7 @@ void EquipmentWindow::loadSlot(XmlNodeConstPtr slotNode, if (imageIndex >= 0 && imageIndex < CAST_S32(imageset->size())) image = imageset->get(imageIndex); - std::vector<EquipmentBox*> &boxes = mPages[page]->boxes; + STD_VECTOR<EquipmentBox*> &boxes = mPages[page]->boxes; if (boxes[slot] != nullptr) { EquipmentBox *const box = boxes[slot]; @@ -811,7 +811,7 @@ void EquipmentWindow::addBox(const int idx, int x, int y, const int imageIndex) x += getPadding(); y += getTitleBarHeight() + mYPadding; - std::vector<EquipmentBox*> &boxes = mPages[0]->boxes; + STD_VECTOR<EquipmentBox*> &boxes = mPages[0]->boxes; boxes[idx] = new EquipmentBox(x, y, image); if (x < mMinX) @@ -837,7 +837,7 @@ int EquipmentWindow::addPage(const std::string &name) { EquipmentPage *const page = new EquipmentPage; mPages.push_back(page); - std::vector<EquipmentBox*> &boxes = page->boxes; + STD_VECTOR<EquipmentBox*> &boxes = page->boxes; boxes.reserve(BOX_COUNT); for (int f = 0; f < BOX_COUNT; f ++) diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h index 9bd9dd26f..b36174095 100644 --- a/src/gui/windows/equipmentwindow.h +++ b/src/gui/windows/equipmentwindow.h @@ -141,7 +141,7 @@ class EquipmentWindow final : public Window, Image *mSlotBackground; Image *mSlotHighlightedBackground; ImageCollection *mVertexes A_NONNULLPOINTER; - std::vector<EquipmentPage*> mPages; + STD_VECTOR<EquipmentPage*> mPages; TabStrip *mTabs; Color mHighlightColor; Color mBorderColor; diff --git a/src/gui/windows/mailwindow.cpp b/src/gui/windows/mailwindow.cpp index 52f91af06..063f1a29f 100644 --- a/src/gui/windows/mailwindow.cpp +++ b/src/gui/windows/mailwindow.cpp @@ -182,7 +182,7 @@ void MailWindow::removeMail(const int id) mMailModel->clear(); - FOR_EACH (std::vector<MailMessage*>::iterator, it, mMessages) + FOR_EACH (STD_VECTOR<MailMessage*>::iterator, it, mMessages) { MailMessage *message = *it; if ((message != nullptr) && message->id == id) @@ -193,7 +193,7 @@ void MailWindow::removeMail(const int id) } } - FOR_EACH (std::vector<MailMessage*>::iterator, it, mMessages) + FOR_EACH (STD_VECTOR<MailMessage*>::iterator, it, mMessages) { MailMessage *message = *it; if (message != nullptr) @@ -223,7 +223,7 @@ void MailWindow::showMessage(MailMessage *const mail) void MailWindow::viewNext(const int id) { - FOR_EACH (std::vector<MailMessage*>::iterator, it, mMessages) + FOR_EACH (STD_VECTOR<MailMessage*>::iterator, it, mMessages) { MailMessage *message = *it; if ((message != nullptr) && message->id == id) @@ -247,7 +247,7 @@ void MailWindow::viewNext(const int id) void MailWindow::viewPrev(const int id) { - FOR_EACH (std::vector<MailMessage*>::iterator, it, mMessages) + FOR_EACH (STD_VECTOR<MailMessage*>::iterator, it, mMessages) { MailMessage *message = *it; if ((message != nullptr) && message->id == id) diff --git a/src/gui/windows/mailwindow.h b/src/gui/windows/mailwindow.h index eee7e26bd..40be426d6 100644 --- a/src/gui/windows/mailwindow.h +++ b/src/gui/windows/mailwindow.h @@ -68,7 +68,7 @@ class MailWindow final : public Window, void createMail(const std::string &to); private: - std::vector<MailMessage*> mMessages; + STD_VECTOR<MailMessage*> mMessages; std::map<int, MailMessage*> mMessagesMap; ExtendedNamesModel *mMailModel; ExtendedListBox *mListBox; diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index ec27469ad..ba92a0739 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -55,7 +55,7 @@ MiniStatusWindow *miniStatusWindow = nullptr; extern volatile int tick_time; -typedef std::vector <ProgressBar*>::const_iterator ProgressBarVectorCIter; +typedef STD_VECTOR <ProgressBar*>::const_iterator ProgressBarVectorCIter; MiniStatusWindow::MiniStatusWindow() : Window("MiniStatus", Modal_false, nullptr, "ministatus.xml"), diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h index 83d7052ae..4221673a8 100644 --- a/src/gui/windows/ministatuswindow.h +++ b/src/gui/windows/ministatuswindow.h @@ -85,7 +85,7 @@ class MiniStatusWindow final : public Window, void slotsChanged(const Inventory *const inventory) override final; - std::vector <ProgressBar*> &getBars() A_WARN_UNUSED + STD_VECTOR <ProgressBar*> &getBars() A_WARN_UNUSED { return mBars; } Rect getChildrenArea() override final A_WARN_UNUSED; @@ -122,9 +122,9 @@ class MiniStatusWindow final : public Window, void saveBars() const; - std::vector <ProgressBar*> mBars; + STD_VECTOR <ProgressBar*> mBars; std::map <std::string, ProgressBar*> mBarNames; - std::vector<AnimatedSprite *> mIcons; + STD_VECTOR<AnimatedSprite *> mIcons; /* * Mini Status Bars diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 25c1899a0..fb38dcc72 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -92,7 +92,7 @@ NpcDialog::DialogList NpcDialog::instances; NpcDialogs NpcDialog::mNpcDialogs; -typedef std::vector<Image *>::iterator ImageVectorIter; +typedef STD_VECTOR<Image *>::iterator ImageVectorIter; NpcDialog::NpcDialog(const BeingId npcId) : // TRANSLATORS: npc dialog name @@ -1275,7 +1275,7 @@ void NpcDialog::createSkinControls() if (mDialogInfo == nullptr) return; - FOR_EACH (std::vector<NpcImageInfo*>::const_iterator, + FOR_EACH (STD_VECTOR<NpcImageInfo*>::const_iterator, it, mDialogInfo->menu.images) { @@ -1288,7 +1288,7 @@ void NpcDialog::createSkinControls() mSkinContainer->add(icon); } } - FOR_EACH (std::vector<NpcTextInfo*>::const_iterator, + FOR_EACH (STD_VECTOR<NpcTextInfo*>::const_iterator, it, mDialogInfo->menu.texts) { @@ -1314,7 +1314,7 @@ void NpcDialog::createSkinControls() box->addRow(*it2); } } - FOR_EACH (std::vector<NpcButtonInfo*>::const_iterator, + FOR_EACH (STD_VECTOR<NpcButtonInfo*>::const_iterator, it, mDialogInfo->menu.buttons) { @@ -1347,7 +1347,7 @@ std::string NpcDialog::complexItemToStr(const ComplexItem *const item) std::string str; if (item != nullptr) { - const std::vector<Item*> &items = item->getChilds(); + const STD_VECTOR<Item*> &items = item->getChilds(); const size_t sz = items.size(); if (sz == 0u) return str; diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h index 8e041b087..4680d774d 100644 --- a/src/gui/windows/npcdialog.h +++ b/src/gui/windows/npcdialog.h @@ -279,7 +279,7 @@ class NpcDialog final : public Window, // Used for choice input StringVect mItems; - std::vector<Image *> mImages; + STD_VECTOR<Image *> mImages; ExtendedListBox *mItemList A_NONNULLPOINTER; ScrollArea *mListScrollArea A_NONNULLPOINTER; Container *mSkinContainer A_NONNULLPOINTER; @@ -308,7 +308,7 @@ class NpcDialog final : public Window, NpcInputStateT mInputState; NpcActionStateT mActionState; - std::vector<Widget*> mSkinControls; + STD_VECTOR<Widget*> mSkinControls; std::string mSkinName; PlayerBox *mPlayerBox A_NONNULLPOINTER; Being *mAvatarBeing; diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index 51254e9a0..5a5608d4e 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -148,7 +148,7 @@ void OutfitWindow::load() std::string buf; std::stringstream ss(outfit); - std::vector<int> tokens; + STD_VECTOR<int> tokens; while (ss >> buf) tokens.push_back(atoi(buf.c_str())); @@ -164,7 +164,7 @@ void OutfitWindow::load() tokens.clear(); - std::vector<unsigned char> tokens2; + STD_VECTOR<unsigned char> tokens2; while (ss2 >> buf) tokens2.push_back(CAST_U8(atoi(buf.c_str()))); @@ -734,7 +734,7 @@ std::string OutfitWindow::getOutfitString() const continue; const ItemColor color = mItemColors[mCurrentOutfit][i]; - std::vector<int> ids; + STD_VECTOR<int> ids; ids.push_back(id); ids.push_back(CAST_S32(color)); diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index af9f19369..1eb2da841 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -187,10 +187,10 @@ void QuestsWindow::rebuild(const bool playSound) mQuestLinks.clear(); mQuestReverseLinks.clear(); StringVect &names = mQuestsModel->getNames(); - std::vector<Image*> &images = mQuestsModel->getImages(); - std::vector<QuestItem*> complete; - std::vector<QuestItem*> incomplete; - std::vector<QuestItem*> hidden; + STD_VECTOR<Image*> &images = mQuestsModel->getImages(); + STD_VECTOR<QuestItem*> complete; + STD_VECTOR<QuestItem*> incomplete; + STD_VECTOR<QuestItem*> hidden; int updatedQuest = -1; int newCompleteStatus = -1; @@ -198,8 +198,8 @@ void QuestsWindow::rebuild(const bool playSound) { const int var = (*it).first; const QuestVar &val = (*it).second; - const std::vector<QuestItem*> &quests = (*mQuests)[var]; - FOR_EACH (std::vector<QuestItem*>::const_iterator, it2, quests) + const STD_VECTOR<QuestItem*> &quests = (*mQuests)[var]; + FOR_EACH (STD_VECTOR<QuestItem*>::const_iterator, it2, quests) { if (*it2 == nullptr) continue; @@ -225,7 +225,7 @@ void QuestsWindow::rebuild(const bool playSound) int k = 0; - for (std::vector<QuestItem*>::const_iterator it = complete.begin(), + for (STD_VECTOR<QuestItem*>::const_iterator it = complete.begin(), it_end = complete.end(); it != it_end; ++ it, k ++) { QuestItem *const quest = *it; @@ -250,7 +250,7 @@ void QuestsWindow::rebuild(const bool playSound) } } - for (std::vector<QuestItem*>::const_iterator it = incomplete.begin(), + for (STD_VECTOR<QuestItem*>::const_iterator it = incomplete.begin(), it_end = incomplete.end(); it != it_end; ++ it, k ++) { QuestItem *const quest = *it; @@ -274,7 +274,7 @@ void QuestsWindow::rebuild(const bool playSound) } } - FOR_EACH (std::vector<QuestItem*>::const_iterator, it, hidden) + FOR_EACH (STD_VECTOR<QuestItem*>::const_iterator, it, hidden) (*it)->completeFlag = -1; if (updatedQuest == -1 || updatedQuest >= CAST_S32( @@ -310,14 +310,14 @@ void QuestsWindow::showQuest(const QuestItem *const quest) if (quest == nullptr) return; - const std::vector<QuestItemText> &texts = quest->texts; + const STD_VECTOR<QuestItemText> &texts = quest->texts; const QuestVar &var = (*mVars)[quest->var]; const std::string var1 = toString(var.var1); const std::string var2 = toString(var.var2); const std::string var3 = toString(var.var3); const std::string timeStr = timeDiffToString(var.time1); mText->clearRows(); - FOR_EACH (std::vector<QuestItemText>::const_iterator, it, texts) + FOR_EACH (STD_VECTOR<QuestItemText>::const_iterator, it, texts) { const QuestItemText &data = *it; std::string text = data.text; @@ -379,7 +379,7 @@ void QuestsWindow::setMap(const Map *const map) return; const std::string name = mMap->getProperty("shortName"); - FOR_EACHP (std::vector<QuestEffect*>::const_iterator, it, mAllEffects) + FOR_EACHP (STD_VECTOR<QuestEffect*>::const_iterator, it, mAllEffects) { const QuestEffect *const effect = *it; if ((effect != nullptr) && name == effect->map) @@ -394,7 +394,7 @@ void QuestsWindow::updateEffects() NpcQuestEffectMap oldNpc = mNpcEffects; mNpcEffects.clear(); - FOR_EACH (std::vector<const QuestEffect*>::const_iterator, + FOR_EACH (STD_VECTOR<const QuestEffect*>::const_iterator, it, mMapEffects) { const QuestEffect *const effect = *it; diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h index b5be44d12..680ae6271 100644 --- a/src/gui/windows/questswindow.h +++ b/src/gui/windows/questswindow.h @@ -86,14 +86,14 @@ class QuestsWindow final : public Window, Button *mCloseButton A_NONNULLPOINTER; Image *mCompleteIcon; Image *mIncompleteIcon; - std::vector<const QuestEffect*> mMapEffects; + STD_VECTOR<const QuestEffect*> mMapEffects; NpcQuestVarMap *mVars; - std::map<int, std::vector<QuestItem*> > *mQuests; - std::vector<QuestEffect*> *mAllEffects; + std::map<int, STD_VECTOR<QuestItem*> > *mQuests; + STD_VECTOR<QuestEffect*> *mAllEffects; // npc effects for current map and values: npc, effect NpcQuestEffectMap mNpcEffects; - std::vector<QuestItem*> mQuestLinks; + STD_VECTOR<QuestItem*> mQuestLinks; std::map<int, int> mQuestReverseLinks; int mNewQuestEffectId; int mCompleteQuestEffectId; diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp index e04b28d18..b9ef417c3 100644 --- a/src/gui/windows/quitdialog.cpp +++ b/src/gui/windows/quitdialog.cpp @@ -229,8 +229,8 @@ void QuitDialog::keyPressed(KeyEvent &event) if (dir != 0) { - std::vector<RadioButton*>::const_iterator it = mOptions.begin(); - const std::vector<RadioButton*>::const_iterator + STD_VECTOR<RadioButton*>::const_iterator it = mOptions.begin(); + const STD_VECTOR<RadioButton*>::const_iterator it_end = mOptions.end(); for (; it < it_end; ++it) diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h index 1e0197f87..e12e13e7b 100644 --- a/src/gui/windows/quitdialog.h +++ b/src/gui/windows/quitdialog.h @@ -67,7 +67,7 @@ class QuitDialog final : public Window, private: void placeOption(ContainerPlacer &placer, RadioButton *const option); - std::vector<RadioButton*> mOptions; + STD_VECTOR<RadioButton*> mOptions; RadioButton *mLogoutQuit A_NONNULLPOINTER; RadioButton *mForceQuit A_NONNULLPOINTER; diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 6093b67b4..ab630e960 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -505,7 +505,7 @@ static void loadHostsGroup(XmlNodeConstPtr node, } static void loadServerSourcesList(XmlNodeConstPtr node, - std::vector<ServerUrlInfo> &list) + STD_VECTOR<ServerUrlInfo> &list) { for_each_xml_child_node(urlNode, node) { diff --git a/src/gui/windows/serverinfowindow.cpp b/src/gui/windows/serverinfowindow.cpp index d1eb8cb44..20f8d5f42 100644 --- a/src/gui/windows/serverinfowindow.cpp +++ b/src/gui/windows/serverinfowindow.cpp @@ -136,14 +136,14 @@ void ServerInfoWindow::showServerInfo() mBrowserBox->updateHeight(); } -void ServerInfoWindow::addSourcesList(const std::vector<ServerUrlInfo> &list, +void ServerInfoWindow::addSourcesList(const STD_VECTOR<ServerUrlInfo> &list, const std::string &comment) { if (!list.empty()) { mBrowserBox->addRow(""); mBrowserBox->addRow(comment); - FOR_EACH (std::vector<ServerUrlInfo>::const_iterator, it, list) + FOR_EACH (STD_VECTOR<ServerUrlInfo>::const_iterator, it, list) { const ServerUrlInfo &info = *it; addServerComment(info.url, diff --git a/src/gui/windows/serverinfowindow.h b/src/gui/windows/serverinfowindow.h index 810c5b0c3..d872b1fdf 100644 --- a/src/gui/windows/serverinfowindow.h +++ b/src/gui/windows/serverinfowindow.h @@ -51,7 +51,7 @@ class ServerInfoWindow final : public Window, protected: void showServerInfo(); - void addSourcesList(const std::vector<ServerUrlInfo> &list, + void addSourcesList(const STD_VECTOR<ServerUrlInfo> &list, const std::string &comment); void addServerComment(const std::string &url, diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp index 40354f62a..6228ecd45 100644 --- a/src/gui/windows/setupwindow.cpp +++ b/src/gui/windows/setupwindow.cpp @@ -317,7 +317,7 @@ void SetupWindow::widgetResized(const Event &event) const int height = area.height; const int width = area.width; mPanel->setDimension(Rect(5, 5, width - 10, height - 40)); - FOR_EACH (std::vector<Button*>::iterator, it, mButtons) + FOR_EACH (STD_VECTOR<Button*>::iterator, it, mButtons) { Button *const btn = *it; x -= btn->getWidth() + mButtonPadding; diff --git a/src/gui/windows/setupwindow.h b/src/gui/windows/setupwindow.h index cb8a3af18..79a11a469 100644 --- a/src/gui/windows/setupwindow.h +++ b/src/gui/windows/setupwindow.h @@ -82,7 +82,7 @@ class SetupWindow final : public Window, std::list<SetupTab*> mTabs; std::list<Window*> mWindowsToReset; - std::vector<Button*> mButtons; + STD_VECTOR<Button*> mButtons; SetupTab *mModsTab; SetupTab *mQuickTab; Button *mResetWindows; diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 9ff15b024..0e55bcca1 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -318,7 +318,7 @@ void ShopWindow::action(const ActionEvent &event) } else { - std::vector<ShopItem*> &items = mBuyShopItems->items(); + STD_VECTOR<ShopItem*> &items = mBuyShopItems->items(); if (!items.empty()) { buyingStoreHandler->create(mSellShopName, @@ -337,12 +337,12 @@ void ShopWindow::action(const ActionEvent &event) } else { - std::vector<ShopItem*> &oldItems = mSellShopItems->items(); - std::vector<ShopItem*> items; + STD_VECTOR<ShopItem*> &oldItems = mSellShopItems->items(); + STD_VECTOR<ShopItem*> items; const Inventory *const inv = PlayerInfo::getCartInventory(); if (inv == nullptr) return; - FOR_EACH (std::vector<ShopItem*>::iterator, it, oldItems) + FOR_EACH (STD_VECTOR<ShopItem*>::iterator, it, oldItems) { ShopItem *const item = *it; if (item == nullptr) @@ -551,7 +551,7 @@ void ShopWindow::loadList() const std::string str = line; if (!str.empty()) { - std::vector<int> tokens; + STD_VECTOR<int> tokens; std::stringstream ss(str); while (ss >> buf) @@ -600,8 +600,8 @@ void ShopWindow::saveList() const return; } - std::vector<ShopItem*> items = mBuyShopItems->items(); - FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items) + STD_VECTOR<ShopItem*> items = mBuyShopItems->items(); + FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items) { ShopItem *const item = *(it); if (item != nullptr) @@ -609,7 +609,7 @@ void ShopWindow::saveList() const } items = mSellShopItems->items(); - FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items) { if ((*it) == nullptr) continue; @@ -672,9 +672,9 @@ void ShopWindow::announce(ShopItems *const list, const int mode) if (mAnnounceButton != nullptr) mAnnounceButton->setEnabled(false); - std::vector<ShopItem*> items = list->items(); + STD_VECTOR<ShopItem*> items = list->items(); - FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items) { const ShopItem *const item = *(it); if (item->getQuantity() > 1) @@ -760,9 +760,9 @@ void ShopWindow::giveList(const std::string &nick, const int mode) if (inv == nullptr) return; - std::vector<ShopItem*> items = list->items(); + STD_VECTOR<ShopItem*> items = list->items(); - FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items) { const ShopItem *const item = *(it); if (item == nullptr) @@ -1064,13 +1064,13 @@ bool ShopWindow::findShopItem(const ShopItem *const shopItem, if (shopItem == nullptr) return false; - std::vector<ShopItem*> items; + STD_VECTOR<ShopItem*> items; if (mode == SELL) items = mSellShopItems->items(); else items = mBuyShopItems->items(); - FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items) { const ShopItem *const item = *(it); if (item == nullptr) diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp index 61a7e6b45..1bb35d3f1 100644 --- a/src/gui/windows/shortcutwindow.cpp +++ b/src/gui/windows/shortcutwindow.cpp @@ -243,7 +243,7 @@ void ShortcutWindow::widgetMoved(const Event& event) Window::widgetMoved(event); if (mItems != nullptr) mItems->setRedraw(true); - FOR_EACH (std::vector<ShortcutContainer*>::iterator, it, mPages) + FOR_EACH (STD_VECTOR<ShortcutContainer*>::iterator, it, mPages) (*it)->setRedraw(true); } diff --git a/src/gui/windows/shortcutwindow.h b/src/gui/windows/shortcutwindow.h index 0486dd830..f21c505c5 100644 --- a/src/gui/windows/shortcutwindow.h +++ b/src/gui/windows/shortcutwindow.h @@ -86,7 +86,7 @@ class ShortcutWindow final : public Window ScrollArea *mScrollArea A_NONNULLPOINTER; TabbedArea *mTabs; - std::vector<ShortcutContainer*> mPages; + STD_VECTOR<ShortcutContainer*> mPages; int mButtonIndex; static int mBoxesWidth; diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 52dd067ea..ae6b72a35 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -732,7 +732,7 @@ void SkillDialog::useItem(const int itemId, if (!data.empty()) { - std::vector<int> vect; + STD_VECTOR<int> vect; splitToIntVector(vect, data, ' '); const size_t sz = vect.size(); if (sz > 0) @@ -1250,7 +1250,7 @@ void SkillDialog::addSkillDuration(SkillInfo *const skill) if (skill == nullptr) return; - FOR_EACH (std::vector<SkillInfo*>::const_iterator, it, mDurations) + FOR_EACH (STD_VECTOR<SkillInfo*>::const_iterator, it, mDurations) { if ((*it)->id == skill->id) return; @@ -1260,7 +1260,7 @@ void SkillDialog::addSkillDuration(SkillInfo *const skill) void SkillDialog::slowLogic() { - FOR_EACH_SAFE (std::vector<SkillInfo*>::iterator, it, mDurations) + FOR_EACH_SAFE (STD_VECTOR<SkillInfo*>::iterator, it, mDurations) { SkillInfo *const skill = *it; if (skill != nullptr) diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h index 0c19f9308..ab65f9f1b 100644 --- a/src/gui/windows/skilldialog.h +++ b/src/gui/windows/skilldialog.h @@ -219,7 +219,7 @@ class SkillDialog final : public Window, typedef std::map<int, SkillInfo*> SkillMap; SkillMap mSkills; - std::vector<SkillInfo*> mDurations; + STD_VECTOR<SkillInfo*> mDurations; TabbedArea *mTabs A_NONNULLPOINTER; std::list<Tab*> mDeleteTabs; Label *mPointsLabel A_NONNULLPOINTER; diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 6553c8dc5..e313cbc77 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -236,8 +236,8 @@ void StatusWindow::addTabs() { // TRANSLATORS: status window tab name addTabBasic(_("Basic")); - const std::vector<std::string> &pages = StatDb::getPages(); - FOR_EACH(std::vector<std::string>::const_iterator, it, pages) + const STD_VECTOR<std::string> &pages = StatDb::getPages(); + FOR_EACH(STD_VECTOR<std::string>::const_iterator, it, pages) { addTab(*it); } diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h index ddeee2d4c..01277c220 100644 --- a/src/gui/windows/statuswindow.h +++ b/src/gui/windows/statuswindow.h @@ -100,7 +100,7 @@ class StatusWindow final : public Window, static std::string translateLetter(const char *const letters); static std::string translateLetter2(const std::string &letters); - std::vector<StatsPage*> mPages; + STD_VECTOR<StatsPage*> mPages; TabbedArea *mTabs A_NONNULLPOINTER; Label *mLvlLabel A_NONNULLPOINTER; diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index db7d48c36..3858b0a5e 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -75,10 +75,10 @@ const std::string updateServer5 /** * Load the given file into a vector of updateFiles. */ -static std::vector<UpdateFile> loadXMLFile(const std::string &fileName, +static STD_VECTOR<UpdateFile> loadXMLFile(const std::string &fileName, const bool loadMods) { - std::vector<UpdateFile> files; + STD_VECTOR<UpdateFile> files; XML::Document doc(fileName, UseVirtFs_false, SkipError_false); XmlNodeConstPtrConst rootNode = doc.rootNode(); @@ -129,9 +129,9 @@ static std::vector<UpdateFile> loadXMLFile(const std::string &fileName, return files; } -static std::vector<UpdateFile> loadTxtFile(const std::string &fileName) +static STD_VECTOR<UpdateFile> loadTxtFile(const std::string &fileName) { - std::vector<UpdateFile> files; + STD_VECTOR<UpdateFile> files; std::ifstream fileHandler; fileHandler.open(fileName.c_str(), std::ios::in); @@ -242,7 +242,7 @@ UpdaterWindow::UpdaterWindow(const std::string &restrict updateHost, if (mUpdateHost.empty()) { - const std::vector<std::string> &mirrors = settings.updateMirrors; + const STD_VECTOR<std::string> &mirrors = settings.updateMirrors; if (mirrors.begin() != mirrors.end()) mUpdateHost = *mirrors.begin(); mSkipPatches = true; @@ -613,8 +613,8 @@ void UpdaterWindow::download() } else { - const std::vector<std::string> &mirrors = settings.updateMirrors; - FOR_EACH (std::vector<std::string>::const_iterator, it, mirrors) + const STD_VECTOR<std::string> &mirrors = settings.updateMirrors; + FOR_EACH (STD_VECTOR<std::string>::const_iterator, it, mirrors) { mDownload->addMirror(pathJoin(*it, mCurrentFile)); @@ -683,7 +683,7 @@ void UpdaterWindow::loadUpdates() void UpdaterWindow::loadLocalUpdates(const std::string &dir) { - std::vector<UpdateFile> updateFiles = loadXMLFile( + STD_VECTOR<UpdateFile> updateFiles = loadXMLFile( pathJoin(dir, xmlUpdateFile), false); @@ -716,7 +716,7 @@ void UpdaterWindow::loadLocalUpdates(const std::string &dir) void UpdaterWindow::unloadUpdates(const std::string &dir) { - std::vector<UpdateFile> updateFiles = loadXMLFile( + STD_VECTOR<UpdateFile> updateFiles = loadXMLFile( pathJoin(dir, xmlUpdateFile), true); @@ -742,7 +742,7 @@ void UpdaterWindow::unloadUpdates(const std::string &dir) void UpdaterWindow::loadManaPlusUpdates(const std::string &dir) { std::string fixPath = dir + "/fix"; - std::vector<UpdateFile> updateFiles = loadXMLFile( + STD_VECTOR<UpdateFile> updateFiles = loadXMLFile( pathJoin(fixPath, xmlUpdateFile), false); @@ -772,7 +772,7 @@ void UpdaterWindow::loadManaPlusUpdates(const std::string &dir) void UpdaterWindow::unloadManaPlusUpdates(const std::string &dir) { const std::string fixPath = dir + "/fix"; - const std::vector<UpdateFile> updateFiles = loadXMLFile( + const STD_VECTOR<UpdateFile> updateFiles = loadXMLFile( pathJoin(fixPath, xmlUpdateFile), true); @@ -1100,7 +1100,7 @@ void UpdaterWindow::loadFile(std::string file) } void UpdaterWindow::loadMods(const std::string &dir, - const std::vector<UpdateFile> &updateFiles) + const STD_VECTOR<UpdateFile> &updateFiles) { ModDB::load(); std::string modsString = serverConfig.getValue("mods", ""); @@ -1127,7 +1127,7 @@ void UpdaterWindow::loadMods(const std::string &dir, } } - std::vector<UpdateFile> updateFiles2 = loadXMLFile( + STD_VECTOR<UpdateFile> updateFiles2 = loadXMLFile( pathJoin(fixPath, xmlUpdateFile), true); diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h index f4d2a80f6..661168a9f 100644 --- a/src/gui/windows/updaterwindow.h +++ b/src/gui/windows/updaterwindow.h @@ -137,7 +137,7 @@ class UpdaterWindow final : public Window, static unsigned long getFileHash(const std::string &filePath); static void loadMods(const std::string &dir, - const std::vector<UpdateFile> &updateFiles); + const STD_VECTOR<UpdateFile> &updateFiles); static void loadDirMods(const std::string &dir); @@ -199,10 +199,10 @@ class UpdaterWindow final : public Window, Net::Download *mDownload; /** List of files to download. */ - std::vector<UpdateFile> mUpdateFiles; + STD_VECTOR<UpdateFile> mUpdateFiles; /** List of temp files to download. */ - std::vector<UpdateFile> mTempUpdateFiles; + STD_VECTOR<UpdateFile> mTempUpdateFiles; std::string mUpdateServerPath; diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index c1e5ffb12..79fe66a4f 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -245,7 +245,7 @@ void WhoIsOnline::updateWindow(size_t numOnline) std::sort(mNeutral.begin(), mNeutral.end(), nameCompare); std::sort(mDisregard.begin(), mDisregard.end(), nameCompare); bool addedFromSection(false); - FOR_EACH (std::vector<OnlinePlayer*>::const_iterator, it, mFriends) + FOR_EACH (STD_VECTOR<OnlinePlayer*>::const_iterator, it, mFriends) { mBrowserBox->addRow((*it)->getText()); addedFromSection = true; @@ -255,7 +255,7 @@ void WhoIsOnline::updateWindow(size_t numOnline) mBrowserBox->addRow("---"); addedFromSection = false; } - FOR_EACH (std::vector<OnlinePlayer*>::const_iterator, it, mEnemy) + FOR_EACH (STD_VECTOR<OnlinePlayer*>::const_iterator, it, mEnemy) { mBrowserBox->addRow((*it)->getText()); addedFromSection = true; @@ -265,7 +265,7 @@ void WhoIsOnline::updateWindow(size_t numOnline) mBrowserBox->addRow("---"); addedFromSection = false; } - FOR_EACH (std::vector<OnlinePlayer*>::const_iterator, it, mNeutral) + FOR_EACH (STD_VECTOR<OnlinePlayer*>::const_iterator, it, mNeutral) { mBrowserBox->addRow((*it)->getText()); addedFromSection = true; @@ -273,7 +273,7 @@ void WhoIsOnline::updateWindow(size_t numOnline) if (addedFromSection == true && !mDisregard.empty()) mBrowserBox->addRow("---"); - FOR_EACH (std::vector<OnlinePlayer*>::const_iterator, it, mDisregard) + FOR_EACH (STD_VECTOR<OnlinePlayer*>::const_iterator, it, mDisregard) mBrowserBox->addRow((*it)->getText()); if (mScrollArea->getVerticalMaxScroll() < @@ -324,7 +324,7 @@ void WhoIsOnline::handlerPlayerRelation(const std::string &nick, } } -void WhoIsOnline::loadList(const std::vector<OnlinePlayer*> &list) +void WhoIsOnline::loadList(const STD_VECTOR<OnlinePlayer*> &list) { mBrowserBox->clearRows(); const size_t numOnline = list.size(); @@ -336,7 +336,7 @@ void WhoIsOnline::loadList(const std::vector<OnlinePlayer*> &list) mShowLevel = config.getBoolValue("showlevel"); - FOR_EACH (std::vector<OnlinePlayer*>::const_iterator, it, list) + FOR_EACH (STD_VECTOR<OnlinePlayer*>::const_iterator, it, list) { OnlinePlayer *player = *it; const std::string nick = player->getNick(); diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h index 9f2fdf705..0eb316197 100644 --- a/src/gui/windows/whoisonline.h +++ b/src/gui/windows/whoisonline.h @@ -65,7 +65,7 @@ class WhoIsOnline final : public Window, void loadWebList(); #endif // TMWA_SUPPORT - void loadList(const std::vector<OnlinePlayer*> &list); + void loadList(const STD_VECTOR<OnlinePlayer*> &list); void handleLink(const std::string& link, MouseEvent *event) override final; @@ -154,10 +154,10 @@ class WhoIsOnline final : public Window, std::set<OnlinePlayer*> mOnlinePlayers; std::set<std::string> mOnlineNicks; - std::vector<OnlinePlayer*> mFriends; - std::vector<OnlinePlayer*> mNeutral; - std::vector<OnlinePlayer*> mDisregard; - std::vector<OnlinePlayer*> mEnemy; + STD_VECTOR<OnlinePlayer*> mFriends; + STD_VECTOR<OnlinePlayer*> mNeutral; + STD_VECTOR<OnlinePlayer*> mDisregard; + STD_VECTOR<OnlinePlayer*> mEnemy; /** Byte count currently downloaded in mMemoryBuffer. */ int mDownloadedBytes; diff --git a/src/guild.h b/src/guild.h index 3a58883c9..7157ddf21 100644 --- a/src/guild.h +++ b/src/guild.h @@ -198,7 +198,7 @@ class Guild final : public AvatarListModel bool getServerGuild() const noexcept2 A_WARN_UNUSED { return mServerGuild; } - typedef std::vector<GuildMember*> MemberList; + typedef STD_VECTOR<GuildMember*> MemberList; const MemberList *getMembers() const RETURNS_NONNULL A_WARN_UNUSED { return &mMembers; } diff --git a/src/input/joystick.cpp b/src/input/joystick.cpp index 5e0392c8e..0c859f50d 100644 --- a/src/input/joystick.cpp +++ b/src/input/joystick.cpp @@ -281,7 +281,7 @@ bool Joystick::buttonPressed(const unsigned char no) const return (mEnabled && no < MAX_BUTTONS) ? mActiveButtons[no] : false; } -void Joystick::getNames(std::vector <std::string> &names) +void Joystick::getNames(STD_VECTOR <std::string> &names) { names.clear(); for (int i = 0; i < joystickCount; i++) diff --git a/src/input/joystick.h b/src/input/joystick.h index 11e54f632..cb4b7a78d 100644 --- a/src/input/joystick.h +++ b/src/input/joystick.h @@ -85,7 +85,7 @@ class Joystick final constexpr2 static void setEnabled(const bool enabled) noexcept2 { mEnabled = enabled; } - static void getNames(std::vector <std::string> &names); + static void getNames(STD_VECTOR <std::string> &names); /** * Updates the direction and button information. diff --git a/src/input/touch/touchmanager.h b/src/input/touch/touchmanager.h index 6727b9b08..0b9187968 100644 --- a/src/input/touch/touchmanager.h +++ b/src/input/touch/touchmanager.h @@ -94,7 +94,7 @@ struct TouchItem final TouchFuncPtr funcOut; }; -typedef std::vector<TouchItem*> TouchItemVector; +typedef STD_VECTOR<TouchItem*> TouchItemVector; typedef TouchItemVector::const_iterator TouchItemVectorCIter; typedef TouchItemVector::iterator TouchItemVectorIter; 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; diff --git a/src/logger.cpp b/src/logger.cpp index e7efa82d7..455cc8621 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -358,7 +358,7 @@ void Logger::flush() if (!mThreadLocked) { SDL_mutexP(mMutex); - FOR_EACH (std::vector<std::string>::const_iterator, it, mDelayedLog) + FOR_EACH (STD_VECTOR<std::string>::const_iterator, it, mDelayedLog) mLogFile << *it << std::endl; mDelayedLog.clear(); SDL_mutexV(mMutex); diff --git a/src/logger.h b/src/logger.h index c096c370e..3c0f8b0b1 100644 --- a/src/logger.h +++ b/src/logger.h @@ -212,7 +212,7 @@ class Logger final private: std::ofstream mLogFile; - std::vector<std::string> mDelayedLog; + STD_VECTOR<std::string> mDelayedLog; SDL_mutex *mMutex; volatile bool mThreadLocked; bool mLogToStandardOut; diff --git a/src/navigationmanager.cpp b/src/navigationmanager.cpp index 67d5760f0..189d37f4e 100644 --- a/src/navigationmanager.cpp +++ b/src/navigationmanager.cpp @@ -95,7 +95,7 @@ void NavigationManager::fillNum(int x, int y, const MetaTile *const tiles, int *const data) { - std::vector<Cell> cells; + STD_VECTOR<Cell> cells; cells.push_back(Cell(x, y)); while (!cells.empty()) { diff --git a/src/net/buyingstorehandler.h b/src/net/buyingstorehandler.h index 3d2b2b0e9..1ab94de88 100644 --- a/src/net/buyingstorehandler.h +++ b/src/net/buyingstorehandler.h @@ -50,7 +50,7 @@ class BuyingStoreHandler notfinal virtual void create(const std::string &name, const int maxMoney, const bool flag, - const std::vector<ShopItem*> &items) const = 0; + const STD_VECTOR<ShopItem*> &items) const = 0; virtual void close() const = 0; diff --git a/src/net/cashshophandler.h b/src/net/cashshophandler.h index c34548088..68b7c3ceb 100644 --- a/src/net/cashshophandler.h +++ b/src/net/cashshophandler.h @@ -49,7 +49,7 @@ class CashShopHandler notfinal const int amount) const = 0; virtual void buyItems(const int points, - const std::vector<ShopItem*> &items) const = 0; + const STD_VECTOR<ShopItem*> &items) const = 0; virtual void close() const = 0; diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h index ac07909be..7d14a3bab 100644 --- a/src/net/charserverhandler.h +++ b/src/net/charserverhandler.h @@ -67,7 +67,7 @@ class CharServerHandler notfinal const int hairColor, const unsigned char race, const uint16_t look, - const std::vector<int> &stats) const = 0; + const STD_VECTOR<int> &stats) const = 0; virtual void deleteCharacter(Net::Character *const character, const std::string &email) const = 0; diff --git a/src/net/ea/inventoryitem.h b/src/net/ea/inventoryitem.h index cbf5d1560..daf5cd65e 100644 --- a/src/net/ea/inventoryitem.h +++ b/src/net/ea/inventoryitem.h @@ -118,7 +118,7 @@ class InventoryItem final } }; -typedef std::vector<InventoryItem> InventoryItems; +typedef STD_VECTOR<InventoryItem> InventoryItems; } // namespace Ea diff --git a/src/net/eathena/buyingstorehandler.cpp b/src/net/eathena/buyingstorehandler.cpp index d342be0b8..ae2157452 100644 --- a/src/net/eathena/buyingstorehandler.cpp +++ b/src/net/eathena/buyingstorehandler.cpp @@ -47,7 +47,7 @@ BuyingStoreHandler::BuyingStoreHandler() void BuyingStoreHandler::create(const std::string &name, const int maxMoney, const bool flag, - const std::vector<ShopItem*> &items) const + const STD_VECTOR<ShopItem*> &items) const { if (packetVersion < 20100303) return; @@ -56,7 +56,7 @@ void BuyingStoreHandler::create(const std::string &name, outMsg.writeInt32(maxMoney, "limit money"); outMsg.writeInt8(static_cast<int8_t>(flag), "flag"); outMsg.writeString(name, 80, "store name"); - FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items) { const ShopItem *const item = *it; outMsg.writeInt16(CAST_S16(item->getId()), "item id"); diff --git a/src/net/eathena/buyingstorehandler.h b/src/net/eathena/buyingstorehandler.h index ae060095f..61b412bd6 100644 --- a/src/net/eathena/buyingstorehandler.h +++ b/src/net/eathena/buyingstorehandler.h @@ -35,7 +35,7 @@ class BuyingStoreHandler final : public Net::BuyingStoreHandler void create(const std::string &name, const int maxMoney, const bool flag, - const std::vector<ShopItem*> &items) const override final; + const STD_VECTOR<ShopItem*> &items) const override final; void close() const override final; diff --git a/src/net/eathena/cashshophandler.cpp b/src/net/eathena/cashshophandler.cpp index 105a45141..c693cb1f0 100644 --- a/src/net/eathena/cashshophandler.cpp +++ b/src/net/eathena/cashshophandler.cpp @@ -58,7 +58,7 @@ void CashShopHandler::buyItem(const int points, } void CashShopHandler::buyItems(const int points, - const std::vector<ShopItem*> &items) const + const STD_VECTOR<ShopItem*> &items) const { if (packetVersion < 20101124) return; @@ -66,7 +66,7 @@ void CashShopHandler::buyItems(const int points, int cnt = 0; const int pairSize = 4; - FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items) { const ShopItem *const item = *it; const int usedQuantity = item->getUsedQuantity(); @@ -93,7 +93,7 @@ void CashShopHandler::buyItems(const int points, outMsg.writeInt16(CAST_S16(10 + pairSize * cnt), "len"); outMsg.writeInt32(points, "points"); outMsg.writeInt16(CAST_S16(cnt), "count"); - FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items) { ShopItem *const item = *it; const int usedQuantity = item->getUsedQuantity(); diff --git a/src/net/eathena/cashshophandler.h b/src/net/eathena/cashshophandler.h index 5fe2a6517..8adfec064 100644 --- a/src/net/eathena/cashshophandler.h +++ b/src/net/eathena/cashshophandler.h @@ -38,7 +38,7 @@ class CashShopHandler final : public Net::CashShopHandler const int amount) const override final; void buyItems(const int points, - const std::vector<ShopItem*> &items) const override final + const STD_VECTOR<ShopItem*> &items) const override final A_CONST; void close() const override final; diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index a184abd07..f9cd6729d 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -76,7 +76,7 @@ void CharServerHandler::newCharacter(const std::string &name, const int slot, const int hairstyle, const int hairColor, const unsigned char race, const uint16_t look, - const std::vector<int> &stats A_UNUSED) + const STD_VECTOR<int> &stats A_UNUSED) const { createOutPacket(CMSG_CHAR_CREATE); diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h index 342dcae59..20b467120 100644 --- a/src/net/eathena/charserverhandler.h +++ b/src/net/eathena/charserverhandler.h @@ -48,7 +48,7 @@ class CharServerHandler final : public Ea::CharServerHandler const int hairColor, const unsigned char race, const uint16_t look, - const std::vector<int> &stats) const override final; + const STD_VECTOR<int> &stats) const override final; void renameCharacter(const BeingId id, const std::string &newName) const override final; diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index 74b0777e0..ed9296a8b 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -558,13 +558,13 @@ void InventoryHandler::identifyItem(const Item *const item) const "item index"); } -void InventoryHandler::mergeItemsAck(const std::vector<Item*> &items) const +void InventoryHandler::mergeItemsAck(const STD_VECTOR<Item*> &items) const { createOutPacket(CMSG_MERGE_ITEM_ACK); const size_t sz = items.size(); outMsg.writeInt16(CAST_S16(sz * 2 + 4), "len"); - FOR_EACH (std::vector<Item*>::const_iterator, it, items) + FOR_EACH (STD_VECTOR<Item*>::const_iterator, it, items) { outMsg.writeInt16(CAST_S16((*it)->getInvIndex() + 2), "item index"); diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h index c954b0ef8..3a804fb3d 100644 --- a/src/net/eathena/inventoryhandler.h +++ b/src/net/eathena/inventoryhandler.h @@ -74,7 +74,7 @@ class InventoryHandler final : public Ea::InventoryHandler void identifyItem(const Item *const item) const override final; - void mergeItemsAck(const std::vector<Item*> &items) const + void mergeItemsAck(const STD_VECTOR<Item*> &items) const override final; void mergetItemsCancel() const override final; diff --git a/src/net/eathena/markethandler.cpp b/src/net/eathena/markethandler.cpp index bcba57e81..98b8b5d9f 100644 --- a/src/net/eathena/markethandler.cpp +++ b/src/net/eathena/markethandler.cpp @@ -75,14 +75,14 @@ void MarketHandler::buyItem(const int itemId, } } -void MarketHandler::buyItems(const std::vector<ShopItem*> &items) const +void MarketHandler::buyItems(const STD_VECTOR<ShopItem*> &items) const { if (packetVersion < 20131218) return; int cnt = 0; const int pairSize = 6; - FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items) { const ShopItem *const item = *it; const int usedQuantity = item->getUsedQuantity(); @@ -107,7 +107,7 @@ void MarketHandler::buyItems(const std::vector<ShopItem*> &items) const createOutPacket(CMSG_NPC_MARKET_BUY); outMsg.writeInt16(CAST_S16(4 + pairSize * cnt), "len"); - FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items) { ShopItem *const item = *it; const int usedQuantity = item->getUsedQuantity(); diff --git a/src/net/eathena/markethandler.h b/src/net/eathena/markethandler.h index f68eb596d..8fe2c4bfb 100644 --- a/src/net/eathena/markethandler.h +++ b/src/net/eathena/markethandler.h @@ -40,7 +40,7 @@ class MarketHandler final : public Net::MarketHandler const ItemColor color, const int amount) const override final; - void buyItems(const std::vector<ShopItem*> &items) const + void buyItems(const STD_VECTOR<ShopItem*> &items) const override final; }; diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp index 4e8d179f0..65e05e866 100644 --- a/src/net/eathena/npchandler.cpp +++ b/src/net/eathena/npchandler.cpp @@ -160,12 +160,12 @@ void NpcHandler::buyItem(const BeingId beingId A_UNUSED, outMsg.writeInt16(CAST_S16(itemId), "item id"); } -void NpcHandler::buyItems(std::vector<ShopItem*> &items) const +void NpcHandler::buyItems(STD_VECTOR<ShopItem*> &items) const { int cnt = 0; const int pairSize = 4; - FOR_EACH (std::vector<ShopItem*>::iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::iterator, it, items) { ShopItem *const item = *it; const int usedQuantity = item->getUsedQuantity(); @@ -190,7 +190,7 @@ void NpcHandler::buyItems(std::vector<ShopItem*> &items) const createOutPacket(CMSG_NPC_BUY_REQUEST); outMsg.writeInt16(CAST_S16(4 + pairSize * cnt), "len"); - FOR_EACH (std::vector<ShopItem*>::iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::iterator, it, items) { ShopItem *const item = *it; const int usedQuantity = item->getUsedQuantity(); @@ -229,12 +229,12 @@ void NpcHandler::sellItem(const BeingId beingId A_UNUSED, outMsg.writeInt16(CAST_S16(amount), "amount"); } -void NpcHandler::sellItems(std::vector<ShopItem*> &items) const +void NpcHandler::sellItems(STD_VECTOR<ShopItem*> &items) const { const int pairSize = 4; int cnt = 0; - FOR_EACH (std::vector<ShopItem*>::iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::iterator, it, items) { ShopItem *const item = *it; const int usedQuantity = item->getUsedQuantity(); @@ -245,7 +245,7 @@ void NpcHandler::sellItems(std::vector<ShopItem*> &items) const createOutPacket(CMSG_NPC_SELL_REQUEST); outMsg.writeInt16(CAST_S16(4 + pairSize * cnt), "len"); - FOR_EACH (std::vector<ShopItem*>::iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::iterator, it, items) { ShopItem *const item = *it; const int usedQuantity = item->getUsedQuantity(); diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h index a2962eea0..f1f259718 100644 --- a/src/net/eathena/npchandler.h +++ b/src/net/eathena/npchandler.h @@ -61,14 +61,14 @@ class NpcHandler final : public Ea::NpcHandler const ItemColor color, const int amount) const override final; - void buyItems(std::vector<ShopItem*> &items) const + void buyItems(STD_VECTOR<ShopItem*> &items) const override final; void sellItem(const BeingId beingId, const int itemId, const int amount) const override final; - void sellItems(std::vector<ShopItem*> &items) const override final; + void sellItems(STD_VECTOR<ShopItem*> &items) const override final; void completeProgressBar() const override final; diff --git a/src/net/eathena/playerrecv.cpp b/src/net/eathena/playerrecv.cpp index c575e2615..a630bf9b7 100644 --- a/src/net/eathena/playerrecv.cpp +++ b/src/net/eathena/playerrecv.cpp @@ -395,7 +395,7 @@ void PlayerRecv::processOnlineList(Net::MessageIn &msg) BLOCK_START("PlayerRecv::processOnlineList") const int size = msg.readInt16("len") - 4; - std::vector<OnlinePlayer*> arr; + STD_VECTOR<OnlinePlayer*> arr; if (size == 0) { diff --git a/src/net/eathena/vendinghandler.cpp b/src/net/eathena/vendinghandler.cpp index 728e8fb7e..c5791cfd5 100644 --- a/src/net/eathena/vendinghandler.cpp +++ b/src/net/eathena/vendinghandler.cpp @@ -74,12 +74,12 @@ void VendingHandler::buy(const Being *const being, } void VendingHandler::buyItems(const Being *const being, - const std::vector<ShopItem*> &items) const + const STD_VECTOR<ShopItem*> &items) const { int cnt = 0; const int pairSize = 4; - FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items) { ShopItem *const item = *it; const int usedQuantity = item->getUsedQuantity(); @@ -94,7 +94,7 @@ void VendingHandler::buyItems(const Being *const being, createOutPacket(CMSG_VENDING_BUY); outMsg.writeInt16(CAST_S16(4 + 4 + pairSize * cnt), "len"); outMsg.writeBeingId(being->getId(), "account id"); - FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items) { ShopItem *const item = *it; const int usedQuantity = item->getUsedQuantity(); @@ -126,13 +126,13 @@ void VendingHandler::buy2(const Being *const being, void VendingHandler::createShop(const std::string &name, const bool flag, - const std::vector<ShopItem*> &items) const + const STD_VECTOR<ShopItem*> &items) const { createOutPacket(CMSG_VENDING_CREATE_SHOP); outMsg.writeInt16(CAST_S16(85 + items.size() * 8), "len"); outMsg.writeString(name, 80, "shop name"); outMsg.writeInt8(CAST_S8(flag ? 1 : 0), "flag"); - FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items) { const ShopItem *const item = *it; outMsg.writeInt16(CAST_S16( diff --git a/src/net/eathena/vendinghandler.h b/src/net/eathena/vendinghandler.h index e8beae27d..d8d3948f6 100644 --- a/src/net/eathena/vendinghandler.h +++ b/src/net/eathena/vendinghandler.h @@ -46,12 +46,12 @@ class VendingHandler final : public Net::VendingHandler const int amount) const override final; void buyItems(const Being *const being, - const std::vector<ShopItem*> &items) const + const STD_VECTOR<ShopItem*> &items) const override final; void createShop(const std::string &name, const bool flag, - const std::vector<ShopItem*> &items) const + const STD_VECTOR<ShopItem*> &items) const override final; }; diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index b1b7591f2..a93837939 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -99,7 +99,7 @@ class InventoryHandler notfinal virtual void identifyItem(const Item *const item) const = 0; - virtual void mergeItemsAck(const std::vector<Item*> &items) const = 0; + virtual void mergeItemsAck(const STD_VECTOR<Item*> &items) const = 0; virtual void mergetItemsCancel() const = 0; }; diff --git a/src/net/ipc.cpp b/src/net/ipc.cpp index d7ffa1ae9..14dd27504 100644 --- a/src/net/ipc.cpp +++ b/src/net/ipc.cpp @@ -198,7 +198,7 @@ void IPC::flush() // probably need enable only commands in tool if (chatWindow != nullptr) { - FOR_EACH (std::vector<std::string>::const_iterator, it, + FOR_EACH (STD_VECTOR<std::string>::const_iterator, it, mDelayedCommands) { chatWindow->chatInput(*it); @@ -206,7 +206,7 @@ void IPC::flush() } else { - FOR_EACH (std::vector<std::string>::const_iterator, it, + FOR_EACH (STD_VECTOR<std::string>::const_iterator, it, mDelayedCommands) { std::string msg = *it; diff --git a/src/net/ipc.h b/src/net/ipc.h index 0d45e781f..a858e924a 100644 --- a/src/net/ipc.h +++ b/src/net/ipc.h @@ -66,7 +66,7 @@ class IPC final unsigned int mNumReqs; TcpNet::Socket mSocket; - std::vector<std::string> mDelayedCommands; + STD_VECTOR<std::string> mDelayedCommands; SDL_Thread *mThread; SDL_mutex *mMutex; unsigned short mPort; diff --git a/src/net/markethandler.h b/src/net/markethandler.h index 73040102f..f4b43cccd 100644 --- a/src/net/markethandler.h +++ b/src/net/markethandler.h @@ -52,7 +52,7 @@ class MarketHandler notfinal const ItemColor color, const int amount) const = 0; - virtual void buyItems(const std::vector<ShopItem*> &items) const = 0; + virtual void buyItems(const STD_VECTOR<ShopItem*> &items) const = 0; }; } // namespace Net diff --git a/src/net/npchandler.h b/src/net/npchandler.h index d332fba95..1e41c1144 100644 --- a/src/net/npchandler.h +++ b/src/net/npchandler.h @@ -85,13 +85,13 @@ class NpcHandler notfinal const ItemColor color, const int amount) const = 0; - virtual void buyItems(std::vector<ShopItem*> &items) const = 0; + virtual void buyItems(STD_VECTOR<ShopItem*> &items) const = 0; virtual void sellItem(const BeingId beingId, const int itemId, const int amount) const = 0; - virtual void sellItems(std::vector<ShopItem*> &items) const = 0; + virtual void sellItems(STD_VECTOR<ShopItem*> &items) const = 0; virtual void completeProgressBar() const = 0; diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index 2deccb04f..f5da554ee 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -49,11 +49,11 @@ class ServerInfo final std::string supportUrl; std::string serverUrl; std::string defaultHostName; - std::vector<std::string> updateMirrors; - std::vector<HostsGroup> updateHosts; - std::vector<ServerUrlInfo> freeSources; - std::vector<ServerUrlInfo> nonFreeSources; - std::vector<ServerUrlInfo> docs; + STD_VECTOR<std::string> updateMirrors; + STD_VECTOR<HostsGroup> updateHosts; + STD_VECTOR<ServerUrlInfo> freeSources; + STD_VECTOR<ServerUrlInfo> nonFreeSources; + STD_VECTOR<ServerUrlInfo> docs; uint16_t port; VersionString version; int packetVersion; @@ -221,6 +221,6 @@ class ServerInfo final } }; -typedef std::vector<ServerInfo> ServerInfos; +typedef STD_VECTOR<ServerInfo> ServerInfos; #endif // NET_SERVERINFO_H diff --git a/src/net/tmwa/buyingstorehandler.cpp b/src/net/tmwa/buyingstorehandler.cpp index 53fe39fa7..9ea2a9822 100644 --- a/src/net/tmwa/buyingstorehandler.cpp +++ b/src/net/tmwa/buyingstorehandler.cpp @@ -33,7 +33,7 @@ BuyingStoreHandler::BuyingStoreHandler() void BuyingStoreHandler::create(const std::string &name A_UNUSED, const int maxMoney A_UNUSED, const bool flag A_UNUSED, - const std::vector<ShopItem*> &items A_UNUSED) + const STD_VECTOR<ShopItem*> &items A_UNUSED) const { } diff --git a/src/net/tmwa/buyingstorehandler.h b/src/net/tmwa/buyingstorehandler.h index 2292505d0..5a9ce21cc 100644 --- a/src/net/tmwa/buyingstorehandler.h +++ b/src/net/tmwa/buyingstorehandler.h @@ -36,7 +36,7 @@ class BuyingStoreHandler final : public Net::BuyingStoreHandler void create(const std::string &name, const int maxMoney, const bool flag, - const std::vector<ShopItem*> &items) const override final + const STD_VECTOR<ShopItem*> &items) const override final A_CONST; void close() const override final A_CONST; diff --git a/src/net/tmwa/cashshophandler.cpp b/src/net/tmwa/cashshophandler.cpp index 0c2315560..81a8e2871 100644 --- a/src/net/tmwa/cashshophandler.cpp +++ b/src/net/tmwa/cashshophandler.cpp @@ -39,7 +39,7 @@ void CashShopHandler::buyItem(const int points A_UNUSED, } void CashShopHandler::buyItems(const int points A_UNUSED, - const std::vector<ShopItem*> &items A_UNUSED) + const STD_VECTOR<ShopItem*> &items A_UNUSED) const { } diff --git a/src/net/tmwa/cashshophandler.h b/src/net/tmwa/cashshophandler.h index 6b43cdce6..328758960 100644 --- a/src/net/tmwa/cashshophandler.h +++ b/src/net/tmwa/cashshophandler.h @@ -39,7 +39,7 @@ class CashShopHandler final : public Net::CashShopHandler const int amount) const override final A_CONST; void buyItems(const int points, - const std::vector<ShopItem*> &items) const override final + const STD_VECTOR<ShopItem*> &items) const override final A_CONST; void close() const override final A_CONST; diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 200d09703..4d5ae293b 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -71,7 +71,7 @@ void CharServerHandler::newCharacter(const std::string &name, const int slot, const int hairColor, const unsigned char race A_UNUSED, const uint16_t look A_UNUSED, - const std::vector<int> &stats) const + const STD_VECTOR<int> &stats) const { createOutPacket(CMSG_CHAR_CREATE); outMsg.writeString(name, 24, "name"); diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index 98c9e2383..43050b365 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -48,7 +48,7 @@ class CharServerHandler final : public Ea::CharServerHandler const int hairColor, const unsigned char race, const uint16_t look, - const std::vector<int> &stats) const override final; + const STD_VECTOR<int> &stats) const override final; void deleteCharacter(Net::Character *const character, const std::string &email) const override final; diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index cf4c2f269..8328f159a 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -171,7 +171,7 @@ void InventoryHandler::identifyItem(const Item *const item A_UNUSED) const { } -void InventoryHandler::mergeItemsAck(const std::vector<Item*> &items A_UNUSED) +void InventoryHandler::mergeItemsAck(const STD_VECTOR<Item*> &items A_UNUSED) const { } diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index 2abab1d7d..302c52ca0 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -71,7 +71,7 @@ class InventoryHandler final : public Ea::InventoryHandler void identifyItem(const Item *const item) const override final; - void mergeItemsAck(const std::vector<Item*> &items) const + void mergeItemsAck(const STD_VECTOR<Item*> &items) const override final; void mergetItemsCancel() const override final; diff --git a/src/net/tmwa/markethandler.cpp b/src/net/tmwa/markethandler.cpp index 7f58df4bc..e5e64d9a1 100644 --- a/src/net/tmwa/markethandler.cpp +++ b/src/net/tmwa/markethandler.cpp @@ -42,7 +42,7 @@ void MarketHandler::buyItem(const int itemId A_UNUSED, { } -void MarketHandler::buyItems(const std::vector<ShopItem*> &items A_UNUSED) +void MarketHandler::buyItems(const STD_VECTOR<ShopItem*> &items A_UNUSED) const { } diff --git a/src/net/tmwa/markethandler.h b/src/net/tmwa/markethandler.h index 5a75a1639..fe0f97006 100644 --- a/src/net/tmwa/markethandler.h +++ b/src/net/tmwa/markethandler.h @@ -39,7 +39,7 @@ class MarketHandler final : public Net::MarketHandler const ItemColor color, const int amount) const override final A_CONST; - void buyItems(const std::vector<ShopItem*> &items) const override final + void buyItems(const STD_VECTOR<ShopItem*> &items) const override final A_CONST; }; diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index e58ca4d69..9478282ea 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -140,7 +140,7 @@ void NpcHandler::buyItem(const BeingId beingId A_UNUSED, outMsg.writeInt16(CAST_S16(itemId), "item id"); } -void NpcHandler::buyItems(std::vector<ShopItem*> &items A_UNUSED) const +void NpcHandler::buyItems(STD_VECTOR<ShopItem*> &items A_UNUSED) const { } @@ -155,7 +155,7 @@ void NpcHandler::sellItem(const BeingId beingId A_UNUSED, outMsg.writeInt16(CAST_S16(amount), "amount"); } -void NpcHandler::sellItems(std::vector<ShopItem*> &items A_UNUSED) const +void NpcHandler::sellItems(STD_VECTOR<ShopItem*> &items A_UNUSED) const { } diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index 714bcbd65..5f413012f 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -61,14 +61,14 @@ class NpcHandler final : public Ea::NpcHandler const ItemColor color, const int amount) const override final; - void buyItems(std::vector<ShopItem*> &items) const override final + void buyItems(STD_VECTOR<ShopItem*> &items) const override final A_CONST; void sellItem(const BeingId beingId, const int itemId, const int amount) const override final; - void sellItems(std::vector<ShopItem*> &items) const override final + void sellItems(STD_VECTOR<ShopItem*> &items) const override final A_CONST; void completeProgressBar() const override final A_CONST; diff --git a/src/net/tmwa/vendinghandler.cpp b/src/net/tmwa/vendinghandler.cpp index 6742b762c..726dda217 100644 --- a/src/net/tmwa/vendinghandler.cpp +++ b/src/net/tmwa/vendinghandler.cpp @@ -45,7 +45,7 @@ void VendingHandler::buy(const Being *const being A_UNUSED, } void VendingHandler::buyItems(const Being *const being A_UNUSED, - const std::vector<ShopItem*> &items A_UNUSED) + const STD_VECTOR<ShopItem*> &items A_UNUSED) const { } @@ -59,7 +59,7 @@ void VendingHandler::buy2(const Being *const being A_UNUSED, void VendingHandler::createShop(const std::string &name A_UNUSED, const bool flag A_UNUSED, - const std::vector<ShopItem*> &items A_UNUSED) + const STD_VECTOR<ShopItem*> &items A_UNUSED) const { } diff --git a/src/net/tmwa/vendinghandler.h b/src/net/tmwa/vendinghandler.h index 826555c75..8091e0c7e 100644 --- a/src/net/tmwa/vendinghandler.h +++ b/src/net/tmwa/vendinghandler.h @@ -42,7 +42,7 @@ class VendingHandler final : public Net::VendingHandler const int amount) const override final A_CONST; void buyItems(const Being *const being, - const std::vector<ShopItem*> &items) const + const STD_VECTOR<ShopItem*> &items) const override final A_CONST; void buy2(const Being *const being, @@ -52,7 +52,7 @@ class VendingHandler final : public Net::VendingHandler void createShop(const std::string &name, const bool flag, - const std::vector<ShopItem*> &items) const + const STD_VECTOR<ShopItem*> &items) const override final A_CONST; }; diff --git a/src/net/vendinghandler.h b/src/net/vendinghandler.h index 3caeaf2b3..b5653163b 100644 --- a/src/net/vendinghandler.h +++ b/src/net/vendinghandler.h @@ -53,7 +53,7 @@ class VendingHandler notfinal const int amount) const = 0; virtual void buyItems(const Being *const being, - const std::vector<ShopItem*> &items) const = 0; + const STD_VECTOR<ShopItem*> &items) const = 0; virtual void buy2(const Being *const being, const int vendId, @@ -62,7 +62,7 @@ class VendingHandler notfinal virtual void createShop(const std::string &name, const bool flag, - const std::vector<ShopItem*> &items) const = 0; + const STD_VECTOR<ShopItem*> &items) const = 0; }; } // namespace Net diff --git a/src/net/worldinfo.h b/src/net/worldinfo.h index fbbb30bfa..8ba2615e7 100644 --- a/src/net/worldinfo.h +++ b/src/net/worldinfo.h @@ -55,6 +55,6 @@ struct WorldInfo final std::string updateHost; }; -typedef std::vector<WorldInfo*> Worlds; +typedef STD_VECTOR<WorldInfo*> Worlds; #endif // NET_WORLDINFO_H diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp index 849464166..dd5b86913 100644 --- a/src/particle/particle.cpp +++ b/src/particle/particle.cpp @@ -218,9 +218,9 @@ void Particle::updateSelf() restrict2 { FOR_EACH (EmitterConstIterator, e, mChildEmitters) { - std::vector<Particle*> newParticles; + STD_VECTOR<Particle*> newParticles; (*e)->createParticles(mLifetimePast, newParticles); - FOR_EACH (std::vector<Particle*>::const_iterator, + FOR_EACH (STD_VECTOR<Particle*>::const_iterator, it, newParticles) { diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp index b13b03ca0..326daea7a 100644 --- a/src/particle/particleemitter.cpp +++ b/src/particle/particleemitter.cpp @@ -47,7 +47,7 @@ static const float SIN45 = 0.707106781F; static const float DEG_RAD_FACTOR = 0.017453293F; -typedef std::vector<ImageSet*>::const_iterator ImageSetVectorCIter; +typedef STD_VECTOR<ImageSet*>::const_iterator ImageSetVectorCIter; typedef std::list<ParticleEmitter>::const_iterator ParticleEmitterListCIter; ParticleEmitter::ParticleEmitter(XmlNodeConstPtrConst emitterNode, @@ -511,7 +511,7 @@ ParticleEmitter::readParticleEmitterProp(XmlNodePtrConst propertyNode, T def) } void ParticleEmitter::createParticles(const int tick, - std::vector<Particle*> &newParticles) + STD_VECTOR<Particle*> &newParticles) { if (mOutputPauseLeft > 0) { diff --git a/src/particle/particleemitter.h b/src/particle/particleemitter.h index 7164d3e1d..ec01b88df 100644 --- a/src/particle/particleemitter.h +++ b/src/particle/particleemitter.h @@ -71,7 +71,7 @@ class ParticleEmitter final * Spawns new particles */ void createParticles(const int tick, - std::vector<Particle*> &newParticles); + STD_VECTOR<Particle*> &newParticles); /** * Sets the target of the particles that are created @@ -161,7 +161,7 @@ class ParticleEmitter final // List of emitters the spawned particles are equipped with std::list<ParticleEmitter> mParticleChildEmitters; - std::vector<ImageSet*> mTempSets; + STD_VECTOR<ImageSet*> mTempSets; int mOutputPauseLeft; diff --git a/src/particle/particleinfo.h b/src/particle/particleinfo.h index 327d4b3d6..48129f553 100644 --- a/src/particle/particleinfo.h +++ b/src/particle/particleinfo.h @@ -35,8 +35,8 @@ struct ParticleInfo final A_DELETE_COPY(ParticleInfo) - std::vector<std::string> files; - std::vector<Particle*> particles; + STD_VECTOR<std::string> files; + STD_VECTOR<Particle*> particles; }; #endif // PARTICLE_PARTICLEINFO_H diff --git a/src/particle/particlevector.cpp b/src/particle/particlevector.cpp index ba8c0a0a7..8fba56244 100644 --- a/src/particle/particlevector.cpp +++ b/src/particle/particlevector.cpp @@ -79,7 +79,7 @@ void ParticleVector::moveTo(const float x, const float y) { ParticleContainer::moveTo(x, y); - for (std::vector<Particle *>::iterator it = mIndexedElements.begin(); + for (STD_VECTOR<Particle *>::iterator it = mIndexedElements.begin(); it != mIndexedElements.end(); ++it) { Particle *const p = *it; @@ -99,7 +99,7 @@ void ParticleVector::moveTo(const float x, const float y) size_t ParticleVector::usedSize() const { size_t cnt = 0; - for (std::vector<Particle *>::const_iterator it = mIndexedElements.begin(); + for (STD_VECTOR<Particle *>::const_iterator it = mIndexedElements.begin(); it != mIndexedElements.end(); ++it) { if (*it != nullptr) diff --git a/src/particle/particlevector.h b/src/particle/particlevector.h index 27520d806..dce4ae156 100644 --- a/src/particle/particlevector.h +++ b/src/particle/particlevector.h @@ -65,7 +65,7 @@ class ParticleVector final : public ParticleContainer size_t usedSize() const; protected: - std::vector<Particle *> mIndexedElements; + STD_VECTOR<Particle *> mIndexedElements; }; #endif // PARTICLE_PARTICLEVECTOR_H diff --git a/src/party.h b/src/party.h index ca7c11d2e..932cf426b 100644 --- a/src/party.h +++ b/src/party.h @@ -153,7 +153,7 @@ class Party final : public AvatarListModel void sort(); - typedef std::vector<PartyMember*> MemberList; + typedef STD_VECTOR<PartyMember*> MemberList; const MemberList *getMembers() const RETURNS_NONNULL A_WARN_UNUSED { return &mMembers; } diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp index 1b532e48d..919eb67fe 100644 --- a/src/render/mobileopengl2graphics.cpp +++ b/src/render/mobileopengl2graphics.cpp @@ -604,11 +604,11 @@ inline void MobileOpenGL2Graphics::drawVertexes(const OpenGLGraphicsVertexes & restrict ogl) restrict2 { - const std::vector<int> &vp = ogl.mVp; - const std::vector<GLuint> &vbos = ogl.mVbo; - std::vector<int>::const_iterator ivp; - std::vector<GLuint>::const_iterator ivbo; - const std::vector<int>::const_iterator ivp_end = vp.end(); + const STD_VECTOR<int> &vp = ogl.mVp; + const STD_VECTOR<GLuint> &vbos = ogl.mVbo; + STD_VECTOR<int>::const_iterator ivp; + STD_VECTOR<GLuint>::const_iterator ivbo; + const STD_VECTOR<int>::const_iterator ivp_end = vp.end(); for (ivp = vp.begin(), ivbo = vbos.begin(); ivp != ivp_end; @@ -1283,14 +1283,14 @@ void MobileOpenGL2Graphics::finalize(ImageVertexes *restrict const vert) if (vert == nullptr) return; OpenGLGraphicsVertexes &ogl = vert->ogl; - const std::vector<int> &vp = ogl.mVp; - std::vector<int>::const_iterator ivp; - const std::vector<int>::const_iterator ivp_end = vp.end(); - std::vector<GLfloat*> &floatTexPool = ogl.mFloatTexPool; - std::vector<GLfloat*>::const_iterator ft; - const std::vector<GLfloat*>::const_iterator ft_end = floatTexPool.end(); - std::vector<GLuint> &vbos = ogl.mVbo; - std::vector<GLuint>::const_iterator ivbo; + const STD_VECTOR<int> &vp = ogl.mVp; + STD_VECTOR<int>::const_iterator ivp; + const STD_VECTOR<int>::const_iterator ivp_end = vp.end(); + STD_VECTOR<GLfloat*> &floatTexPool = ogl.mFloatTexPool; + STD_VECTOR<GLfloat*>::const_iterator ft; + const STD_VECTOR<GLfloat*>::const_iterator ft_end = floatTexPool.end(); + STD_VECTOR<GLuint> &vbos = ogl.mVbo; + STD_VECTOR<GLuint>::const_iterator ivbo; const int sz = CAST_S32(floatTexPool.size()); vbos.resize(sz); @@ -1305,7 +1305,7 @@ void MobileOpenGL2Graphics::finalize(ImageVertexes *restrict const vert) *ft, GL_STATIC_DRAW); } - for (std::vector<GLfloat*>::iterator it = floatTexPool.begin(); + for (STD_VECTOR<GLfloat*>::iterator it = floatTexPool.begin(); it != floatTexPool.end(); ++ it) { delete [] (*it); diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp index cc1812107..8118e96a4 100644 --- a/src/render/mobileopenglgraphics.cpp +++ b/src/render/mobileopenglgraphics.cpp @@ -617,19 +617,19 @@ inline void MobileOpenGLGraphics::drawVertexes(const OpenGLGraphicsVertexes &restrict ogl) restrict2 { - const std::vector<GLshort*> &shortVertPool = ogl.mShortVertPool; - std::vector<GLshort*>::const_iterator iv; - const std::vector<GLshort*>::const_iterator iv_end = shortVertPool.end(); - const std::vector<int> &vp = ogl.mVp; - std::vector<int>::const_iterator ivp; - const std::vector<int>::const_iterator ivp_end = vp.end(); + const STD_VECTOR<GLshort*> &shortVertPool = ogl.mShortVertPool; + STD_VECTOR<GLshort*>::const_iterator iv; + const STD_VECTOR<GLshort*>::const_iterator iv_end = shortVertPool.end(); + const STD_VECTOR<int> &vp = ogl.mVp; + STD_VECTOR<int>::const_iterator ivp; + const STD_VECTOR<int>::const_iterator ivp_end = vp.end(); // Draw a set of textured rectangles // if (OpenGLImageHelper::mTextureType == GL_TEXTURE_2D) { - const std::vector<GLfloat*> &floatTexPool = ogl.mFloatTexPool; - std::vector<GLfloat*>::const_iterator ft; - const std::vector<GLfloat*>::const_iterator + const STD_VECTOR<GLfloat*> &floatTexPool = ogl.mFloatTexPool; + STD_VECTOR<GLfloat*>::const_iterator ft; + const STD_VECTOR<GLfloat*>::const_iterator ft_end = floatTexPool.end(); for (iv = shortVertPool.begin(), ft = floatTexPool.begin(), @@ -818,7 +818,7 @@ void MobileOpenGLGraphics::calcTileVertexesInline(ImageVertexes * OpenGLGraphicsVertexes &ogl = vert->ogl; -// std::vector<int> *vps = ogl.getVp(); +// STD_VECTOR<int> *vps = ogl.getVp(); unsigned int vp = ogl.continueVp(); // Draw a set of textured rectangles diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp index f034cdc65..6950f4555 100644 --- a/src/render/modernopenglgraphics.cpp +++ b/src/render/modernopenglgraphics.cpp @@ -589,11 +589,11 @@ inline void ModernOpenGLGraphics::drawVertexes(const OpenGLGraphicsVertexes & restrict ogl) restrict2 { - const std::vector<int> &vp = ogl.mVp; - const std::vector<GLuint> &vbos = ogl.mVbo; - std::vector<int>::const_iterator ivp; - std::vector<GLuint>::const_iterator ivbo; - const std::vector<int>::const_iterator ivp_end = vp.end(); + const STD_VECTOR<int> &vp = ogl.mVp; + const STD_VECTOR<GLuint> &vbos = ogl.mVbo; + STD_VECTOR<int>::const_iterator ivp; + STD_VECTOR<GLuint>::const_iterator ivbo; + const STD_VECTOR<int>::const_iterator ivp_end = vp.end(); /* if (vp.size() != vbos.size()) @@ -1286,14 +1286,14 @@ void ModernOpenGLGraphics::finalize(ImageVertexes *restrict const vert) if (vert == nullptr) return; OpenGLGraphicsVertexes &ogl = vert->ogl; - const std::vector<int> &vp = ogl.mVp; - std::vector<int>::const_iterator ivp; - const std::vector<int>::const_iterator ivp_end = vp.end(); - std::vector<GLint*> &intTexPool = ogl.mIntTexPool; - std::vector<GLint*>::const_iterator ft; - const std::vector<GLint*>::const_iterator ft_end = intTexPool.end(); - std::vector<GLuint> &vbos = ogl.mVbo; - std::vector<GLuint>::const_iterator ivbo; + const STD_VECTOR<int> &vp = ogl.mVp; + STD_VECTOR<int>::const_iterator ivp; + const STD_VECTOR<int>::const_iterator ivp_end = vp.end(); + STD_VECTOR<GLint*> &intTexPool = ogl.mIntTexPool; + STD_VECTOR<GLint*>::const_iterator ft; + const STD_VECTOR<GLint*>::const_iterator ft_end = intTexPool.end(); + STD_VECTOR<GLuint> &vbos = ogl.mVbo; + STD_VECTOR<GLuint>::const_iterator ivbo; const int sz = CAST_S32(intTexPool.size()); vbos.resize(sz); @@ -1316,7 +1316,7 @@ void ModernOpenGLGraphics::finalize(ImageVertexes *restrict const vert) *ft, GL_STATIC_DRAW); } - for (std::vector<GLint*>::iterator it = intTexPool.begin(); + for (STD_VECTOR<GLint*>::iterator it = intTexPool.begin(); it != intTexPool.end(); ++ it) { delete [] (*it); diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp index 3ed186cdc..a03ae4341 100644 --- a/src/render/normalopenglgraphics.cpp +++ b/src/render/normalopenglgraphics.cpp @@ -913,19 +913,19 @@ inline void NormalOpenGLGraphics::drawVertexes(const OpenGLGraphicsVertexes &restrict ogl) restrict2 { - const std::vector<GLint*> &intVertPool = ogl.mIntVertPool; - std::vector<GLint*>::const_iterator iv; - const std::vector<GLint*>::const_iterator iv_end = intVertPool.end(); - const std::vector<int> &vp = ogl.mVp; - std::vector<int>::const_iterator ivp; - const std::vector<int>::const_iterator ivp_end = vp.end(); + const STD_VECTOR<GLint*> &intVertPool = ogl.mIntVertPool; + STD_VECTOR<GLint*>::const_iterator iv; + const STD_VECTOR<GLint*>::const_iterator iv_end = intVertPool.end(); + const STD_VECTOR<int> &vp = ogl.mVp; + STD_VECTOR<int>::const_iterator ivp; + const STD_VECTOR<int>::const_iterator ivp_end = vp.end(); // Draw a set of textured rectangles if (OpenGLImageHelper::mTextureType == GL_TEXTURE_2D) { - const std::vector<GLfloat*> &floatTexPool = ogl.mFloatTexPool; - std::vector<GLfloat*>::const_iterator ft; - const std::vector<GLfloat*>::const_iterator + const STD_VECTOR<GLfloat*> &floatTexPool = ogl.mFloatTexPool; + STD_VECTOR<GLfloat*>::const_iterator ft; + const STD_VECTOR<GLfloat*>::const_iterator ft_end = floatTexPool.end(); for (iv = intVertPool.begin(), ft = floatTexPool.begin(), @@ -938,9 +938,9 @@ inline void NormalOpenGLGraphics::drawVertexes(const } else { - const std::vector<GLint*> &intTexPool = ogl.mIntTexPool; - std::vector<GLint*>::const_iterator it; - const std::vector<GLint*>::const_iterator it_end = intTexPool.end(); + const STD_VECTOR<GLint*> &intTexPool = ogl.mIntTexPool; + STD_VECTOR<GLint*>::const_iterator it; + const STD_VECTOR<GLint*>::const_iterator it_end = intTexPool.end(); for (iv = intVertPool.begin(), it = intTexPool.begin(), ivp = vp.begin(); @@ -1158,7 +1158,7 @@ void NormalOpenGLGraphics::calcTileVertexesInline(ImageVertexes * OpenGLGraphicsVertexes &ogl = vert->ogl; -// std::vector<int> *vps = ogl.getVp(); +// STD_VECTOR<int> *vps = ogl.getVp(); unsigned int vp = ogl.continueVp(); // Draw a set of textured rectangles diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp index dac86b519..ff4a765bf 100644 --- a/src/render/nullopenglgraphics.cpp +++ b/src/render/nullopenglgraphics.cpp @@ -536,19 +536,19 @@ inline void NullOpenGLGraphics::drawVertexes(const OpenGLGraphicsVertexes &restrict ogl) restrict2 { - const std::vector<GLint*> &intVertPool = ogl.mIntVertPool; - std::vector<GLint*>::const_iterator iv; - const std::vector<GLint*>::const_iterator iv_end = intVertPool.end(); - const std::vector<int> &vp = ogl.mVp; - std::vector<int>::const_iterator ivp; - const std::vector<int>::const_iterator ivp_end = vp.end(); + const STD_VECTOR<GLint*> &intVertPool = ogl.mIntVertPool; + STD_VECTOR<GLint*>::const_iterator iv; + const STD_VECTOR<GLint*>::const_iterator iv_end = intVertPool.end(); + const STD_VECTOR<int> &vp = ogl.mVp; + STD_VECTOR<int>::const_iterator ivp; + const STD_VECTOR<int>::const_iterator ivp_end = vp.end(); // Draw a set of textured rectangles if (OpenGLImageHelper::mTextureType == GL_TEXTURE_2D) { - const std::vector<GLfloat*> &floatTexPool = ogl.mFloatTexPool; - std::vector<GLfloat*>::const_iterator ft; - const std::vector<GLfloat*>::const_iterator + const STD_VECTOR<GLfloat*> &floatTexPool = ogl.mFloatTexPool; + STD_VECTOR<GLfloat*>::const_iterator ft; + const STD_VECTOR<GLfloat*>::const_iterator ft_end = floatTexPool.end(); for (iv = intVertPool.begin(), ft = floatTexPool.begin(), @@ -561,9 +561,9 @@ inline void NullOpenGLGraphics::drawVertexes(const } else { - const std::vector<GLint*> &intTexPool = ogl.mIntTexPool; - std::vector<GLint*>::const_iterator it; - const std::vector<GLint*>::const_iterator it_end = intTexPool.end(); + const STD_VECTOR<GLint*> &intTexPool = ogl.mIntTexPool; + STD_VECTOR<GLint*>::const_iterator it; + const STD_VECTOR<GLint*>::const_iterator it_end = intTexPool.end(); for (iv = intVertPool.begin(), it = intTexPool.begin(), ivp = vp.begin(); @@ -815,7 +815,7 @@ void NullOpenGLGraphics::calcTileVertexesInline(ImageVertexes * OpenGLGraphicsVertexes &ogl = vert->ogl; -// std::vector<int> *vps = ogl.getVp(); +// STD_VECTOR<int> *vps = ogl.getVp(); unsigned int vp = ogl.continueVp(); // Draw a set of textured rectangles diff --git a/src/render/vertexes/imagevertexes.h b/src/render/vertexes/imagevertexes.h index 3a852f429..01390c450 100644 --- a/src/render/vertexes/imagevertexes.h +++ b/src/render/vertexes/imagevertexes.h @@ -33,7 +33,7 @@ class Image; -typedef std::vector<DoubleRect*> DoubleRects; +typedef STD_VECTOR<DoubleRect*> DoubleRects; class ImageVertexes final { @@ -52,7 +52,7 @@ class ImageVertexes final DoubleRects sdl; }; -typedef std::vector<ImageVertexes*> ImageVertexesVector; +typedef STD_VECTOR<ImageVertexes*> ImageVertexesVector; typedef ImageVertexesVector::iterator ImageCollectionIter; typedef ImageVertexesVector::const_iterator ImageCollectionCIter; diff --git a/src/render/vertexes/openglgraphicsvertexes.cpp b/src/render/vertexes/openglgraphicsvertexes.cpp index 7d7600ee1..a65f0e2b9 100644 --- a/src/render/vertexes/openglgraphicsvertexes.cpp +++ b/src/render/vertexes/openglgraphicsvertexes.cpp @@ -56,28 +56,28 @@ OpenGLGraphicsVertexes::~OpenGLGraphicsVertexes() void OpenGLGraphicsVertexes::clear() restrict2 { - for (std::vector<GLfloat*>::iterator it = mFloatTexPool.begin(); + for (STD_VECTOR<GLfloat*>::iterator it = mFloatTexPool.begin(); it != mFloatTexPool.end(); ++ it) { delete [] (*it); } mFloatTexPool.clear(); - for (std::vector<GLint*>::iterator it = mIntVertPool.begin(); + for (STD_VECTOR<GLint*>::iterator it = mIntVertPool.begin(); it != mIntVertPool.end(); ++ it) { delete [] (*it); } mIntVertPool.clear(); - for (std::vector<GLshort*>::iterator it = mShortVertPool.begin(); + for (STD_VECTOR<GLshort*>::iterator it = mShortVertPool.begin(); it != mShortVertPool.end(); ++ it) { delete [] (*it); } mShortVertPool.clear(); - for (std::vector<GLint*>::iterator it = mIntTexPool.begin(); + for (STD_VECTOR<GLint*>::iterator it = mIntTexPool.begin(); it != mIntTexPool.end(); ++ it) { delete [] (*it); diff --git a/src/render/vertexes/openglgraphicsvertexes.h b/src/render/vertexes/openglgraphicsvertexes.h index dd05c7e1c..023abf139 100644 --- a/src/render/vertexes/openglgraphicsvertexes.h +++ b/src/render/vertexes/openglgraphicsvertexes.h @@ -56,16 +56,16 @@ class OpenGLGraphicsVertexes final GLshort *switchShortVertArray() restrict2; - std::vector<GLfloat*> *getFloatTexPool() restrict2 A_WARN_UNUSED + STD_VECTOR<GLfloat*> *getFloatTexPool() restrict2 A_WARN_UNUSED { return &mFloatTexPool; } - std::vector<GLint*> *getIntVertPool() restrict2 A_WARN_UNUSED + STD_VECTOR<GLint*> *getIntVertPool() restrict2 A_WARN_UNUSED { return &mIntVertPool; } - std::vector<GLshort*> *getShortVertPool() restrict2 A_WARN_UNUSED + STD_VECTOR<GLshort*> *getShortVertPool() restrict2 A_WARN_UNUSED { return &mShortVertPool; } - std::vector<GLint*> *getIntTexPool() restrict2 A_WARN_UNUSED + STD_VECTOR<GLint*> *getIntTexPool() restrict2 A_WARN_UNUSED { return &mIntTexPool; } void switchVp(const int n) restrict2; @@ -82,7 +82,7 @@ class OpenGLGraphicsVertexes final void updateVp(const int n) restrict2; - std::vector<int> *getVp() restrict2 A_WARN_UNUSED + STD_VECTOR<int> *getVp() restrict2 A_WARN_UNUSED { return &mVp; } void init() restrict2; @@ -95,12 +95,12 @@ class OpenGLGraphicsVertexes final GLint *mIntTexArray; GLint *mIntVertArray; GLshort *mShortVertArray; - std::vector<int> mVp; - std::vector<GLfloat*> mFloatTexPool; - std::vector<GLint*> mIntVertPool; - std::vector<GLshort*> mShortVertPool; - std::vector<GLint*> mIntTexPool; - std::vector<GLuint> mVbo; + STD_VECTOR<int> mVp; + STD_VECTOR<GLfloat*> mFloatTexPool; + STD_VECTOR<GLint*> mIntVertPool; + STD_VECTOR<GLshort*> mShortVertPool; + STD_VECTOR<GLint*> mIntTexPool; + STD_VECTOR<GLuint> mVbo; }; extern unsigned int vertexBufSize; diff --git a/src/resources/animation/animation.h b/src/resources/animation/animation.h index 4a672aab2..a922f989b 100644 --- a/src/resources/animation/animation.h +++ b/src/resources/animation/animation.h @@ -79,7 +79,7 @@ class Animation final : public MemoryCounter void setLastFrameDelay(const int delay) noexcept2; - typedef std::vector<Frame> Frames; + typedef STD_VECTOR<Frame> Frames; typedef Frames::iterator FramesIter; typedef Frames::const_iterator FramesCIter; typedef Frames::reverse_iterator FramesRevIter; diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index c7d237115..888af7fe7 100644 --- a/src/resources/atlas/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -61,8 +61,8 @@ AtlasResource *AtlasManager::loadTextureAtlas(const std::string &name, const StringVect &files) { BLOCK_START("AtlasManager::loadTextureAtlas") - std::vector<TextureAtlas*> atlases; - std::vector<Image*> images; + STD_VECTOR<TextureAtlas*> atlases; + STD_VECTOR<Image*> images; AtlasResource *resource = new AtlasResource; loadImages(files, images); @@ -76,7 +76,7 @@ AtlasResource *AtlasManager::loadTextureAtlas(const std::string &name, // sorting images on atlases. simpleSort(name, atlases, images, maxSize); - FOR_EACH (std::vector<TextureAtlas*>::iterator, it, atlases) + FOR_EACH (STD_VECTOR<TextureAtlas*>::iterator, it, atlases) { TextureAtlas *const atlas = *it; if (atlas == nullptr) @@ -96,8 +96,8 @@ AtlasResource *AtlasManager::loadTextureAtlas(const std::string &name, AtlasResource *AtlasManager::loadEmptyAtlas(const std::string &name, const StringVect &files) { - std::vector<TextureAtlas*> atlases; - std::vector<Image*> images; + STD_VECTOR<TextureAtlas*> atlases; + STD_VECTOR<Image*> images; AtlasResource *resource = new AtlasResource; loadEmptyImages(files, images); @@ -105,7 +105,7 @@ AtlasResource *AtlasManager::loadEmptyAtlas(const std::string &name, // sorting images on atlases. emptySort(name, atlases, images); - FOR_EACH (std::vector<TextureAtlas*>::iterator, it, atlases) + FOR_EACH (STD_VECTOR<TextureAtlas*>::iterator, it, atlases) { TextureAtlas *const atlas = *it; if (atlas == nullptr) @@ -125,7 +125,7 @@ AtlasResource *AtlasManager::loadEmptyAtlas(const std::string &name, } void AtlasManager::loadImages(const StringVect &files, - std::vector<Image*> &images) + STD_VECTOR<Image*> &images) { BLOCK_START("AtlasManager::loadImages") @@ -175,7 +175,7 @@ void AtlasManager::loadImages(const StringVect &files, } void AtlasManager::loadEmptyImages(const StringVect &files, - std::vector<Image*> &images) + STD_VECTOR<Image*> &images) { BLOCK_START("AtlasManager::loadEmptyImages") @@ -202,8 +202,8 @@ void AtlasManager::loadEmptyImages(const StringVect &files, } void AtlasManager::simpleSort(const std::string &restrict name, - std::vector<TextureAtlas*> &restrict atlases, - const std::vector<Image*> &restrict images, + STD_VECTOR<TextureAtlas*> &restrict atlases, + const STD_VECTOR<Image*> &restrict images, int size) { BLOCK_START("AtlasManager::simpleSort") @@ -211,8 +211,8 @@ void AtlasManager::simpleSort(const std::string &restrict name, int y = 0; int tempHeight = 0; TextureAtlas *atlas = new TextureAtlas; - std::vector<Image*>::const_iterator it = images.begin(); - const std::vector<Image*>::const_iterator it_end = images.end(); + STD_VECTOR<Image*>::const_iterator it = images.begin(); + const STD_VECTOR<Image*>::const_iterator it_end = images.end(); for (it = images.begin(); it != it_end; ++ it) { const Image *const img = *it; @@ -273,13 +273,13 @@ void AtlasManager::simpleSort(const std::string &restrict name, } void AtlasManager::emptySort(const std::string &restrict name, - std::vector<TextureAtlas*> &restrict atlases, - const std::vector<Image*> &restrict images) + STD_VECTOR<TextureAtlas*> &restrict atlases, + const STD_VECTOR<Image*> &restrict images) { BLOCK_START("AtlasManager::simpleSort") TextureAtlas *atlas = new TextureAtlas; - std::vector<Image*>::const_iterator it = images.begin(); - const std::vector<Image*>::const_iterator it_end = images.end(); + STD_VECTOR<Image*>::const_iterator it = images.begin(); + const STD_VECTOR<Image*>::const_iterator it_end = images.end(); for (it = images.begin(); it != it_end; ++ it) { const Image *const img = *it; @@ -370,7 +370,7 @@ void AtlasManager::createSDLAtlas(TextureAtlas *const atlas) } // drawing SDL images to surface - FOR_EACH (std::vector<AtlasItem*>::iterator, it, atlas->items) + FOR_EACH (STD_VECTOR<AtlasItem*>::iterator, it, atlas->items) { AtlasItem *const item = *it; imageHelper->copySurfaceToImage(image, item->x, item->y, @@ -424,7 +424,7 @@ void AtlasManager::convertEmptyAtlas(TextureAtlas *const atlas) image->incRef(); - FOR_EACH (std::vector<AtlasItem*>::iterator, it, atlas->items) + FOR_EACH (STD_VECTOR<AtlasItem*>::iterator, it, atlas->items) { AtlasItem *const item = *it; // delete SDL Image @@ -471,7 +471,7 @@ void AtlasManager::convertAtlas(TextureAtlas *const atlas) image->incRef(); - FOR_EACH (std::vector<AtlasItem*>::iterator, it, atlas->items) + FOR_EACH (STD_VECTOR<AtlasItem*>::iterator, it, atlas->items) { AtlasItem *const item = *it; // delete SDL Image @@ -497,7 +497,7 @@ void AtlasManager::injectToResources(const AtlasResource *const resource) { if (resource == nullptr) return; - FOR_EACH (std::vector<TextureAtlas*>::const_iterator, + FOR_EACH (STD_VECTOR<TextureAtlas*>::const_iterator, it, resource->atlases) { // add each atlas image to resources @@ -507,7 +507,7 @@ void AtlasManager::injectToResources(const AtlasResource *const resource) Image *const image = atlas->atlasImage; if (image != nullptr) ResourceManager::addResource(atlas->name, image); - FOR_EACH (std::vector<AtlasItem*>::iterator, it2, atlas->items) + FOR_EACH (STD_VECTOR<AtlasItem*>::iterator, it2, atlas->items) { AtlasItem *const item = *it2; if (item == nullptr) @@ -523,7 +523,7 @@ void AtlasManager::moveToDeleted(AtlasResource *const resource) { if (resource == nullptr) return; - FOR_EACH (std::vector<TextureAtlas*>::iterator, it, resource->atlases) + FOR_EACH (STD_VECTOR<TextureAtlas*>::iterator, it, resource->atlases) { // move each atlas image to deleted TextureAtlas *const atlas = *it; @@ -535,7 +535,7 @@ void AtlasManager::moveToDeleted(AtlasResource *const resource) // move each atlas image to deleted ResourceManager::moveToDeleted(image); } - FOR_EACH (std::vector<AtlasItem*>::iterator, it2, atlas->items) + FOR_EACH (STD_VECTOR<AtlasItem*>::iterator, it2, atlas->items) { AtlasItem *const item = *it2; if (item != nullptr) diff --git a/src/resources/atlas/atlasmanager.h b/src/resources/atlas/atlasmanager.h index 13db9717e..1e5de93b9 100644 --- a/src/resources/atlas/atlasmanager.h +++ b/src/resources/atlas/atlasmanager.h @@ -53,18 +53,18 @@ class AtlasManager final private: static void loadImages(const StringVect &files, - std::vector<Image*> &images); + STD_VECTOR<Image*> &images); static void loadEmptyImages(const StringVect &files, - std::vector<Image*> &images); + STD_VECTOR<Image*> &images); static void emptySort(const std::string &restrict name, - std::vector<TextureAtlas*> &restrict atlases, - const std::vector<Image*> &restrict images); + STD_VECTOR<TextureAtlas*> &restrict atlases, + const STD_VECTOR<Image*> &restrict images); static void simpleSort(const std::string &restrict name, - std::vector<TextureAtlas*> &restrict atlases, - const std::vector<Image*> &restrict images, + STD_VECTOR<TextureAtlas*> &restrict atlases, + const STD_VECTOR<Image*> &restrict images, int size); static void createSDLAtlas(TextureAtlas *const atlas) A_NONNULL(1); diff --git a/src/resources/atlas/atlasresource.cpp b/src/resources/atlas/atlasresource.cpp index 51a807975..b97823ebb 100644 --- a/src/resources/atlas/atlasresource.cpp +++ b/src/resources/atlas/atlasresource.cpp @@ -31,12 +31,12 @@ AtlasResource::~AtlasResource() { - FOR_EACH (std::vector<TextureAtlas*>::iterator, it, atlases) + FOR_EACH (STD_VECTOR<TextureAtlas*>::iterator, it, atlases) { TextureAtlas *const atlas = *it; if (atlas != nullptr) { - FOR_EACH (std::vector<AtlasItem*>::iterator, it2, atlas->items) + FOR_EACH (STD_VECTOR<AtlasItem*>::iterator, it2, atlas->items) { AtlasItem *const item = *it2; if (item != nullptr) @@ -80,7 +80,7 @@ int AtlasResource::calcMemoryLocal() const int AtlasResource::calcMemoryChilds(const int level) const { int sz = 0; - FOR_EACH (std::vector<TextureAtlas*>::const_iterator, it, atlases) + FOR_EACH (STD_VECTOR<TextureAtlas*>::const_iterator, it, atlases) { TextureAtlas *const atlas = *it; sz += atlas->calcMemory(level + 1); diff --git a/src/resources/atlas/atlasresource.h b/src/resources/atlas/atlasresource.h index ba0d441ea..60be25c1d 100644 --- a/src/resources/atlas/atlasresource.h +++ b/src/resources/atlas/atlasresource.h @@ -48,7 +48,7 @@ class AtlasResource final : public Resource int calcMemoryChilds(const int level) const override final; - std::vector<TextureAtlas*> atlases; + STD_VECTOR<TextureAtlas*> atlases; }; #endif // USE_OPENGL diff --git a/src/resources/atlas/textureatlas.h b/src/resources/atlas/textureatlas.h index a1fe4d145..ff74049d5 100644 --- a/src/resources/atlas/textureatlas.h +++ b/src/resources/atlas/textureatlas.h @@ -59,7 +59,7 @@ struct TextureAtlas final : public MemoryCounter int calcMemoryChilds(const int level) const override final { int sz = 0; - FOR_EACH (std::vector<AtlasItem*>::const_iterator, it, items) + FOR_EACH (STD_VECTOR<AtlasItem*>::const_iterator, it, items) { AtlasItem *const item = *it; sz += item->calcMemory(level + 1); @@ -74,7 +74,7 @@ struct TextureAtlas final : public MemoryCounter Image *atlasImage; int width; int height; - std::vector <AtlasItem*> items; + STD_VECTOR <AtlasItem*> items; }; #endif // USE_OPENGL diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index d0511e872..326d5fd9a 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -240,7 +240,7 @@ void BeingInfo::addMenu(const std::string &name, const std::string &command) mMenu.push_back(BeingMenuItem(name, command)); } -const std::vector<BeingMenuItem> &BeingInfo::getMenu() const +const STD_VECTOR<BeingMenuItem> &BeingInfo::getMenu() const { return mMenu; } diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index 531392e99..7e016d580 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -328,7 +328,7 @@ class BeingInfo final void addMenu(const std::string &name, const std::string &command); - const std::vector<BeingMenuItem> &getMenu() const A_CONST; + const STD_VECTOR<BeingMenuItem> &getMenu() const A_CONST; void setString(const int idx, const std::string &value) @@ -353,7 +353,7 @@ class BeingInfo final CursorT mHoverCursor; ItemSoundEvents mSounds; Attacks mAttacks; - std::vector<BeingMenuItem> mMenu; + STD_VECTOR<BeingMenuItem> mMenu; std::map<int, std::string> mStrings; std::string mCurrency; unsigned char mBlockWalkMask; diff --git a/src/resources/db/chardb.cpp b/src/resources/db/chardb.cpp index fe87ea157..915c3444b 100644 --- a/src/resources/db/chardb.cpp +++ b/src/resources/db/chardb.cpp @@ -40,7 +40,7 @@ namespace unsigned mMaxLook = 0; unsigned mMinRace = 0; unsigned mMaxRace = 30; - std::vector<BeingSlot> mDefaultItems; + STD_VECTOR<BeingSlot> mDefaultItems; } // namespace void CharDB::load() @@ -181,7 +181,7 @@ unsigned CharDB::getMaxRace() return mMaxRace; } -const std::vector<BeingSlot> &CharDB::getDefaultItems() +const STD_VECTOR<BeingSlot> &CharDB::getDefaultItems() { return mDefaultItems; } diff --git a/src/resources/db/chardb.h b/src/resources/db/chardb.h index 083e7c12d..f940d3059 100644 --- a/src/resources/db/chardb.h +++ b/src/resources/db/chardb.h @@ -69,7 +69,7 @@ namespace CharDB unsigned getMaxRace() A_WARN_UNUSED; - const std::vector<BeingSlot> &getDefaultItems() A_WARN_UNUSED; + const STD_VECTOR<BeingSlot> &getDefaultItems() A_WARN_UNUSED; } // namespace CharDB #endif // RESOURCES_DB_CHARDB_H diff --git a/src/resources/db/deaddb.cpp b/src/resources/db/deaddb.cpp index bcca023eb..8c273e239 100644 --- a/src/resources/db/deaddb.cpp +++ b/src/resources/db/deaddb.cpp @@ -32,7 +32,7 @@ namespace { bool mLoaded = false; - std::vector<std::string> mMessages; + STD_VECTOR<std::string> mMessages; } // namespace void DeadDB::load() diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index 57000cf95..e23623367 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -1050,10 +1050,10 @@ static void loadOrderSprite(ItemInfo *const itemInfo, itemInfo->setDrawPriority(direction, priority); } -std::string ItemDB::getNamesStr(const std::vector<int> &parts) +std::string ItemDB::getNamesStr(const STD_VECTOR<int> &parts) { std::string str; - FOR_EACH (std::vector<int>::const_iterator, it, parts) + FOR_EACH (STD_VECTOR<int>::const_iterator, it, parts) { const int id = *it; if (exists(id)) diff --git a/src/resources/db/itemdb.h b/src/resources/db/itemdb.h index 34421d84b..96de60b6a 100644 --- a/src/resources/db/itemdb.h +++ b/src/resources/db/itemdb.h @@ -63,7 +63,7 @@ namespace ItemDB const ItemDB::ItemInfos &getItemInfos(); - std::string getNamesStr(const std::vector<int> &parts); + std::string getNamesStr(const STD_VECTOR<int> &parts); #ifdef UNITTESTS ItemDB::NamedItemInfos &getNamedItemInfosTest(); diff --git a/src/resources/db/itemoptiondb.cpp b/src/resources/db/itemoptiondb.cpp index bd78f95c5..2f7fc1ccd 100644 --- a/src/resources/db/itemoptiondb.cpp +++ b/src/resources/db/itemoptiondb.cpp @@ -33,7 +33,7 @@ namespace { ItemOptionDb::OptionInfos mOptions; - const std::vector<ItemFieldType*> mEmptyOption; + const STD_VECTOR<ItemFieldType*> mEmptyOption; bool mLoaded = false; } // namespace @@ -48,7 +48,7 @@ void ItemOptionDb::load() mLoaded = true; } -static void addFieldByName(std::vector<ItemFieldType*> &options, +static void addFieldByName(STD_VECTOR<ItemFieldType*> &options, XmlNodeConstPtr node, const ItemFieldDb::FieldInfos &fields, const char *const name) @@ -68,7 +68,7 @@ static void addFieldByName(std::vector<ItemFieldType*> &options, } } -static void readOptionFields(std::vector<ItemFieldType*> &options, +static void readOptionFields(STD_VECTOR<ItemFieldType*> &options, XmlNodeConstPtr node, const ItemFieldDb::FieldInfos &fields) { @@ -127,7 +127,7 @@ void ItemOptionDb::loadXmlFile(const std::string &fileName, reportAlways("Empty id field in ItemOptionDb"); continue; } - std::vector<ItemFieldType*> &options = mOptions[id]; + STD_VECTOR<ItemFieldType*> &options = mOptions[id]; readOptionFields(options, node, requiredFields); readOptionFields(options, node, addFields); } @@ -140,7 +140,7 @@ void ItemOptionDb::unload() mLoaded = false; } -const std::vector<ItemFieldType*> &ItemOptionDb::getFields(const int id) +const STD_VECTOR<ItemFieldType*> &ItemOptionDb::getFields(const int id) { OptionInfos::const_iterator it = mOptions.find(id); if (it == mOptions.end()) diff --git a/src/resources/db/itemoptiondb.h b/src/resources/db/itemoptiondb.h index a4fb82638..8d9bc9968 100644 --- a/src/resources/db/itemoptiondb.h +++ b/src/resources/db/itemoptiondb.h @@ -41,9 +41,9 @@ namespace ItemOptionDb void loadXmlFile(const std::string &fileName, const SkipError skipError); - const std::vector<ItemFieldType*> &getFields(const int id); + const STD_VECTOR<ItemFieldType*> &getFields(const int id); - typedef std::map<int, std::vector<ItemFieldType*> > OptionInfos; + typedef std::map<int, STD_VECTOR<ItemFieldType*> > OptionInfos; } // namespace ItemOptionDb #endif // RESOURCES_DB_ITEMOPTIONDB_H diff --git a/src/resources/db/networkdb.h b/src/resources/db/networkdb.h index 697adbc44..0541f9c1f 100644 --- a/src/resources/db/networkdb.h +++ b/src/resources/db/networkdb.h @@ -30,7 +30,7 @@ typedef std::map<int32_t, int32_t> NetworkInPacketInfos; typedef NetworkInPacketInfos::const_iterator NetworkInPacketInfosIter; -typedef std::vector<int> NetworkRemovePacketInfos; +typedef STD_VECTOR<int> NetworkRemovePacketInfos; typedef NetworkRemovePacketInfos::const_iterator NetworkRemovePacketInfosIter; namespace NetworkDb diff --git a/src/resources/db/questdb.cpp b/src/resources/db/questdb.cpp index 6ac2c7f34..44c59226c 100644 --- a/src/resources/db/questdb.cpp +++ b/src/resources/db/questdb.cpp @@ -39,8 +39,8 @@ namespace // quest variables: var, (val1, val2, val3, time) NpcQuestVarMap mVars; // quests: var, quests - std::map<int, std::vector<QuestItem*> > mQuests; - std::vector<QuestEffect*> mAllEffects; + std::map<int, STD_VECTOR<QuestItem*> > mQuests; + STD_VECTOR<QuestEffect*> mAllEffects; } // namespace void QuestDb::load() @@ -213,11 +213,11 @@ void QuestDb::loadXmlFile(const std::string &fileName, void QuestDb::unload() { - for (std::map<int, std::vector<QuestItem*> >::iterator it + for (std::map<int, STD_VECTOR<QuestItem*> >::iterator it = mQuests.begin(), it_end = mQuests.end(); it != it_end; ++ it) { - std::vector<QuestItem*> &quests = (*it).second; - for (std::vector<QuestItem*>::iterator it2 = quests.begin(), + STD_VECTOR<QuestItem*> &quests = (*it).second; + for (STD_VECTOR<QuestItem*>::iterator it2 = quests.begin(), it2_end = quests.end(); it2 != it2_end; ++ it2) { delete *it2; @@ -233,26 +233,26 @@ NpcQuestVarMap *QuestDb::getVars() return &mVars; } -std::map<int, std::vector<QuestItem*> > *QuestDb::getQuests() +std::map<int, STD_VECTOR<QuestItem*> > *QuestDb::getQuests() { return &mQuests; } -std::vector<QuestEffect*> *QuestDb::getAllEffects() +STD_VECTOR<QuestEffect*> *QuestDb::getAllEffects() { return &mAllEffects; } std::string QuestDb::getName(const int id) { - std::map<int, std::vector<QuestItem*> >::const_iterator it = + std::map<int, STD_VECTOR<QuestItem*> >::const_iterator it = mQuests.find(id); if (it == mQuests.end()) { // TRANSLATORS: quests window quest name return _("unknown"); } - const std::vector<QuestItem*> &items = (*it).second; + const STD_VECTOR<QuestItem*> &items = (*it).second; if (items.empty()) { // TRANSLATORS: quests window quest name diff --git a/src/resources/db/questdb.h b/src/resources/db/questdb.h index 1bec2cc4e..865f917fe 100644 --- a/src/resources/db/questdb.h +++ b/src/resources/db/questdb.h @@ -45,9 +45,9 @@ namespace QuestDb NpcQuestVarMap *getVars(); - std::map<int, std::vector<QuestItem*> > *getQuests(); + std::map<int, STD_VECTOR<QuestItem*> > *getQuests(); - std::vector<QuestEffect*> *getAllEffects(); + STD_VECTOR<QuestEffect*> *getAllEffects(); std::string getName(const int id); } // namespace QuestDb diff --git a/src/resources/db/sounddb.cpp b/src/resources/db/sounddb.cpp index 0907f5cdc..90dc9fe00 100644 --- a/src/resources/db/sounddb.cpp +++ b/src/resources/db/sounddb.cpp @@ -32,7 +32,7 @@ namespace { std::string mDefault; - std::vector<std::string> mSounds; + STD_VECTOR<std::string> mSounds; } // namespace void SoundDB::load() diff --git a/src/resources/db/statdb.cpp b/src/resources/db/statdb.cpp index 26734bdb3..08fef09d6 100644 --- a/src/resources/db/statdb.cpp +++ b/src/resources/db/statdb.cpp @@ -35,9 +35,9 @@ namespace { bool mLoaded = false; - std::vector<BasicStat> mBasicStats; - std::map<std::string, std::vector<BasicStat> > mStats; - std::vector<std::string> mPages; + STD_VECTOR<BasicStat> mBasicStats; + std::map<std::string, STD_VECTOR<BasicStat> > mStats; + STD_VECTOR<std::string> mPages; } // namespace void StatDb::addDefaultStats() @@ -68,17 +68,17 @@ void StatDb::addDefaultStats() _("Luck"))); } -const std::vector<BasicStat> &StatDb::getBasicStats() +const STD_VECTOR<BasicStat> &StatDb::getBasicStats() { return mBasicStats; } -const std::vector<BasicStat> &StatDb::getStats(const std::string &page) +const STD_VECTOR<BasicStat> &StatDb::getStats(const std::string &page) { return mStats[page]; } -const std::vector<std::string> &StatDb::getPages() +const STD_VECTOR<std::string> &StatDb::getPages() { return mPages; } @@ -135,7 +135,7 @@ static void loadStats(XmlNodeConstPtr rootNode, const std::string &page) { const int maxAttr = static_cast<int>(Attributes::MAX_ATTRIBUTE); - std::vector<BasicStat> &stats = mStats[page]; + STD_VECTOR<BasicStat> &stats = mStats[page]; mPages.push_back(page); for_each_xml_child_node(node, rootNode) { diff --git a/src/resources/db/statdb.h b/src/resources/db/statdb.h index 898f0af63..73b24894b 100644 --- a/src/resources/db/statdb.h +++ b/src/resources/db/statdb.h @@ -40,11 +40,11 @@ namespace StatDb void addDefaultStats(); - const std::vector<BasicStat> &getBasicStats(); + const STD_VECTOR<BasicStat> &getBasicStats(); - const std::vector<BasicStat> &getStats(const std::string &page); + const STD_VECTOR<BasicStat> &getStats(const std::string &page); - const std::vector<std::string> &getPages(); + const STD_VECTOR<std::string> &getPages(); } // namespace StatDb #endif // RESOURCES_DB_STATDB_H diff --git a/src/resources/db/unitsdb.cpp b/src/resources/db/unitsdb.cpp index 998dd7230..bf498411b 100644 --- a/src/resources/db/unitsdb.cpp +++ b/src/resources/db/unitsdb.cpp @@ -52,7 +52,7 @@ namespace { A_DEFAULT_COPY(UnitDescription) - std::vector<struct UnitLevel> levels; + STD_VECTOR<struct UnitLevel> levels; double conversion; bool mix; }; diff --git a/src/resources/db/weaponsdb.h b/src/resources/db/weaponsdb.h index e30b4f544..a957347bc 100644 --- a/src/resources/db/weaponsdb.h +++ b/src/resources/db/weaponsdb.h @@ -25,7 +25,7 @@ #include "localconsts.h" -typedef std::vector<int> WeaponsInfos; +typedef STD_VECTOR<int> WeaponsInfos; typedef WeaponsInfos::const_iterator WeaponsInfosIter; namespace WeaponsDB diff --git a/src/resources/dye/dyepalette.h b/src/resources/dye/dyepalette.h index 95a26ca52..2db7bd13b 100644 --- a/src/resources/dye/dyepalette.h +++ b/src/resources/dye/dyepalette.h @@ -181,7 +181,7 @@ class DyePalette final #ifndef UNITTESTS private: #endif // UNITTESTS - std::vector<DyeColor> mColors; + STD_VECTOR<DyeColor> mColors; }; #endif // RESOURCES_DYE_DYEPALETTE_H diff --git a/src/resources/dye/dyepalette_replaceacolor.cpp b/src/resources/dye/dyepalette_replaceacolor.cpp index 27c0567cf..256efb8bb 100644 --- a/src/resources/dye/dyepalette_replaceacolor.cpp +++ b/src/resources/dye/dyepalette_replaceacolor.cpp @@ -39,7 +39,7 @@ PRAGMA48(GCC diagnostic pop) void DyePalette::replaceAColorDefault(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector<DyeColor>::const_iterator it_end = mColors.end(); + STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); if ((sz == 0u) || (pixels == nullptr)) return; @@ -52,7 +52,7 @@ void DyePalette::replaceAColorDefault(uint32_t *restrict pixels, uint8_t *const p = reinterpret_cast<uint8_t *>(&pixels[ptr]); const unsigned int data = pixels[ptr]; - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -94,7 +94,7 @@ void DyePalette::replaceAColorDefault(uint32_t *restrict pixels, uint8_t *const p = reinterpret_cast<uint8_t *>(pixels); const unsigned int data = *pixels; - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -141,7 +141,7 @@ __attribute__ ((target ("sse2"))) void DyePalette::replaceAColorSse2(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector<DyeColor>::const_iterator it_end = mColors.end(); + STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); if ((sz == 0u) || (pixels == nullptr)) return; @@ -156,7 +156,7 @@ void DyePalette::replaceAColorSse2(uint32_t *restrict pixels, __m128i base = _mm_loadu_si128(reinterpret_cast<__m128i*>( &pixels[ptr])); - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -182,7 +182,7 @@ void DyePalette::replaceAColorSse2(uint32_t *restrict pixels, uint8_t *const p = reinterpret_cast<uint8_t *>(&pixels[ptr]); const unsigned int data = pixels[ptr]; - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -212,7 +212,7 @@ __attribute__ ((target ("avx2"))) void DyePalette::replaceAColorAvx2(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector<DyeColor>::const_iterator it_end = mColors.end(); + STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); if ((sz == 0u) || (pixels == nullptr)) return; @@ -227,7 +227,7 @@ void DyePalette::replaceAColorAvx2(uint32_t *restrict pixels, __m256i base = _mm256_loadu_si256(reinterpret_cast<__m256i*>( &pixels[ptr])); - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -253,7 +253,7 @@ void DyePalette::replaceAColorAvx2(uint32_t *restrict pixels, uint8_t *const p = reinterpret_cast<uint8_t *>(&pixels[ptr]); const unsigned int data = pixels[ptr]; - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; diff --git a/src/resources/dye/dyepalette_replaceaoglcolor.cpp b/src/resources/dye/dyepalette_replaceaoglcolor.cpp index 69c3370a4..4d4588bb5 100644 --- a/src/resources/dye/dyepalette_replaceaoglcolor.cpp +++ b/src/resources/dye/dyepalette_replaceaoglcolor.cpp @@ -41,7 +41,7 @@ PRAGMA48(GCC diagnostic pop) void DyePalette::replaceAOGLColorDefault(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector<DyeColor>::const_iterator it_end = mColors.end(); + STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); if (sz == 0u || pixels == nullptr) return; @@ -54,7 +54,7 @@ void DyePalette::replaceAOGLColorDefault(uint32_t *restrict pixels, uint8_t *const p = reinterpret_cast<uint8_t *>(&pixels[ptr]); const unsigned int data = pixels[ptr]; - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -96,7 +96,7 @@ void DyePalette::replaceAOGLColorDefault(uint32_t *restrict pixels, uint8_t *const p = reinterpret_cast<uint8_t *>(pixels); const unsigned int data = *pixels; - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -144,7 +144,7 @@ __attribute__ ((target ("sse2"))) void DyePalette::replaceAOGLColorSse2(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector<DyeColor>::const_iterator it_end = mColors.end(); + STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); if (sz == 0u || pixels == nullptr) return; @@ -160,7 +160,7 @@ void DyePalette::replaceAOGLColorSse2(uint32_t *restrict pixels, __m128i base = _mm_loadu_si128(reinterpret_cast<__m128i*>( &pixels[ptr])); - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -188,7 +188,7 @@ void DyePalette::replaceAOGLColorSse2(uint32_t *restrict pixels, uint8_t *const p = reinterpret_cast<uint8_t *>(&pixels[ptr]); const unsigned int data = pixels[ptr]; - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -230,7 +230,7 @@ void DyePalette::replaceAOGLColorSse2(uint32_t *restrict pixels, uint8_t *const p = reinterpret_cast<uint8_t *>(pixels); const unsigned int data = *pixels; - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -270,7 +270,7 @@ __attribute__ ((target ("avx2"))) void DyePalette::replaceAOGLColorAvx2(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector<DyeColor>::const_iterator it_end = mColors.end(); + STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); if (sz == 0u || pixels == nullptr) return; @@ -286,7 +286,7 @@ void DyePalette::replaceAOGLColorAvx2(uint32_t *restrict pixels, __m256i base = _mm256_loadu_si256(reinterpret_cast<__m256i*>( &pixels[ptr])); - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -316,7 +316,7 @@ void DyePalette::replaceAOGLColorAvx2(uint32_t *restrict pixels, uint8_t *const p = reinterpret_cast<uint8_t *>(&pixels[ptr]); const unsigned int data = pixels[ptr]; - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -358,7 +358,7 @@ void DyePalette::replaceAOGLColorAvx2(uint32_t *restrict pixels, uint8_t *const p = reinterpret_cast<uint8_t *>(pixels); const unsigned int data = *pixels; - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; diff --git a/src/resources/dye/dyepalette_replacescolor.cpp b/src/resources/dye/dyepalette_replacescolor.cpp index 469d5507c..1d1c2676e 100644 --- a/src/resources/dye/dyepalette_replacescolor.cpp +++ b/src/resources/dye/dyepalette_replacescolor.cpp @@ -39,7 +39,7 @@ PRAGMA48(GCC diagnostic pop) void DyePalette::replaceSColorDefault(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector<DyeColor>::const_iterator it_end = mColors.end(); + STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); if (sz == 0u || pixels == nullptr) return; @@ -57,7 +57,7 @@ void DyePalette::replaceSColorDefault(uint32_t *restrict pixels, const unsigned int data = pixels[ptr] & 0xffffff00; #endif // SDL_BYTEORDER == SDL_BIG_ENDIAN - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -96,7 +96,7 @@ void DyePalette::replaceSColorDefault(uint32_t *restrict pixels, const unsigned int data = (*pixels) & 0xffffff00; #endif // SDL_BYTEORDER == SDL_BIG_ENDIAN - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -139,7 +139,7 @@ __attribute__ ((target ("sse2"))) void DyePalette::replaceSColorSse2(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector<DyeColor>::const_iterator it_end = mColors.end(); + STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); if (sz == 0u || pixels == nullptr) return; @@ -155,7 +155,7 @@ void DyePalette::replaceSColorSse2(uint32_t *restrict pixels, __m128i base = _mm_loadu_si128(reinterpret_cast<__m128i*>( &pixels[ptr])); - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -187,7 +187,7 @@ void DyePalette::replaceSColorSse2(uint32_t *restrict pixels, const unsigned int data = pixels[ptr] & 0xffffff00; #endif // SDL_BYTEORDER == SDL_BIG_ENDIAN - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -220,7 +220,7 @@ __attribute__ ((target ("avx2"))) void DyePalette::replaceSColorAvx2(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector<DyeColor>::const_iterator it_end = mColors.end(); + STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); if (sz == 0u || pixels == nullptr) return; @@ -236,7 +236,7 @@ void DyePalette::replaceSColorAvx2(uint32_t *restrict pixels, __m256i base = _mm256_loadu_si256(reinterpret_cast<__m256i*>( &pixels[ptr])); - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -268,7 +268,7 @@ void DyePalette::replaceSColorAvx2(uint32_t *restrict pixels, const unsigned int data = pixels[ptr] & 0xffffff00; #endif // SDL_BYTEORDER == SDL_BIG_ENDIAN - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; diff --git a/src/resources/dye/dyepalette_replacesoglcolor.cpp b/src/resources/dye/dyepalette_replacesoglcolor.cpp index aaf05a66e..b5c2c621a 100644 --- a/src/resources/dye/dyepalette_replacesoglcolor.cpp +++ b/src/resources/dye/dyepalette_replacesoglcolor.cpp @@ -41,7 +41,7 @@ PRAGMA48(GCC diagnostic pop) void DyePalette::replaceSOGLColorDefault(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector<DyeColor>::const_iterator it_end = mColors.end(); + STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); if ((sz == 0u) || (pixels == nullptr)) return; @@ -59,7 +59,7 @@ void DyePalette::replaceSOGLColorDefault(uint32_t *restrict pixels, const unsigned int data = (pixels[ptr]) & 0x00ffffff; #endif // SDL_BYTEORDER == SDL_BIG_ENDIAN - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -101,7 +101,7 @@ void DyePalette::replaceSOGLColorDefault(uint32_t *restrict pixels, const unsigned int data = (*pixels) & 0x00ffffff; #endif // SDL_BYTEORDER == SDL_BIG_ENDIAN - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -144,7 +144,7 @@ __attribute__ ((target ("sse2"))) void DyePalette::replaceSOGLColorSse2(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector<DyeColor>::const_iterator it_end = mColors.end(); + STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); if ((sz == 0u) || (pixels == nullptr)) return; @@ -161,7 +161,7 @@ void DyePalette::replaceSOGLColorSse2(uint32_t *restrict pixels, __m128i base = _mm_loadu_si128(reinterpret_cast<__m128i*>( &pixels[ptr])); - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -195,7 +195,7 @@ void DyePalette::replaceSOGLColorSse2(uint32_t *restrict pixels, const unsigned int data = (pixels[ptr]) & 0x00ffffff; #endif // SDL_BYTEORDER == SDL_BIG_ENDIAN - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -237,7 +237,7 @@ void DyePalette::replaceSOGLColorSse2(uint32_t *restrict pixels, const unsigned int data = (*pixels) & 0x00ffffff; #endif // SDL_BYTEORDER == SDL_BIG_ENDIAN - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -272,7 +272,7 @@ __attribute__ ((target ("avx2"))) void DyePalette::replaceSOGLColorAvx2(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector<DyeColor>::const_iterator it_end = mColors.end(); + STD_VECTOR<DyeColor>::const_iterator it_end = mColors.end(); const size_t sz = mColors.size(); if ((sz == 0u) || (pixels == nullptr)) return; @@ -289,7 +289,7 @@ void DyePalette::replaceSOGLColorAvx2(uint32_t *restrict pixels, __m256i base = _mm256_loadu_si256(reinterpret_cast<__m256i*>( &pixels[ptr])); - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -325,7 +325,7 @@ void DyePalette::replaceSOGLColorAvx2(uint32_t *restrict pixels, const unsigned int data = (pixels[ptr]) & 0x00ffffff; #endif // SDL_BYTEORDER == SDL_BIG_ENDIAN - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; @@ -367,7 +367,7 @@ void DyePalette::replaceSOGLColorAvx2(uint32_t *restrict pixels, const unsigned int data = (*pixels) & 0x00ffffff; #endif // SDL_BYTEORDER == SDL_BIG_ENDIAN - std::vector<DyeColor>::const_iterator it = mColors.begin(); + STD_VECTOR<DyeColor>::const_iterator it = mColors.begin(); while (it != it_end) { const DyeColor &col = *it; diff --git a/src/resources/horseinfo.h b/src/resources/horseinfo.h index 6b628dfcb..1ff800186 100644 --- a/src/resources/horseinfo.h +++ b/src/resources/horseinfo.h @@ -48,8 +48,8 @@ struct HorseInfo final A_DELETE_COPY(HorseInfo) - std::vector<SpriteReference*> downSprites; - std::vector<SpriteReference*> upSprites; + STD_VECTOR<SpriteReference*> downSprites; + STD_VECTOR<SpriteReference*> upSprites; HorseOffset offsets[10]; // by direction }; diff --git a/src/resources/imageset.h b/src/resources/imageset.h index 9aaad6e4b..78907fbba 100644 --- a/src/resources/imageset.h +++ b/src/resources/imageset.h @@ -62,7 +62,7 @@ class ImageSet notfinal : public Resource int getHeight() const noexcept2 A_WARN_UNUSED { return mHeight; } - typedef std::vector<Image*>::size_type size_type; + typedef STD_VECTOR<Image*>::size_type size_type; Image* get(const size_type i) const A_WARN_UNUSED; @@ -81,13 +81,13 @@ class ImageSet notfinal : public Resource void setOffsetY(const int n) noexcept2 { mOffsetY = n; } - const std::vector<Image*> &getImages() const noexcept2 A_WARN_UNUSED + const STD_VECTOR<Image*> &getImages() const noexcept2 A_WARN_UNUSED { return mImages; } int calcMemoryLocal() const override; private: - std::vector<Image*> mImages; + STD_VECTOR<Image*> mImages; int mWidth; /**< Width of the images in the image set. */ int mHeight; /**< Height of the images in the image set. */ diff --git a/src/resources/item/complexitem.cpp b/src/resources/item/complexitem.cpp index b9de8dbe1..1fd703f8c 100644 --- a/src/resources/item/complexitem.cpp +++ b/src/resources/item/complexitem.cpp @@ -62,7 +62,7 @@ void ComplexItem::addChild(const Item *const item, return; increaseQuantity(amount); Item *child = nullptr; - FOR_EACH (std::vector<Item*>::iterator, it, mChildItems) + FOR_EACH (STD_VECTOR<Item*>::iterator, it, mChildItems) { Item *const item1 = *it; if (item1->getId() == item->getId() && diff --git a/src/resources/item/complexitem.h b/src/resources/item/complexitem.h index 6103f23b6..aa41fb3fd 100644 --- a/src/resources/item/complexitem.h +++ b/src/resources/item/complexitem.h @@ -55,11 +55,11 @@ class ComplexItem final : public Item void addChild(const Item *const item, const int amount); - const std::vector<Item*> &getChilds() const noexcept2 A_WARN_UNUSED + const STD_VECTOR<Item*> &getChilds() const noexcept2 A_WARN_UNUSED { return mChildItems; } protected: - std::vector<Item*> mChildItems; + STD_VECTOR<Item*> mChildItems; }; #endif // RESOURCES_ITEM_COMPLEXITEM_H diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index dd91dc738..a80442882 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -338,7 +338,7 @@ class ItemInfo final // sprite, <itemfrom, itemto> [direction] SpriteToItemMap *mSpriteToItemReplaceMap[10]; - std::vector<SpriteToItemMap*> mSpriteToItemReplaceList; + STD_VECTOR<SpriteToItemMap*> mSpriteToItemReplaceList; // Equipment related members. /** Attack type, in case of weapon. diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index 8deea4b23..675c9ca58 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -1105,7 +1105,7 @@ void Map::initializeParticleEffects() const restrict2 if (config.getBoolValue("particleeffects")) { - for (std::vector<ParticleEffectData>::const_iterator + for (STD_VECTOR<ParticleEffectData>::const_iterator i = mParticleEffects.begin(); i != mParticleEffects.end(); ++i) @@ -1315,7 +1315,7 @@ void Map::updatePortalTile(const std::string &restrict name, MapItem *Map::findPortalXY(const int x, const int y) const restrict2 { - FOR_EACH (std::vector<MapItem*>::const_iterator, it, mMapPortals) + FOR_EACH (STD_VECTOR<MapItem*>::const_iterator, it, mMapPortals) { if (*it == nullptr) continue; @@ -1378,8 +1378,8 @@ std::string Map::getObjectData(const unsigned x, const unsigned y, if (list == nullptr) return ""; - std::vector<MapObject>::const_iterator it = list->objects.begin(); - const std::vector<MapObject>::const_iterator it_end = list->objects.end(); + STD_VECTOR<MapObject>::const_iterator it = list->objects.begin(); + const STD_VECTOR<MapObject>::const_iterator it_end = list->objects.end(); while (it != it_end) { if ((*it).type == type) diff --git a/src/resources/map/map.h b/src/resources/map/map.h index 8a2051a60..dc05cb2ea 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -54,11 +54,11 @@ class WalkLayer; struct MetaTile; -typedef std::vector<Tileset*> Tilesets; -typedef std::vector<MapLayer*> Layers; +typedef STD_VECTOR<Tileset*> Tilesets; +typedef STD_VECTOR<MapLayer*> Layers; typedef Layers::const_iterator LayersCIter; -typedef std::vector<AmbientLayer*> AmbientLayerVector; +typedef STD_VECTOR<AmbientLayer*> AmbientLayerVector; typedef AmbientLayerVector::const_iterator AmbientLayerVectorCIter; typedef AmbientLayerVector::iterator AmbientLayerVectorIter; @@ -264,7 +264,7 @@ class Map final : public Properties, const int x, const int y, const bool addNew = true) restrict2; - const std::vector<MapItem*> &getPortals() const restrict2 noexcept2 + const STD_VECTOR<MapItem*> &getPortals() const restrict2 noexcept2 A_WARN_UNUSED { return mMapPortals; } @@ -450,9 +450,9 @@ class Map final : public Properties, const2 int w; const2 int h; }; - std::vector<ParticleEffectData> mParticleEffects; + STD_VECTOR<ParticleEffectData> mParticleEffects; - std::vector<MapItem*> mMapPortals; + STD_VECTOR<MapItem*> mMapPortals; std::map<int, TileAnimation*> mTileAnimations; diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h index f5cf36fa9..c21ac33bc 100644 --- a/src/resources/map/maplayer.h +++ b/src/resources/map/maplayer.h @@ -216,7 +216,7 @@ class MapLayer final: public MemoryCounter, public ConfigListener const SpecialLayer *restrict mSpecialLayer; const SpecialLayer *restrict mTempLayer; const std::string mName; - typedef std::vector<MapRowVertexes*> MapRows; + typedef STD_VECTOR<MapRowVertexes*> MapRows; MapRows mTempRows; int mMask; int mTileCondition; diff --git a/src/resources/map/mapobjectlist.h b/src/resources/map/mapobjectlist.h index 139ee08ea..327c9da9e 100644 --- a/src/resources/map/mapobjectlist.h +++ b/src/resources/map/mapobjectlist.h @@ -39,7 +39,7 @@ class MapObjectList final A_DELETE_COPY(MapObjectList) - std::vector<MapObject> objects; + STD_VECTOR<MapObject> objects; }; #endif // RESOURCES_MAP_MAPOBJECTLIST_H diff --git a/src/resources/map/maprowvertexes.h b/src/resources/map/maprowvertexes.h index 9665a5b59..0b64bed57 100644 --- a/src/resources/map/maprowvertexes.h +++ b/src/resources/map/maprowvertexes.h @@ -27,7 +27,7 @@ #include "localconsts.h" -typedef std::vector<ImageVertexes*> MapRowImages; +typedef STD_VECTOR<ImageVertexes*> MapRowImages; class MapRowVertexes final { diff --git a/src/resources/map/tileanimation.h b/src/resources/map/tileanimation.h index bf4e9f232..a9b5cc281 100644 --- a/src/resources/map/tileanimation.h +++ b/src/resources/map/tileanimation.h @@ -34,7 +34,7 @@ class Image; class MapLayer; class SimpleAnimation; -typedef std::vector<std::pair<MapLayer*, int> > TilePairVector; +typedef STD_VECTOR<std::pair<MapLayer*, int> > TilePairVector; typedef TilePairVector::const_iterator TilePairVectorCIter; /** diff --git a/src/resources/npcdialogmenuinfo.h b/src/resources/npcdialogmenuinfo.h index a90d1aea0..ba25c51d0 100644 --- a/src/resources/npcdialogmenuinfo.h +++ b/src/resources/npcdialogmenuinfo.h @@ -40,9 +40,9 @@ struct NpcDialogMenuInfo final A_DELETE_COPY(NpcDialogMenuInfo) - std::vector<NpcButtonInfo*> buttons; - std::vector<NpcImageInfo*> images; - std::vector<NpcTextInfo*> texts; + STD_VECTOR<NpcButtonInfo*> buttons; + STD_VECTOR<NpcImageInfo*> images; + STD_VECTOR<NpcTextInfo*> texts; }; #endif // RESOURCES_NPCDIALOGMENUINFO_H diff --git a/src/resources/questitem.h b/src/resources/questitem.h index 27a3881d6..333cc308b 100644 --- a/src/resources/questitem.h +++ b/src/resources/questitem.h @@ -50,7 +50,7 @@ struct QuestItem final std::string group; std::set<int> incomplete; std::set<int> complete; - std::vector<QuestItemText> texts; + STD_VECTOR<QuestItemText> texts; int completeFlag; bool broken; }; diff --git a/src/resources/skill/skillinfo.h b/src/resources/skill/skillinfo.h index 4b4f58fb9..391a19912 100644 --- a/src/resources/skill/skillinfo.h +++ b/src/resources/skill/skillinfo.h @@ -100,7 +100,7 @@ struct SkillInfo final } }; -typedef std::vector<SkillInfo*> SkillList; +typedef STD_VECTOR<SkillInfo*> SkillList; typedef SkillList::iterator SkillListIter; #endif // GUI_WIDGETS_SKILLINFO_H diff --git a/src/resources/soundinfo.h b/src/resources/soundinfo.h index 51fed06bf..82b4138de 100644 --- a/src/resources/soundinfo.h +++ b/src/resources/soundinfo.h @@ -45,7 +45,7 @@ struct SoundInfo final int delay; }; -typedef std::vector<SoundInfo> SoundInfoVect; +typedef STD_VECTOR<SoundInfo> SoundInfoVect; typedef std::map<ItemSoundEvent::Type, SoundInfoVect*> ItemSoundEvents; #endif // RESOURCES_SOUNDINFO_H diff --git a/src/resources/sprite/spritedisplay.h b/src/resources/sprite/spritedisplay.h index 47b13f2af..cabae7267 100644 --- a/src/resources/sprite/spritedisplay.h +++ b/src/resources/sprite/spritedisplay.h @@ -43,7 +43,7 @@ struct SpriteDisplay final std::string image; std::string floor; - std::vector<SpriteReference*> sprites; + STD_VECTOR<SpriteReference*> sprites; StringVect particles; }; diff --git a/src/resources/sprite/spritereference.h b/src/resources/sprite/spritereference.h index f2441e215..8bc38a532 100644 --- a/src/resources/sprite/spritereference.h +++ b/src/resources/sprite/spritereference.h @@ -48,6 +48,6 @@ struct SpriteReference final int variant; }; -typedef std::vector<SpriteReference*>::const_iterator SpriteRefs; +typedef STD_VECTOR<SpriteReference*>::const_iterator SpriteRefs; #endif // RESOURCES_SPRITE_SPRITEREFERENCE_H diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp index 2cc4c5754..1fc253f72 100644 --- a/src/resources/wallpaper.cpp +++ b/src/resources/wallpaper.cpp @@ -46,7 +46,7 @@ static bool wallpaperCompare(const WallpaperData &a, const WallpaperData &b); -static std::vector<WallpaperData> wallpaperData; +static STD_VECTOR<WallpaperData> wallpaperData; static bool haveBackup; // Is the backup (no size given) version available? static std::string wallpaperPath; @@ -140,7 +140,7 @@ std::string Wallpaper::getWallpaper(const int width, const int height) // Wallpaper filename container StringVect wallPaperVector; - FOR_EACH (std::vector<WallpaperData>::const_iterator, iter, wallpaperData) + FOR_EACH (STD_VECTOR<WallpaperData>::const_iterator, iter, wallpaperData) { wp = *iter; if (wp.width <= width && wp.height <= height) diff --git a/src/settings.h b/src/settings.h index 4343cc4c3..d9378b2db 100644 --- a/src/settings.h +++ b/src/settings.h @@ -118,7 +118,7 @@ class Settings final std::string gmCharCommandSymbol; std::string linkCommandSymbol; std::string userAgent; - std::vector<std::string> updateMirrors; + STD_VECTOR<std::string> updateMirrors; Options options; float guiAlpha; unsigned int textureSize; diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp index 8dbdd0354..257ae3e35 100644 --- a/src/spellmanager.cpp +++ b/src/spellmanager.cpp @@ -116,7 +116,7 @@ bool SpellManager::addSpell(TextCommand *const spell) return false; } -const std::vector<TextCommand*> &SpellManager::getAll() const +const STD_VECTOR<TextCommand*> &SpellManager::getAll() const { return mSpellsVector; } @@ -370,8 +370,8 @@ void SpellManager::save() const std::string SpellManager::autoComplete(const std::string &partName) const { - std::vector<TextCommand*>::const_iterator i = mSpellsVector.begin(); - const std::vector<TextCommand*>::const_iterator + STD_VECTOR<TextCommand*>::const_iterator i = mSpellsVector.begin(); + const STD_VECTOR<TextCommand*>::const_iterator i_end = mSpellsVector.end(); std::string newName; const TextCommand *newCommand = nullptr; diff --git a/src/spellmanager.h b/src/spellmanager.h index c6fd058ed..1b3316b36 100644 --- a/src/spellmanager.h +++ b/src/spellmanager.h @@ -51,7 +51,7 @@ class SpellManager final TextCommand *createNewSpell() const A_WARN_UNUSED; - const std::vector<TextCommand*> &getAll() const A_CONST A_WARN_UNUSED; + const STD_VECTOR<TextCommand*> &getAll() const A_CONST A_WARN_UNUSED; void useItem(const int itemId) const; @@ -82,7 +82,7 @@ class SpellManager final A_WARN_UNUSED; std::map<unsigned int, TextCommand*> mSpells; - std::vector<TextCommand*> mSpellsVector; + STD_VECTOR<TextCommand*> mSpellsVector; }; extern SpellManager *spellManager; diff --git a/src/unittests/fs/virtfs/zip_unittest.cc b/src/unittests/fs/virtfs/zip_unittest.cc index 10b4b52b5..6ea9063fe 100644 --- a/src/unittests/fs/virtfs/zip_unittest.cc +++ b/src/unittests/fs/virtfs/zip_unittest.cc @@ -51,7 +51,7 @@ TEST_CASE("Zip readArchiveInfo", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(headers.size() == 2); @@ -73,7 +73,7 @@ TEST_CASE("Zip readArchiveInfo", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(headers.size() == 11); @@ -136,7 +136,7 @@ TEST_CASE("Zip readArchiveInfo", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(headers.size() == 2); @@ -158,7 +158,7 @@ TEST_CASE("Zip readArchiveInfo", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(entry->root == name); @@ -190,7 +190,7 @@ TEST_CASE("Zip readCompressedFile", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(headers.size() == 11); @@ -225,7 +225,7 @@ TEST_CASE("Zip readFile", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(headers.size() == 2); @@ -250,7 +250,7 @@ TEST_CASE("Zip readFile", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(headers.size() == 11); @@ -282,7 +282,7 @@ TEST_CASE("Zip readFile", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(headers.size() == 2); diff --git a/src/unittests/render/mockgraphics.h b/src/unittests/render/mockgraphics.h index c18e6acd1..e144cef02 100644 --- a/src/unittests/render/mockgraphics.h +++ b/src/unittests/render/mockgraphics.h @@ -48,7 +48,7 @@ class MockGraphics final : public Graphics #include "render/softwaregraphicsdef.hpp" RENDER_SOFTWAREGRAPHICSDEF_HPP - std::vector<MockDrawItem> mDraws; + STD_VECTOR<MockDrawItem> mDraws; }; #endif // UNITTESTS diff --git a/src/unittests/utils/stringutils_unittest.cc b/src/unittests/utils/stringutils_unittest.cc index b137ef30d..ee0a00cb0 100644 --- a/src/unittests/utils/stringutils_unittest.cc +++ b/src/unittests/utils/stringutils_unittest.cc @@ -379,7 +379,7 @@ TEST_CASE("stringuntils findI 1", "") TEST_CASE("stringuntils findI 2", "") { - std::vector <std::string> vect1; + STD_VECTOR <std::string> vect1; vect1.push_back("test"); vect1.push_back("line"); vect1.push_back("qwe"); @@ -800,7 +800,7 @@ TEST_CASE("stringuntils splitToStringSet 1", "") TEST_CASE("stringuntils splitToIntVector 1", "") { - std::vector<int> tokens; + STD_VECTOR<int> tokens; splitToIntVector(tokens, "", ','); REQUIRE(tokens.empty() == true); @@ -847,7 +847,7 @@ TEST_CASE("stringuntils splitToIntVector 1", "") TEST_CASE("stringuntils splitToStringVector 1", "") { - std::vector<std::string> tokens; + STD_VECTOR<std::string> tokens; splitToStringVector(tokens, "", ','); REQUIRE(tokens.empty() == true); diff --git a/src/unittests/utils/xmlutils_unittest.cc b/src/unittests/utils/xmlutils_unittest.cc index 014730e95..c17ca98e4 100644 --- a/src/unittests/utils/xmlutils_unittest.cc +++ b/src/unittests/utils/xmlutils_unittest.cc @@ -73,7 +73,7 @@ TEST_CASE("xmlutils readXmlIntVector 1", "") ActorSprite::load(); - std::vector<int> arr; + STD_VECTOR<int> arr; readXmlIntVector("graphics/gui/browserbox.xml", "skinset", diff --git a/src/utils/browserboxtools.cpp b/src/utils/browserboxtools.cpp index a8c2b6b3f..10113e220 100644 --- a/src/utils/browserboxtools.cpp +++ b/src/utils/browserboxtools.cpp @@ -126,7 +126,7 @@ std::string BrowserBoxTools::replaceLinkCommands(const std::string &link) const int id = atoi(link.substr(0, idx).c_str()); if (id != 0) { - std::vector<int> parts; + STD_VECTOR<int> parts; splitToIntVector(parts, link.substr(idx), ','); while (parts.size() < maxCards) diff --git a/src/utils/langs.h b/src/utils/langs.h index 133883089..63a6f9674 100644 --- a/src/utils/langs.h +++ b/src/utils/langs.h @@ -27,7 +27,7 @@ #include "localconsts.h" -typedef std::vector<std::string> LangVect; +typedef STD_VECTOR<std::string> LangVect; typedef LangVect::const_iterator LangIter; LangVect getLang() A_WARN_UNUSED; diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 7f3ba988c..2d91509c8 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -513,7 +513,7 @@ void splitToStringSet(std::set<std::string> &tokens, } } -void splitToIntVector(std::vector<int> &tokens, +void splitToIntVector(STD_VECTOR<int> &tokens, const std::string &text, const char separator) { diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h index 545734a56..1b93c41d7 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -201,7 +201,7 @@ void splitToStringVector(StringVect &tokens, void splitToStringSet(std::set<std::string> &tokens, const std::string &text, const char separator); -void splitToIntVector(std::vector<int> &tokens, +void splitToIntVector(STD_VECTOR<int> &tokens, const std::string &text, const char separator); std::string combineDye(std::string file, const std::string &dye) A_WARN_UNUSED; diff --git a/src/utils/stringvector.h b/src/utils/stringvector.h index 7649f3b35..18a53881c 100644 --- a/src/utils/stringvector.h +++ b/src/utils/stringvector.h @@ -25,7 +25,7 @@ #include <string> -typedef std::vector<std::string> StringVect; +typedef STD_VECTOR<std::string> StringVect; typedef StringVect::iterator StringVectIter; typedef StringVect::const_iterator StringVectCIter; diff --git a/src/utils/xmlutils.cpp b/src/utils/xmlutils.cpp index ccb3aa870..56510c316 100644 --- a/src/utils/xmlutils.cpp +++ b/src/utils/xmlutils.cpp @@ -31,7 +31,7 @@ void readXmlIntVector(const std::string &fileName, const std::string §ionName, const std::string &itemName, const std::string &attributeName, - std::vector<int> &arr, + STD_VECTOR<int> &arr, const SkipError skipError) { XML::Document doc(fileName, UseVirtFs_true, skipError); diff --git a/src/utils/xmlutils.h b/src/utils/xmlutils.h index 6b24dc471..daa0575a8 100644 --- a/src/utils/xmlutils.h +++ b/src/utils/xmlutils.h @@ -33,7 +33,7 @@ void readXmlIntVector(const std::string &fileName, const std::string §ionName, const std::string &itemName, const std::string &attributeName, - std::vector<int> &arr, + STD_VECTOR<int> &arr, const SkipError skipError); void readXmlStringMap(const std::string &fileName, |