Convert loops and iterators to use C++11 features

[libs/gltk.git] / source / arrangement.cpp

diff --git a/source/arrangement.cpp b/source/arrangement.cpp
index 5eeebbb99abe8df310fca5720df8f1ff7d3233d3..838a488ea9fdfccebef388b22241bb5771542dbc 100644 (file)
--- a/source/arrangement.cpp
+++ b/source/arrangement.cpp
@@ -31,8 +31,8 @@ void Arrangement::arrange(Arrangement &arr)
        {
                Side side = static_cast<Side>(i);
                const Edge &edge = arr.get_edge(side);
-               for(list<Widget *>::const_iterator j=edge.widgets.begin(); j!=edge.widgets.end(); ++j)
-                       process_widget(**j, side, edge.aligned);
+               for(Widget *w: edge.widgets)
+                       process_widget(*w, side, edge.aligned);
        }
        finish_slot();
 }
@@ -44,13 +44,13 @@ void Arrangement::add_constraint(Widget &wdg, Layout::ConstraintType type, Side
 
 void Arrangement::add_constraint(Widget &wdg, Layout::ConstraintType type, const Edge &edge, int spacing)
 {
-       for(list<Widget *>::const_iterator i=edge.widgets.begin(); i!=edge.widgets.end(); ++i)
-               if(*i!=&wdg)
+       for(Widget *w: edge.widgets)
+               if(w!=&wdg)
                {
                        if(spacing<0)
-                               layout.add_constraint(wdg, type, **i);
+                               layout.add_constraint(wdg, type, *w);
                        else
-                               layout.add_constraint(wdg, type, **i, spacing);
+                               layout.add_constraint(wdg, type, *w, spacing);
                }
 }
 
@@ -106,7 +106,7 @@ void Arrangement::Edge::align()
        if(aligned || widgets.empty())
                return;
 
-       list<Widget *>::iterator second = widgets.begin();
+       auto second = widgets.begin();
        ++second;
 
        widgets.erase(second, widgets.end());