Convert loops and iterators to use C++11 features

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

diff --git a/source/widget.cpp b/source/widget.cpp
index 4ef1b46358fcd18fde457b5051ea89131e02331e..6ac4d2aa7d7679bc39512614ff32705f835891b6 100644 (file)
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -52,18 +52,17 @@ void Widget::autosize(Geometry &ageom) const
                return;
 
        ageom = Geometry(geom.x, geom.y, 0, 0);
-       const Style::PartSeq &parts = style->get_parts();
-       for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+       for(const Part &p: style->get_parts())
        {
-               if(i->get_name().empty())
+               if(p.get_name().empty())
                {
-                       const Geometry &pgeom = i->get_geometry();
-                       const Sides &pmargin = i->get_margin();
+                       const Geometry &pgeom = p.get_geometry();
+                       const Sides &pmargin = p.get_margin();
                        ageom.w = max(ageom.w, pgeom.w+pmargin.left+pmargin.right);
                        ageom.h = max(ageom.h, pgeom.h+pmargin.top+pmargin.bottom);
                }
                else
-                       autosize_special(*i, ageom);
+                       autosize_special(p, ageom);
        }
 }
 
@@ -231,13 +230,12 @@ void Widget::rebuild()
                return;
 
        PartCache::Rebuild rebuild_cache(part_cache);
-       const Style::PartSeq &parts = style->get_parts();
-       for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+       for(const Part &p: style->get_parts())
        {
-               if(i->get_name().empty())
-                       i->build(geom, state, part_cache);
+               if(p.get_name().empty())
+                       p.build(geom, state, part_cache);
                else
-                       rebuild_special(*i);
+                       rebuild_special(p);
        }
 }
 
@@ -258,16 +256,15 @@ void Widget::render(GL::Renderer &renderer) const
        int y = 0;
        map_coords_to_root(x, y);
        renderer.set_matrix(GL::Matrix::translation(x, y, 0));
-       const PartCache::PartList &parts = part_cache.get_parts();
-       for(PartCache::PartList::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+       for(const CachedPart &p: part_cache.get_parts())
        {
-               if(i->mesh && i->texture)
+               if(p.mesh && p.texture)
                {
-                       renderer.set_texture(texture_tag, i->texture, &style->get_sampler());
-                       i->mesh->draw(renderer);
+                       renderer.set_texture(texture_tag, p.texture, &style->get_sampler());
+                       p.mesh->draw(renderer);
                }
-               else if(i->part)
-                       render_special(*i->part, renderer);
+               else if(p.part)
+                       render_special(*p.part, renderer);
        }
 }