Changeset 10821 for code/branches/cpp11_v2/src/modules/questsystem

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

Location:

code/branches/cpp11_v2/src/modules/questsystem

Files:

• GlobalQuest.cc (modified) (3 diffs)
• Quest.cc (modified) (4 diffs)
• QuestEffect.cc (modified) (1 diff)
• QuestEffectBeacon.cc (modified) (1 diff)
• QuestListener.cc (modified) (1 diff)
• QuestManager.cc (modified) (6 diffs)
• effects/AddReward.cc (modified) (2 diffs)

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

@@ -94 +94 @@
 
         // Iterate through all players possessing this Quest.
-        for(std::set<PlayerInfo*>::const_iterator it = players_.begin(); it != players_.end(); it++)
-            QuestEffect::invokeEffects(*it, this->getFailEffectList());
+        for(const auto & elem : players_)
+            QuestEffect::invokeEffects(elem, this->getFailEffectList());
 
         return true;
@@ -119 +119 @@
 
         // Iterate through all players possessing the Quest.
-        for(std::set<PlayerInfo*>::const_iterator it = players_.begin(); it != players_.end(); it++)
-            QuestEffect::invokeEffects(*it, this->getCompleteEffectList());
+        for(const auto & elem : players_)
+            QuestEffect::invokeEffects(elem, this->getCompleteEffectList());
 
         Quest::complete(player);
@@ -242 +242 @@
     {
         int i = index;
-        for (std::list<QuestEffect*>::const_iterator effect = this->rewards_.begin(); effect != this->rewards_.end(); ++effect)
+        for (const auto & elem : this->rewards_)
         {
             if(i == 0)
-               return *effect;
+               return elem;
 
             i--;

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--;

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

@@ -74 +74 @@
         orxout(verbose, context::quests) << "Invoking QuestEffects on player: " << player << " ."  << endl;
 
-        for (std::list<QuestEffect*>::iterator effect = effects.begin(); effect != effects.end(); effect++)
-            temp = temp && (*effect)->invoke(player);
+        for (auto & effects_effect : effects)
+            temp = temp && (effects_effect)->invoke(player);
 
         return temp;

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

@@ -236 +236 @@
     {
         int i = index;
-        for (std::list<QuestEffect*>::const_iterator effect = this->effects_.begin(); effect != this->effects_.end(); ++effect)
+        for (const auto & elem : this->effects_)
         {
             if(i == 0)
-               return *effect;
+               return elem;
 
             i--;

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

@@ -97 +97 @@
     /* static */ void QuestListener::advertiseStatusChange(std::list<QuestListener*> & listeners, const std::string & status)
     {
-        for (std::list<QuestListener*>::iterator it = listeners.begin(); it != listeners.end(); ++it) // Iterate through all QuestListeners
-        {
-            QuestListener* listener = *it;
+        for (auto listener : listeners) // Iterate through all QuestListeners
+        {
+            
             if(listener->getMode() == status || listener->getMode() == QuestListener::ALL) // Check whether the status change affects the give QuestListener.
                 listener->execute();

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;

code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.cc

@@ -84 +84 @@
     {
         int i = index;
-        for (std::list<Rewardable*>::const_iterator reward = this->rewards_.begin(); reward != this->rewards_.end(); ++reward)
+        for (const auto & elem : this->rewards_)
         {
             if(i == 0)
-               return *reward;
+               return elem;
             i--;
         }
@@ -106 +106 @@
 
         bool temp = true;
-        for ( std::list<Rewardable*>::iterator reward = this->rewards_.begin(); reward != this->rewards_.end(); ++reward )
-            temp = temp && (*reward)->reward(player);
+        for (auto & elem : this->rewards_)
+            temp = temp && (elem)->reward(player);
 
         orxout(verbose, context::quests) << "Rewardable successfully added to player." << player << " ." << endl;