X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Farrangement.cpp;fp=source%2Farrangement.cpp;h=838a488ea9fdfccebef388b22241bb5771542dbc;hp=5eeebbb99abe8df310fca5720df8f1ff7d3233d3;hb=b4a3d651f57c46507aaa99a71a14fea15f0e430d;hpb=70e7a223a069874cda84673a4ca541aa44b12bf2 diff --git a/source/arrangement.cpp b/source/arrangement.cpp index 5eeebbb..838a488 100644 --- a/source/arrangement.cpp +++ b/source/arrangement.cpp @@ -31,8 +31,8 @@ void Arrangement::arrange(Arrangement &arr) { Side side = static_cast(i); const Edge &edge = arr.get_edge(side); - for(list::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::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::iterator second = widgets.begin(); + auto second = widgets.begin(); ++second; widgets.erase(second, widgets.end());