Changeset 10821 for code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.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/orxonox/gametypes/TeamBaseMatch.cc (modified) (4 diffs)

code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.cc

@@ -152 +152 @@
         int amountControlled2 = 0;
 
-        for (std::set<TeamBaseMatchBase*>::const_iterator it = this->bases_.begin(); it != this->bases_.end(); ++it)
-        {
-            if((*it)->getState() == BaseState::ControlTeam1)
+        for (const auto & elem : this->bases_)
+        {
+            if((elem)->getState() == BaseState::ControlTeam1)
             {
                 amountControlled++;
             }
-            if((*it)->getState() == BaseState::ControlTeam2)
+            if((elem)->getState() == BaseState::ControlTeam2)
             {
                 amountControlled2++;
@@ -187 +187 @@
             }
 
-            for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
-            {
-                if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
+            for (auto & elem : this->teamnumbers_)
+            {
+                if (elem.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                     continue;
 
-                if (it->second == winningteam)
-                    this->gtinfo_->sendAnnounceMessage("You have won the match!", it->first->getClientID());
+                if (elem.second == winningteam)
+                    this->gtinfo_->sendAnnounceMessage("You have won the match!", elem.first->getClientID());
                 else
-                    this->gtinfo_->sendAnnounceMessage("You have lost the match!", it->first->getClientID());
+                    this->gtinfo_->sendAnnounceMessage("You have lost the match!", elem.first->getClientID());
             }
 
@@ -238 +238 @@
         int count = 0;
 
-        for (std::set<TeamBaseMatchBase*>::const_iterator it = this->bases_.begin(); it != this->bases_.end(); ++it)
-        {
-            if ((*it)->getState() == BaseState::ControlTeam1 && team == 0)
+        for (const auto & elem : this->bases_)
+        {
+            if ((elem)->getState() == BaseState::ControlTeam1 && team == 0)
                 count++;
-            if ((*it)->getState() == BaseState::ControlTeam2 && team == 1)
+            if ((elem)->getState() == BaseState::ControlTeam2 && team == 1)
                 count++;
         }
@@ -258 +258 @@
     {
         unsigned int i = 0;
-        for (std::set<TeamBaseMatchBase*>::const_iterator it = this->bases_.begin(); it != this->bases_.end(); ++it)
+        for (const auto & elem : this->bases_)
         {
             i++;
             if (i > index)
-                return (*it);
+                return (elem);
         }
         return nullptr;