Changeset 10821 for code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.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/overlays/OverlayGroup.cc (modified) (5 diffs)

code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.cc

@@ -62 +62 @@
     OverlayGroup::~OverlayGroup()
     {
-        for (std::set<StrongPtr<OrxonoxOverlay>>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
-            (*it)->destroy();
+        for (const auto & elem : hudElements_)
+            (elem)->destroy();
         this->hudElements_.clear();
     }
@@ -86 +86 @@
     void OverlayGroup::setScale(const Vector2& scale)
     {
-        for (std::set<StrongPtr<OrxonoxOverlay>>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
-            (*it)->scale(scale / this->scale_);
+        for (const auto & elem : hudElements_)
+            (elem)->scale(scale / this->scale_);
         this->scale_ = scale;
     }
@@ -94 +94 @@
     void OverlayGroup::setScroll(const Vector2& scroll)
     {
-        for (std::set<StrongPtr<OrxonoxOverlay>>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
-            (*it)->scroll(scroll - this->scroll_);
+        for (const auto & elem : hudElements_)
+            (elem)->scroll(scroll - this->scroll_);
         this->scroll_ = scroll;
     }
@@ -147 +147 @@
         SUPER( OverlayGroup, changedVisibility );
 
-        for (std::set<StrongPtr<OrxonoxOverlay>>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
-            (*it)->changedVisibility(); //inform all Child Overlays that our visibility has changed
+        for (const auto & elem : hudElements_)
+            (elem)->changedVisibility(); //inform all Child Overlays that our visibility has changed
     }
 
@@ -155 +155 @@
         this->owner_ = owner;
 
-        for (std::set<StrongPtr<OrxonoxOverlay>>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
-            (*it)->setOwner(owner);
+        for (const auto & elem : hudElements_)
+            (elem)->setOwner(owner);
     }