Changeset 10821 for code/branches/cpp11_v2/src/modules/questsystem/QuestManager.cc

Timestamp:

Nov 21, 2015, 7:05:53 PM (9 years ago)

Author:

muemart

Message:

Run clang-modernize -loop-convert

• Again, not all possible loops were converted
• It can do pretty cool transformations, but I had to fix a few compile errors, so there might be some runtime errors lurking around too

File:

• code/branches/cpp11_v2/src/modules/questsystem/QuestManager.cc (modified) (6 diffs)

code/branches/cpp11_v2/src/modules/questsystem/QuestManager.cc

@@ -235 +235 @@
     {
         int numQuests = 0;
-        for(std::map<std::string, Quest*>::iterator it = this->questMap_.begin(); it != this->questMap_.end(); it++)
-        {
-            if(it->second->getParentQuest() == nullptr && !it->second->isInactive(player))
+        for(auto & elem : this->questMap_)
+        {
+            if(elem.second->getParentQuest() == nullptr && !elem.second->isInactive(player))
                 numQuests++;
         }
@@ -255 +255 @@
     Quest* QuestManager::getRootQuest(PlayerInfo* player, int index)
     {
-        for(std::map<std::string, Quest*>::iterator it = this->questMap_.begin(); it != this->questMap_.end(); it++)
-        {
-            if(it->second->getParentQuest() == nullptr && !it->second->isInactive(player) && index-- == 0)
-                return it->second;
+        for(auto & elem : this->questMap_)
+        {
+            if(elem.second->getParentQuest() == nullptr && !elem.second->isInactive(player) && index-- == 0)
+                return elem.second;
         }
         return nullptr;
@@ -280 +280 @@
         std::list<Quest*> quests = quest->getSubQuestList();
         int numQuests = 0;
-        for(std::list<Quest*>::iterator it = quests.begin(); it != quests.end(); it++)
-        {
-            if(!(*it)->isInactive(player))
+        for(auto & quest : quests)
+        {
+            if(!(quest)->isInactive(player))
                 numQuests++;
         }
@@ -304 +304 @@
 
         std::list<Quest*> quests = quest->getSubQuestList();
-        for(std::list<Quest*>::iterator it = quests.begin(); it != quests.end(); it++)
-        {
-            if(!(*it)->isInactive(player) && index-- == 0)
-                return *it;
+        for(auto & quest : quests)
+        {
+            if(!(quest)->isInactive(player) && index-- == 0)
+                return quest;
         }
         return nullptr;
@@ -326 +326 @@
         std::list<QuestHint*> hints = quest->getHintsList();
         int numHints = 0;
-        for(std::list<QuestHint*>::iterator it = hints.begin(); it != hints.end(); it++)
-        {
-            if((*it)->isActive(player))
+        for(auto & hint : hints)
+        {
+            if((hint)->isActive(player))
                 numHints++;
         }
@@ -349 +349 @@
     {
         std::list<QuestHint*> hints = quest->getHintsList();
-        for(std::list<QuestHint*>::iterator it = hints.begin(); it != hints.end(); it++)
-        {
-            if((*it)->isActive(player) && index-- == 0)
-                return *it;
+        for(auto & hint : hints)
+        {
+            if((hint)->isActive(player) && index-- == 0)
+                return hint;
         }
         return nullptr;