Changeset 10916 for code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc

Timestamp:

Dec 2, 2015, 11:22:03 PM (9 years ago)

Author:

landauf

Message:

use actual types instead of 'auto'. only exception is for complicated template types, e.g. when iterating over a map

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 (const auto & elem : this->cameraPositions_)
+        for (CameraPosition* cameraPosition : this->cameraPositions_)
         {
             if (i == index)
-                return (elem);
+                return cameraPosition;
             ++i;
         }
@@ -180 +180 @@
 
         unsigned int counter = 0;
-        for (const auto & elem : this->cameraPositions_)
-        {
-            if ((elem) == this->currentCameraPosition_)
+        for (CameraPosition* cameraPosition : this->cameraPositions_)
+        {
+            if (cameraPosition == this->currentCameraPosition_)
                 break;
             counter++;
@@ -477 +477 @@
         if (parent)
         {
-            for (auto & elem : this->cameraPositions_)
-                if ((elem)->getIsAbsolute())
-                    parent->attach((elem));
+            for (CameraPosition* cameraPosition : this->cameraPositions_)
+                if (cameraPosition->getIsAbsolute())
+                    parent->attach(cameraPosition);
         }
     }