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

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

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