Changeset 10821 for code/branches/cpp11_v2/src/orxonox/worldentities/pawns/SpaceShip.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/pawns/SpaceShip.cc (modified) (6 diffs)

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;