Changeset 10821 for code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.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/gametypes/SpaceRaceManager.cc (modified) (6 diffs)

code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.cc

@@ -54 +54 @@
     SpaceRaceManager::~SpaceRaceManager()
     {
-        for (size_t i = 0; i < this->checkpoints_.size(); ++i)
-        this->checkpoints_[i]->destroy();
+        for (auto & elem : this->checkpoints_)
+        elem->destroy();
     }
 
@@ -77 +77 @@
         }
 
-        for ( std::map< PlayerInfo*, Player>::iterator it = players_.begin(); it != players_.end(); ++it)
+        for (auto & elem : players_)
         {
 
-            for (size_t i = 0; i < this->checkpoints_.size(); ++i)
+            for (auto & _i : this->checkpoints_)
             {
-                if (this->checkpoints_[i]->playerWasHere(it->first)){
-                this->checkpointReached(this->checkpoints_[i], it->first /*this->checkpoints_[i]->getPlayer()*/);
+                if (_i->playerWasHere(elem.first)){
+                this->checkpointReached(_i, elem.first /*this->checkpoints_[i]->getPlayer()*/);
                 }
             }
@@ -113 +113 @@
     RaceCheckPoint* SpaceRaceManager::findCheckpoint(int index) const
     {
-        for (size_t i = 0; i < this->checkpoints_.size(); ++i)
-        if (this->checkpoints_[i]->getCheckpointIndex() == index)
-        return this->checkpoints_[i];
+        for (auto & elem : this->checkpoints_)
+        if (elem->getCheckpointIndex() == index)
+        return elem;
         return nullptr;
     }
@@ -125 +125 @@
             // the player already visited an old checkpoint; see which checkpoints are possible now
             const std::set<int>& possibleCheckpoints = oldCheckpoint->getNextCheckpoints();
-            for (std::set<int>::const_iterator it = possibleCheckpoints.begin(); it != possibleCheckpoints.end(); ++it)
-            if (this->findCheckpoint(*it) == newCheckpoint)
+            for (const auto & possibleCheckpoint : possibleCheckpoints)
+            if (this->findCheckpoint(possibleCheckpoint) == newCheckpoint)
             return true;
             return false;
@@ -179 +179 @@
         {
             const std::set<int>& oldVisible = oldCheckpoint->getNextCheckpoints();
-            for (std::set<int>::const_iterator it = oldVisible.begin(); it != oldVisible.end(); ++it)
-            this->findCheckpoint(*it)->setRadarVisibility(false);
+            for (const auto & elem : oldVisible)
+            this->findCheckpoint(elem)->setRadarVisibility(false);
         }
 
@@ -188 +188 @@
 
             const std::set<int>& newVisible = newCheckpoint->getNextCheckpoints();
-            for (std::set<int>::const_iterator it = newVisible.begin(); it != newVisible.end(); ++it)
-            this->findCheckpoint(*it)->setRadarVisibility(true);
+            for (const auto & elem : newVisible)
+            this->findCheckpoint(elem)->setRadarVisibility(true);
         }
     }