Index: code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.cc	(revision 10821)
+++ code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.cc	(revision 10916)
@@ -94,6 +94,6 @@
 
         // Iterate through all players possessing this Quest.
-        for(const auto & elem : players_)
-            QuestEffect::invokeEffects(elem, this->getFailEffectList());
+        for(PlayerInfo* questPlayer : players_)
+            QuestEffect::invokeEffects(questPlayer, this->getFailEffectList());
 
         return true;
@@ -119,6 +119,6 @@
 
         // Iterate through all players possessing the Quest.
-        for(const auto & elem : players_)
-            QuestEffect::invokeEffects(elem, this->getCompleteEffectList());
+        for(PlayerInfo* questPlayer : players_)
+            QuestEffect::invokeEffects(questPlayer, this->getCompleteEffectList());
 
         Quest::complete(player);
@@ -242,8 +242,8 @@
     {
         int i = index;
-        for (const auto & elem : this->rewards_)
+        for (QuestEffect* reward : this->rewards_)
         {
             if(i == 0)
-               return elem;
+               return reward;
 
             i--;
Index: code/branches/cpp11_v2/src/modules/questsystem/Quest.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/Quest.cc	(revision 10821)
+++ code/branches/cpp11_v2/src/modules/questsystem/Quest.cc	(revision 10916)
@@ -190,8 +190,8 @@
 
         // Iterate through all subquests.
-        for (const auto & elem : this->subQuests_)
+        for (Quest* quest : this->subQuests_)
         {
             if(i == 0) // We're counting down...
-               return elem;
+               return quest;
 
             i--;
@@ -214,8 +214,8 @@
 
         // Iterate through all QuestHints.
-        for (const auto & elem : this->hints_)
+        for (QuestHint* hint : this->hints_)
         {
             if(i == 0) // We're counting down...
-               return elem;
+               return hint;
 
             i--;
@@ -237,8 +237,8 @@
 
         // Iterate through all fail QuestEffects.
-        for (const auto & elem : this->failEffects_)
+        for (QuestEffect* effect : this->failEffects_)
         {
             if(i == 0) // We're counting down...
-               return elem;
+               return effect;
 
             i--;
@@ -260,8 +260,8 @@
 
         // Iterate through all complete QuestEffects.
-        for (const auto & elem : this->completeEffects_)
+        for (QuestEffect* effect : this->completeEffects_)
         {
             if(i == 0) // We're counting down...
-               return elem;
+               return effect;
 
             i--;
Index: code/branches/cpp11_v2/src/modules/questsystem/QuestEffect.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/QuestEffect.cc	(revision 10821)
+++ code/branches/cpp11_v2/src/modules/questsystem/QuestEffect.cc	(revision 10916)
@@ -74,6 +74,6 @@
         orxout(verbose, context::quests) << "Invoking QuestEffects on player: " << player << " ."  << endl;
 
-        for (auto & effects_effect : effects)
-            temp = temp && (effects_effect)->invoke(player);
+        for (QuestEffect* effect : effects)
+            temp = temp && effect->invoke(player);
 
         return temp;
Index: code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.cc	(revision 10821)
+++ code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.cc	(revision 10916)
@@ -236,8 +236,8 @@
     {
         int i = index;
-        for (const auto & elem : this->effects_)
+        for (QuestEffect* effect : this->effects_)
         {
             if(i == 0)
-               return elem;
+               return effect;
 
             i--;
Index: code/branches/cpp11_v2/src/modules/questsystem/QuestListener.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/QuestListener.cc	(revision 10821)
+++ code/branches/cpp11_v2/src/modules/questsystem/QuestListener.cc	(revision 10916)
@@ -97,7 +97,6 @@
     /* static */ void QuestListener::advertiseStatusChange(std::list<QuestListener*> & listeners, const std::string & status)
     {
-        for (auto listener : listeners) // Iterate through all QuestListeners
-        {
-            
+        for (QuestListener* 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();
Index: code/branches/cpp11_v2/src/modules/questsystem/QuestManager.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/QuestManager.cc	(revision 10821)
+++ code/branches/cpp11_v2/src/modules/questsystem/QuestManager.cc	(revision 10916)
@@ -235,7 +235,7 @@
     {
         int numQuests = 0;
-        for(auto & elem : this->questMap_)
-        {
-            if(elem.second->getParentQuest() == nullptr && !elem.second->isInactive(player))
+        for(auto& mapEntry : this->questMap_)
+        {
+            if(mapEntry.second->getParentQuest() == nullptr && !mapEntry.second->isInactive(player))
                 numQuests++;
         }
@@ -255,8 +255,8 @@
     Quest* QuestManager::getRootQuest(PlayerInfo* player, int index)
     {
-        for(auto & elem : this->questMap_)
-        {
-            if(elem.second->getParentQuest() == nullptr && !elem.second->isInactive(player) && index-- == 0)
-                return elem.second;
+        for(auto& mapEntry : this->questMap_)
+        {
+            if(mapEntry.second->getParentQuest() == nullptr && !mapEntry.second->isInactive(player) && index-- == 0)
+                return mapEntry.second;
         }
         return nullptr;
@@ -280,7 +280,7 @@
         std::list<Quest*> quests = quest->getSubQuestList();
         int numQuests = 0;
-        for(auto & quest : quests)
-        {
-            if(!(quest)->isInactive(player))
+        for(Quest* subquest : quests)
+        {
+            if(!subquest->isInactive(player))
                 numQuests++;
         }
@@ -304,7 +304,7 @@
 
         std::list<Quest*> quests = quest->getSubQuestList();
-        for(auto & quest : quests)
-        {
-            if(!(quest)->isInactive(player) && index-- == 0)
+        for(Quest* subquest : quests)
+        {
+            if(!subquest->isInactive(player) && index-- == 0)
                 return quest;
         }
@@ -326,7 +326,7 @@
         std::list<QuestHint*> hints = quest->getHintsList();
         int numHints = 0;
-        for(auto & hint : hints)
-        {
-            if((hint)->isActive(player))
+        for(QuestHint* hint : hints)
+        {
+            if(hint->isActive(player))
                 numHints++;
         }
@@ -349,7 +349,7 @@
     {
         std::list<QuestHint*> hints = quest->getHintsList();
-        for(auto & hint : hints)
-        {
-            if((hint)->isActive(player) && index-- == 0)
+        for(QuestHint* hint : hints)
+        {
+            if(hint->isActive(player) && index-- == 0)
                 return hint;
         }
Index: code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.cc	(revision 10821)
+++ code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.cc	(revision 10916)
@@ -84,8 +84,8 @@
     {
         int i = index;
-        for (const auto & elem : this->rewards_)
+        for (Rewardable* reward : this->rewards_)
         {
             if(i == 0)
-               return elem;
+               return reward;
             i--;
         }
@@ -106,6 +106,6 @@
 
         bool temp = true;
-        for (auto & elem : this->rewards_)
-            temp = temp && (elem)->reward(player);
+        for (Rewardable* reward : this->rewards_)
+            temp = temp && reward->reward(player);
 
         orxout(verbose, context::quests) << "Rewardable successfully added to player." << player << " ." << endl;
