Changeset 10821 for code/branches/cpp11_v2/src/modules/docking

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/modules/docking

Files:

• Dock.cc (modified) (2 diffs)
• DockingAnimation.cc (modified) (1 diff)
• DockingEffect.cc (modified) (1 diff)

code/branches/cpp11_v2/src/modules/docking/Dock.cc

@@ -327 +327 @@
     const DockingEffect* Dock::getEffect(unsigned int i) const
     {
-        for (std::list<DockingEffect*>::const_iterator effect = this->effects_.begin(); effect != this->effects_.end(); ++effect)
+        for (const auto & elem : this->effects_)
         {
             if(i == 0)
-               return *effect;
+               return elem;
             i--;
         }
@@ -346 +346 @@
     const DockingAnimation* Dock::getAnimation(unsigned int i) const
     {
-        for (std::list<DockingAnimation*>::const_iterator animation = this->animations_.begin(); animation != this->animations_.end(); ++animation)
+        for (const auto & elem : this->animations_)
         {
             if(i == 0)
-               return *animation;
+               return elem;
             i--;
         }

code/branches/cpp11_v2/src/modules/docking/DockingAnimation.cc

@@ -57 +57 @@
         bool check = true;
 
-        for (std::list<DockingAnimation*>::iterator animation = animations.begin(); animation != animations.end(); animation++)
+        for (auto & animations_animation : animations)
         {
             if(dock)
-                check &= (*animation)->docking(player);
+                check &= (animations_animation)->docking(player);
             else
-                check &= (*animation)->release(player);
+                check &= (animations_animation)->release(player);
         }
 

code/branches/cpp11_v2/src/modules/docking/DockingEffect.cc

@@ -53 +53 @@
         bool check = true;
 
-        for (std::list<DockingEffect*>::iterator effect = effects.begin(); effect != effects.end(); effect++)
+        for (auto & effects_effect : effects)
         {
             if (dock)
-                check &= (*effect)->docking(player);
+                check &= (effects_effect)->docking(player);
             else
-                check &= (*effect)->release(player);
+                check &= (effects_effect)->release(player);
         }