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

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/items

Files:

• MultiStateEngine.cc (modified) (1 diff)
• ShipPart.cc (modified) (1 diff)

code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.cc

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

code/branches/cpp11_v2/src/orxonox/items/ShipPart.cc

@@ -148 +148 @@
     bool ShipPart::hasEntity(StaticEntity* entity) const
     {
-        for(unsigned int i = 0; i < this->entityList_.size(); i++)
-        {
-            if(this->entityList_[i] == entity)
+        for(auto & elem : this->entityList_)
+        {
+            if(elem == entity)
                 return true;
         }