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

Timestamp:

Nov 21, 2015, 7:05:53 PM (8 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/Quest.cc (modified) (4 diffs)

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

@@ -190 +190 @@
 
         // Iterate through all subquests.
-        for (std::list<Quest*>::const_iterator subQuest = this->subQuests_.begin(); subQuest != this->subQuests_.end(); ++subQuest)
+        for (const auto & elem : this->subQuests_)
         {
             if(i == 0) // We're counting down...
-               return *subQuest;
+               return elem;
 
             i--;
@@ -214 +214 @@
 
         // Iterate through all QuestHints.
-        for (std::list<QuestHint*>::const_iterator hint = this->hints_.begin(); hint != this->hints_.end(); ++hint)
+        for (const auto & elem : this->hints_)
         {
             if(i == 0) // We're counting down...
-               return *hint;
+               return elem;
 
             i--;
@@ -237 +237 @@
 
         // Iterate through all fail QuestEffects.
-        for (std::list<QuestEffect*>::const_iterator effect = this->failEffects_.begin(); effect != this->failEffects_.end(); ++effect)
+        for (const auto & elem : this->failEffects_)
         {
             if(i == 0) // We're counting down...
-               return *effect;
+               return elem;
 
             i--;
@@ -260 +260 @@
 
         // Iterate through all complete QuestEffects.
-        for (std::list<QuestEffect*>::const_iterator effect = this->completeEffects_.begin(); effect != this->completeEffects_.end(); ++effect)
+        for (const auto & elem : this->completeEffects_)
         {
             if(i == 0) // We're counting down...
-               return *effect;
+               return elem;
 
             i--;