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

code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc

@@ -65 +65 @@
         {
             // Delete all children
-            for (auto & elem : this->attachedShapes_)
+            for (auto& mapEntry : this->attachedShapes_)
             {
                 // make sure that the child doesn't want to detach itself --> speedup because of the missing update
-                elem.first->notifyDetached();
-                elem.first->destroy();
-                if (this->collisionShape_ == elem.second)
+                mapEntry.first->notifyDetached();
+                mapEntry.first->destroy();
+                if (this->collisionShape_ == mapEntry.second)
                     this->collisionShape_ = nullptr; // don't destroy it twice
             }
@@ -246 +246 @@
     {
         unsigned int i = 0;
-        for (const auto & elem : this->attachedShapes_)
+        for (const auto& mapEntry : this->attachedShapes_)
         {
             if (i == index)
-                return elem.first;
+                return mapEntry.first;
             ++i;
         }
@@ -266 +266 @@
         std::vector<CollisionShape*> shapes;
         // Iterate through all attached CollisionShapes and add them to the list of shapes.
-        for(auto & elem : this->attachedShapes_)
-            shapes.push_back(elem.first);
+        for(auto& mapEntry : this->attachedShapes_)
+            shapes.push_back(mapEntry.first);
 
         // Delete the compound shape and create a new one.
@@ -274 +274 @@
 
         // Re-attach all CollisionShapes.
-        for(auto shape : shapes)
-        {
-            
+        for(CollisionShape* shape : shapes)
+        {
             shape->setScale3D(this->getScale3D());
             // Only actually attach if we didn't pick a CompoundCollisionShape with no content.