Changeset 10821 for code/branches/cpp11_v2/src/orxonox/worldentities

Timestamp:

Nov 21, 2015, 7:05:53 PM (9 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

Location:

code/branches/cpp11_v2/src/orxonox/worldentities

Files:

• ControllableEntity.cc (modified) (3 diffs)
• EffectContainer.cc (modified) (1 diff)
• WorldEntity.cc (modified) (4 diffs)
• pawns/ModularSpaceShip.cc (modified) (4 diffs)
• pawns/SpaceShip.cc (modified) (6 diffs)
• pawns/TeamBaseMatchBase.cc (modified) (1 diff)

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

@@ -165 +165 @@
     {
         unsigned int i = 0;
-        for (std::list<StrongPtr<CameraPosition>>::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
+        for (const auto & elem : this->cameraPositions_)
         {
             if (i == index)
-                return (*it);
+                return (elem);
             ++i;
         }
@@ -180 +180 @@
 
         unsigned int counter = 0;
-        for (std::list<StrongPtr<CameraPosition>>::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
-        {
-            if ((*it) == this->currentCameraPosition_)
+        for (const auto & elem : this->cameraPositions_)
+        {
+            if ((elem) == this->currentCameraPosition_)
                 break;
             counter++;
@@ -477 +477 @@
         if (parent)
         {
-            for (std::list<StrongPtr<CameraPosition>>::iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
-                if ((*it)->getIsAbsolute())
-                    parent->attach((*it));
+            for (auto & elem : this->cameraPositions_)
+                if ((elem)->getIsAbsolute())
+                    parent->attach((elem));
         }
     }

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

@@ -89 +89 @@
     {
         unsigned int i = 0;
-        for (std::vector<WorldEntity*>::const_iterator it = this->effects_.begin(); it != this->effects_.end(); ++it)
+        for (const auto & elem : this->effects_)
             if (i == index)
-                return (*it);
+                return (elem);
         return nullptr;
     }

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

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/ModularSpaceShip.cc

@@ -99 +99 @@
             }
             // iterate through all attached parts
-            for(unsigned int j = 0; j < this->partList_.size(); j++)
+            for(auto & elem : this->partList_)
             {
                 // if the name of the part matches the name of the object, add the object to that parts entitylist (unless it was already done).
-                if((this->partList_[j]->getName() == this->getAttachedObject(i)->getName()) && !this->partList_[j]->hasEntity(orxonox_cast<StaticEntity*>(this->getAttachedObject(i))))
+                if((elem->getName() == this->getAttachedObject(i)->getName()) && !elem->hasEntity(orxonox_cast<StaticEntity*>(this->getAttachedObject(i))))
                 {
                     // The Entity is added to the part's entityList_
-                    this->partList_[j]->addEntity(orxonox_cast<StaticEntity*>(this->getAttachedObject(i)));
+                    elem->addEntity(orxonox_cast<StaticEntity*>(this->getAttachedObject(i)));
                     // An entry in the partMap_ is created, assigning the part to the entity.
-                    this->addPartEntityAssignment((StaticEntity*)(this->getAttachedObject(i)), this->partList_[j]);
+                    this->addPartEntityAssignment((StaticEntity*)(this->getAttachedObject(i)), elem);
                 }
             }
@@ -146 +146 @@
     ShipPart* ModularSpaceShip::getPartOfEntity(StaticEntity* entity) const
     {
-        for (std::map<StaticEntity*, ShipPart*>::const_iterator it = this->partMap_.begin(); it != this->partMap_.end(); ++it)
-        {
-            if (it->first == entity)
-                return it->second;
+        for (const auto & elem : this->partMap_)
+        {
+            if (elem.first == entity)
+                return elem.second;
         }
         return nullptr;
@@ -242 +242 @@
     ShipPart* ModularSpaceShip::getShipPartByName(std::string name)
     {
-        for(std::vector<ShipPart*>::iterator it = this->partList_.begin(); it != this->partList_.end(); ++it)
-        {
-            if(orxonox_cast<ShipPart*>(*it)->getName() == name)
-            {
-                return orxonox_cast<ShipPart*>(*it);
+        for(auto & elem : this->partList_)
+        {
+            if(orxonox_cast<ShipPart*>(elem)->getName() == name)
+            {
+                return orxonox_cast<ShipPart*>(elem);
             }
         }
@@ -261 +261 @@
     bool ModularSpaceShip::hasShipPart(ShipPart* part) const
     {
-        for(unsigned int i = 0; i < this->partList_.size(); i++)
-        {
-            if(this->partList_[i] == part)
+        for(auto & elem : this->partList_)
+        {
+            if(elem == part)
                 return true;
         }

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -158 +158 @@
 
         // Run the engines
-        for(std::vector<Engine*>::iterator it = this->engineList_.begin(); it != this->engineList_.end(); it++)
-            (*it)->run(dt);
+        for(auto & elem : this->engineList_)
+            (elem)->run(dt);
 
         if (this->hasLocalController())
@@ -318 +318 @@
     bool SpaceShip::hasEngine(Engine* engine) const
     {
-        for(unsigned int i = 0; i < this->engineList_.size(); i++)
-        {
-            if(this->engineList_[i] == engine)
+        for(auto & elem : this->engineList_)
+        {
+            if(elem == engine)
                 return true;
         }
@@ -350 +350 @@
     Engine* SpaceShip::getEngineByName(const std::string& name)
     {
-        for(size_t i = 0; i < this->engineList_.size(); ++i)
-            if(this->engineList_[i]->getName() == name)
-                return this->engineList_[i];
+        for(auto & elem : this->engineList_)
+            if(elem->getName() == name)
+                return elem;
 
         orxout(internal_warning) << "Couldn't find Engine with name \"" << name << "\"." << endl;
@@ -396 +396 @@
     void SpaceShip::addSpeedFactor(float factor)
     {
-        for(unsigned int i=0; i<this->engineList_.size(); i++)
-            this->engineList_[i]->addSpeedMultiply(factor);
+        for(auto & elem : this->engineList_)
+            elem->addSpeedMultiply(factor);
     }
 
@@ -408 +408 @@
     void SpaceShip::addSpeed(float speed)
     {
-        for(unsigned int i=0; i<this->engineList_.size(); i++)
-            this->engineList_[i]->addSpeedAdd(speed);
+        for(auto & elem : this->engineList_)
+            elem->addSpeedAdd(speed);
     }
 
@@ -436 +436 @@
     {
         float speed=0;
-        for(unsigned int i=0; i<this->engineList_.size(); i++)
-        {
-            if(this->engineList_[i]->getMaxSpeedFront() > speed)
-                speed = this->engineList_[i]->getMaxSpeedFront();
+        for(auto & elem : this->engineList_)
+        {
+            if(elem->getMaxSpeedFront() > speed)
+                speed = elem->getMaxSpeedFront();
         }
         return speed;

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc

@@ -80 +80 @@
 
         std::set<WorldEntity*> attachments = this->getAttachedObjects();
-        for (std::set<WorldEntity*>::iterator it = attachments.begin(); it != attachments.end(); ++it)
+        for (const auto & attachment : attachments)
         {
-            if ((*it)->isA(Class(TeamColourable)))
+            if ((attachment)->isA(Class(TeamColourable)))
             {
-                TeamColourable* tc = orxonox_cast<TeamColourable*>(*it);
+                TeamColourable* tc = orxonox_cast<TeamColourable*>(attachment);
                 tc->setTeamColour(colour);
             }