Changeset 10916 for code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.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/WorldEntity.cc (modified) (4 diffs)

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

@@ -233 +233 @@
 
             // iterate over all children and change their activity as well
-            for (const auto & elem : this->getAttachedObjects())
+            for (WorldEntity* object : this->getAttachedObjects())
             {
                 if(!this->isActive())
                 {
-                    (elem)->bActiveMem_ = (elem)->isActive();
-                    (elem)->setActive(this->isActive());
+                    object->bActiveMem_ = object->isActive();
+                    object->setActive(this->isActive());
                 }
                 else
                 {
-                    (elem)->setActive((elem)->bActiveMem_);
+                    object->setActive(object->bActiveMem_);
                 }
             }
@@ -259 +259 @@
         {
             // iterate over all children and change their visibility as well
-            for (const auto & elem : this->getAttachedObjects())
+            for (WorldEntity* object : this->getAttachedObjects())
             {
                 if(!this->isVisible())
                 {
-                    (elem)->bVisibleMem_ = (elem)->isVisible();
-                    (elem)->setVisible(this->isVisible());
+                    object->bVisibleMem_ = object->isVisible();
+                    object->setVisible(this->isVisible());
                 }
                 else
                 {
-                    (elem)->setVisible((elem)->bVisibleMem_);
+                    object->setVisible(object->bVisibleMem_);
                 }
             }
@@ -518 +518 @@
     {
         unsigned int i = 0;
-        for (const auto & elem : this->children_)
+        for (WorldEntity* child : this->children_)
         {
             if (i == index)
-                return (elem);
+                return child;
             ++i;
         }
@@ -938 +938 @@
         // Recalculate mass
         this->childrenMass_ = 0.0f;
-        for (const auto & elem : this->children_)
-            this->childrenMass_ += (elem)->getMass();
+        for (WorldEntity* child : this->children_)
+            this->childrenMass_ += child->getMass();
         recalculateMassProps();
         // Notify parent WE