Changeset 10916 for code/branches/cpp11_v2/src/orxonox/items

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

Location:

code/branches/cpp11_v2/src/orxonox/items

Files:

• MultiStateEngine.cc (modified) (1 diff)
• ShipPart.cc (modified) (1 diff)

code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.cc

@@ -219 +219 @@
     {
         unsigned int i = 0;
-        for (const auto & elem : this->effectContainers_)
+        for (EffectContainer* effectContainer : this->effectContainers_)
         {
             if (i == index)
-                return (elem);
+                return effectContainer;
             i++;
         }

code/branches/cpp11_v2/src/orxonox/items/ShipPart.cc

@@ -143 +143 @@
     @brief
         Check whether the ShipPart has a particular Entity.
-    @param engine
+    @param search
         A pointer to the Entity to be checked.
     */
-    bool ShipPart::hasEntity(StaticEntity* entity) const
-    {
-        for(auto & elem : this->entityList_)
-        {
-            if(elem == entity)
+    bool ShipPart::hasEntity(StaticEntity* search) const
+    {
+        for(StaticEntity* entity : this->entityList_)
+        {
+            if(entity == search)
                 return true;
         }