From fb75a958f02695f166481033203869940d98b537 Mon Sep 17 00:00:00 2001 From: Ujp8LfXBJ6wCPR Date: Sat, 29 Feb 2020 13:20:05 +0100 Subject: Part1: Modernize codebase with Clang-Tidy range based loops (#24164) --- src/common/Collision/Management/MMapManager.cpp | 4 +-- src/common/Collision/Management/VMapManager2.cpp | 8 +++--- src/common/Collision/Maps/MapTree.cpp | 8 +++--- src/common/Collision/Maps/TileAssembler.cpp | 23 +++++++---------- src/common/Logging/Log.cpp | 4 +-- src/common/Logging/Logger.cpp | 6 ++--- src/common/Utilities/EventMap.cpp | 12 ++++----- src/common/Utilities/Util.cpp | 14 +++++------ src/server/database/Database/QueryHolder.cpp | 4 +-- src/server/game/AI/CoreAI/CombatAI.cpp | 32 ++++++++++++------------ 10 files changed, 55 insertions(+), 60 deletions(-) (limited to 'src') diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp index 953afb308df..d983a8b1d8d 100644 --- a/src/common/Collision/Management/MMapManager.cpp +++ b/src/common/Collision/Management/MMapManager.cpp @@ -29,8 +29,8 @@ namespace MMAP // ######################## MMapManager ######################## MMapManager::~MMapManager() { - for (MMapDataSet::iterator i = loadedMMaps.begin(); i != loadedMMaps.end(); ++i) - delete i->second; + for (std::pair& loadedMMap : loadedMMaps) + delete loadedMMap.second; // by now we should not have maps loaded // if we had, tiles in MMapData->mmapLoadedTiles, their actual data is lost! diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp index 65f01a2c244..4a8d55e5664 100644 --- a/src/common/Collision/Management/VMapManager2.cpp +++ b/src/common/Collision/Management/VMapManager2.cpp @@ -41,13 +41,13 @@ namespace VMAP VMapManager2::~VMapManager2(void) { - for (InstanceTreeMap::iterator i = iInstanceMapTrees.begin(); i != iInstanceMapTrees.end(); ++i) + for (std::pair& iInstanceMapTree : iInstanceMapTrees) { - delete i->second; + delete iInstanceMapTree.second; } - for (ModelFileMap::iterator i = iLoadedModelFiles.begin(); i != iLoadedModelFiles.end(); ++i) + for (std::pair& iLoadedModelFile : iLoadedModelFiles) { - delete i->second.getModel(); + delete iLoadedModelFile.second.getModel(); } } diff --git a/src/common/Collision/Maps/MapTree.cpp b/src/common/Collision/Maps/MapTree.cpp index fdba555554f..2e952e74d80 100644 --- a/src/common/Collision/Maps/MapTree.cpp +++ b/src/common/Collision/Maps/MapTree.cpp @@ -328,11 +328,11 @@ namespace VMAP void StaticMapTree::UnloadMap(VMapManager2* vm) { - for (loadedSpawnMap::iterator i = iLoadedSpawns.begin(); i != iLoadedSpawns.end(); ++i) + for (std::pair& iLoadedSpawn : iLoadedSpawns) { - iTreeValues[i->first].setUnloaded(); - for (uint32 refCount = 0; refCount < i->second; ++refCount) - vm->releaseModelInstance(iTreeValues[i->first].name); + iTreeValues[iLoadedSpawn.first].setUnloaded(); + for (uint32 refCount = 0; refCount < iLoadedSpawn.second; ++refCount) + vm->releaseModelInstance(iTreeValues[iLoadedSpawn.first].name); } iLoadedSpawns.clear(); iLoadedTiles.clear(); diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp index 97b0b3a69b5..7096e1284b1 100644 --- a/src/common/Collision/Maps/TileAssembler.cpp +++ b/src/common/Collision/Maps/TileAssembler.cpp @@ -185,22 +185,21 @@ namespace VMAP exportGameobjectModels(); // export objects std::cout << "\nConverting Model Files" << std::endl; - for (std::set::iterator mfile = spawnedModelFiles.begin(); mfile != spawnedModelFiles.end(); ++mfile) + for (std::string const& spawnedModelFile : spawnedModelFiles) { - std::cout << "Converting " << *mfile << std::endl; - if (!convertRawFile(*mfile)) + std::cout << "Converting " << spawnedModelFile << std::endl; + if (!convertRawFile(spawnedModelFile)) { - std::cout << "error converting " << *mfile << std::endl; + std::cout << "error converting " << spawnedModelFile << std::endl; success = false; break; } } //cleanup: - for (MapData::iterator map_iter = mapData.begin(); map_iter != mapData.end(); ++map_iter) - { - delete map_iter->second; - } + for (std::pair& map_iter : mapData) + delete map_iter.second; + return success; } @@ -393,14 +392,10 @@ namespace VMAP spawnedModelFiles.insert(model_name); AABox bounds; bool boundEmpty = true; - for (uint32 g = 0; g < raw_model.groupsArray.size(); ++g) + for (GroupModel_Raw& g : raw_model.groupsArray) { - std::vector& vertices = raw_model.groupsArray[g].vertexArray; - - uint32 nvectors = vertices.size(); - for (uint32 i = 0; i < nvectors; ++i) + for (Vector3& v : g.vertexArray) { - Vector3& v = vertices[i]; if (boundEmpty) bounds = AABox(v, v), boundEmpty = false; else diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp index 39d17de1f04..77820929a66 100644 --- a/src/common/Logging/Log.cpp +++ b/src/common/Logging/Log.cpp @@ -322,8 +322,8 @@ void Log::outCharDump(char const* str, uint32 accountId, uint64 guid, char const void Log::SetRealmId(uint32 id) { - for (auto it = appenders.begin(); it != appenders.end(); ++it) - it->second->setRealmId(id); + for (std::pair>& appender : appenders) + appender.second->setRealmId(id); } void Log::Close() diff --git a/src/common/Logging/Logger.cpp b/src/common/Logging/Logger.cpp index 8e2927c08bd..63653770ade 100644 --- a/src/common/Logging/Logger.cpp +++ b/src/common/Logging/Logger.cpp @@ -54,7 +54,7 @@ void Logger::write(LogMessage* message) const return; } - for (auto it = appenders.begin(); it != appenders.end(); ++it) - if (it->second) - it->second->write(message); + for (std::pair const& appender : appenders) + if (appender.second) + appender.second->write(message); } diff --git a/src/common/Utilities/EventMap.cpp b/src/common/Utilities/EventMap.cpp index 5aea4dc1388..46da4000a50 100644 --- a/src/common/Utilities/EventMap.cpp +++ b/src/common/Utilities/EventMap.cpp @@ -135,18 +135,18 @@ uint32 EventMap::GetNextEventTime(uint32 eventId) const if (Empty()) return 0; - for (EventStore::const_iterator itr = _eventMap.begin(); itr != _eventMap.end(); ++itr) - if (eventId == (itr->second & 0x0000FFFF)) - return itr->first; + for (std::pair const& itr : _eventMap) + if (eventId == (itr.second & 0x0000FFFF)) + return itr.first; return 0; } uint32 EventMap::GetTimeUntilEvent(uint32 eventId) const { - for (EventStore::const_iterator itr = _eventMap.begin(); itr != _eventMap.end(); ++itr) - if (eventId == (itr->second & 0x0000FFFF)) - return itr->first - _time; + for (std::pair const& itr : _eventMap) + if (eventId == (itr.second & 0x0000FFFF)) + return itr.first - _time; return std::numeric_limits::max(); } diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp index 74fdef8d0c1..30bc25e4b04 100644 --- a/src/common/Utilities/Util.cpp +++ b/src/common/Utilities/Util.cpp @@ -220,16 +220,16 @@ int32 MoneyStringToMoney(std::string const& moneyString) return 0; // Bad format Tokenizer tokens(moneyString, ' '); - for (Tokenizer::const_iterator itr = tokens.begin(); itr != tokens.end(); ++itr) + for (char const* token : tokens) { - std::string tokenString(*itr); + std::string tokenString(token); size_t gCount = std::count(tokenString.begin(), tokenString.end(), 'g'); size_t sCount = std::count(tokenString.begin(), tokenString.end(), 's'); size_t cCount = std::count(tokenString.begin(), tokenString.end(), 'c'); if (gCount + sCount + cCount != 1) return 0; - uint32 amount = strtoul(*itr, nullptr, 10); + uint32 amount = strtoul(token, nullptr, 10); if (gCount == 1) money += amount * 100 * 100; else if (sCount == 1) @@ -247,16 +247,16 @@ uint32 TimeStringToSecs(std::string const& timestring) uint32 buffer = 0; uint32 multiplier = 0; - for (std::string::const_iterator itr = timestring.begin(); itr != timestring.end(); ++itr) + for (char itr : timestring) { - if (isdigit(*itr)) + if (isdigit(itr)) { buffer *= 10; - buffer += (*itr) - '0'; + buffer += itr - '0'; } else { - switch (*itr) + switch (itr) { case 'd': multiplier = DAY; break; case 'h': multiplier = HOUR; break; diff --git a/src/server/database/Database/QueryHolder.cpp b/src/server/database/Database/QueryHolder.cpp index b0e3a11caf6..363d3dd8d9b 100644 --- a/src/server/database/Database/QueryHolder.cpp +++ b/src/server/database/Database/QueryHolder.cpp @@ -57,11 +57,11 @@ void SQLQueryHolder::SetPreparedResult(size_t index, PreparedResultSet* result) SQLQueryHolder::~SQLQueryHolder() { - for (size_t i = 0; i < m_queries.size(); i++) + for (std::pair& query : m_queries) { /// if the result was never used, free the resources /// results used already (getresult called) are expected to be deleted - delete m_queries[i].first; + delete query.first; } } diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp index 34c36c8d787..b05e8436df9 100644 --- a/src/server/game/AI/CoreAI/CombatAI.cpp +++ b/src/server/game/AI/CoreAI/CombatAI.cpp @@ -54,9 +54,9 @@ void AggressorAI::UpdateAI(uint32 /*diff*/) void CombatAI::InitializeAI() { - for (uint32 i = 0; i < MAX_CREATURE_SPELLS; ++i) - if (me->m_spells[i] && sSpellMgr->GetSpellInfo(me->m_spells[i])) - Spells.push_back(me->m_spells[i]); + for (uint32 spell : me->m_spells) + if (spell && sSpellMgr->GetSpellInfo(spell)) + Spells.push_back(spell); CreatureAI::InitializeAI(); } @@ -68,19 +68,19 @@ void CombatAI::Reset() void CombatAI::JustDied(Unit* killer) { - for (SpellVector::iterator i = Spells.begin(); i != Spells.end(); ++i) - if (AISpellInfo[*i].condition == AICOND_DIE) - me->CastSpell(killer, *i, true); + for (uint32 spell : Spells) + if (AISpellInfo[spell].condition == AICOND_DIE) + me->CastSpell(killer, spell, true); } void CombatAI::JustEngagedWith(Unit* who) { - for (SpellVector::iterator i = Spells.begin(); i != Spells.end(); ++i) + for (uint32 spell : Spells) { - if (AISpellInfo[*i].condition == AICOND_AGGRO) - me->CastSpell(who, *i, false); - else if (AISpellInfo[*i].condition == AICOND_COMBAT) - Events.ScheduleEvent(*i, AISpellInfo[*i].cooldown + rand32() % AISpellInfo[*i].cooldown); + if (AISpellInfo[spell].condition == AICOND_AGGRO) + me->CastSpell(who, spell, false); + else if (AISpellInfo[spell].condition == AICOND_COMBAT) + Events.ScheduleEvent(spell, AISpellInfo[spell].cooldown + rand32() % AISpellInfo[spell].cooldown); } } @@ -118,9 +118,9 @@ void CasterAI::InitializeAI() _attackDistance = 30.0f; - for (SpellVector::iterator itr = Spells.begin(); itr != Spells.end(); ++itr) - if (AISpellInfo[*itr].condition == AICOND_COMBAT && _attackDistance > GetAISpellInfo(*itr)->maxRange) - _attackDistance = GetAISpellInfo(*itr)->maxRange; + for (uint32 spell : Spells) + if (AISpellInfo[spell].condition == AICOND_COMBAT && _attackDistance > GetAISpellInfo(spell)->maxRange) + _attackDistance = GetAISpellInfo(spell)->maxRange; if (_attackDistance == 30.0f) _attackDistance = MELEE_RANGE; @@ -315,8 +315,8 @@ void VehicleAI::CheckConditions(uint32 diff) { if (Vehicle* vehicleKit = me->GetVehicleKit()) { - for (SeatMap::iterator itr = vehicleKit->Seats.begin(); itr != vehicleKit->Seats.end(); ++itr) - if (Unit* passenger = ObjectAccessor::GetUnit(*me, itr->second.Passenger.Guid)) + for (std::pair& Seat : vehicleKit->Seats) + if (Unit* passenger = ObjectAccessor::GetUnit(*me, Seat.second.Passenger.Guid)) { if (Player* player = passenger->ToPlayer()) { -- cgit v1.2.3