Changeset 10821 for code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.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/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 (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++)
+            for (const auto & elem : this->getAttachedObjects())
             {
                 if(!this->isActive())
                 {
-                    (*it)->bActiveMem_ = (*it)->isActive();
-                    (*it)->setActive(this->isActive());
+                    (elem)->bActiveMem_ = (elem)->isActive();
+                    (elem)->setActive(this->isActive());
                 }
                 else
                 {
-                    (*it)->setActive((*it)->bActiveMem_);
+                    (elem)->setActive((elem)->bActiveMem_);
                 }
             }
@@ -259 +259 @@
         {
             // iterate over all children and change their visibility as well
-            for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++)
+            for (const auto & elem : this->getAttachedObjects())
             {
                 if(!this->isVisible())
                 {
-                    (*it)->bVisibleMem_ = (*it)->isVisible();
-                    (*it)->setVisible(this->isVisible());
+                    (elem)->bVisibleMem_ = (elem)->isVisible();
+                    (elem)->setVisible(this->isVisible());
                 }
                 else
                 {
-                    (*it)->setVisible((*it)->bVisibleMem_);
+                    (elem)->setVisible((elem)->bVisibleMem_);
                 }
             }
@@ -518 +518 @@
     {
         unsigned int i = 0;
-        for (std::set<WorldEntity*>::const_iterator it = this->children_.begin(); it != this->children_.end(); ++it)
+        for (const auto & elem : this->children_)
         {
             if (i == index)
-                return (*it);
+                return (elem);
             ++i;
         }
@@ -938 +938 @@
         // Recalculate mass
         this->childrenMass_ = 0.0f;
-        for (std::set<WorldEntity*>::const_iterator it = this->children_.begin(); it != this->children_.end(); ++it)
-            this->childrenMass_ += (*it)->getMass();
+        for (const auto & elem : this->children_)
+            this->childrenMass_ += (elem)->getMass();
         recalculateMassProps();
         // Notify parent WE