Changeset 10821 for code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.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/worldentities/ControllableEntity.cc (modified) (3 diffs)

code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc

@@ -165 +165 @@
     {
         unsigned int i = 0;
-        for (std::list<StrongPtr<CameraPosition>>::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
+        for (const auto & elem : this->cameraPositions_)
         {
             if (i == index)
-                return (*it);
+                return (elem);
             ++i;
         }
@@ -180 +180 @@
 
         unsigned int counter = 0;
-        for (std::list<StrongPtr<CameraPosition>>::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
-        {
-            if ((*it) == this->currentCameraPosition_)
+        for (const auto & elem : this->cameraPositions_)
+        {
+            if ((elem) == this->currentCameraPosition_)
                 break;
             counter++;
@@ -477 +477 @@
         if (parent)
         {
-            for (std::list<StrongPtr<CameraPosition>>::iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
-                if ((*it)->getIsAbsolute())
-                    parent->attach((*it));
+            for (auto & elem : this->cameraPositions_)
+                if ((elem)->getIsAbsolute())
+                    parent->attach((elem));
         }
     }