Convert loops and iterators to use C++11 features

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

diff --git a/source/list.cpp b/source/list.cpp
index 9eff09bb47566a1a6785ee909327da878f8a29ce..5dd6d3ead5619927d7f31ed1747c2c72d221c885 100644 (file)
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -9,7 +9,6 @@
 #include "part.h"
 #include "style.h"
 #include "text.h"
-#include "vslider.h"
 
 using namespace std;
 
@@ -120,8 +119,8 @@ void List::set_data(ListData &d)
        own_data = false;
        observer = new DataObserver(*this);
 
-       for(vector<Item *>::iterator i=items.begin(); i!=items.end(); ++i)
-               delete *i;
+       for(Item *i: items)
+               delete i;
        items.clear();
        unsigned n_items = data->size();
        for(unsigned i=0; i<n_items; ++i)
@@ -136,7 +135,7 @@ void List::set_data(ListData &d)
 void List::items_changed()
 {
        signal_autosize_changed.emit();
-       rebuild();
+       mark_rebuild();
 }
 
 List::Item *List::create_item(unsigned index)
@@ -404,7 +403,7 @@ void List::item_autosize_changed(Item *item)
 {
        item->autosize();
        signal_autosize_changed.emit();
-       rebuild();
+       mark_rebuild();
 }
 
 void List::reposition_items(bool record_rows)
@@ -507,6 +506,7 @@ void List::check_view_range()
                first_row = max_scroll;
 
        slider.set_range(0, max_scroll);
+       slider.set_page_size(rows.size()-max_scroll);
        slider.set_value(max_scroll-first_row);
 }
 
@@ -527,7 +527,7 @@ void List::slider_value_changed(double value)
        if(max_scroll>0 && !ignore_slider_change)
        {
                first_row = max_scroll-static_cast<unsigned>(value);
-               rebuild();
+               mark_rebuild();
        }
 }
 
@@ -577,8 +577,8 @@ void List::DataObserver::cleared()
 {
        list.sel_index = -1;
        list.focus_index = -1;
-       for(vector<Item *>::iterator i=list.items.begin(); i!=list.items.end(); ++i)
-               delete *i;
+       for(Item *i: list.items)
+               delete i;
        list.items.clear();
        list.items_changed();
 
@@ -605,10 +605,10 @@ void List::Item::autosize_special(const Part &part, Geometry &ageom) const
        if(part.get_name()=="children")
        {
                const Sides &margin = part.get_margin();
-               for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+               for(const Child *c: children)
                {
                        Geometry cgeom;
-                       (*i)->widget->autosize(cgeom);
+                       c->widget->autosize(cgeom);
                        ageom.w = max(ageom.w, cgeom.x+cgeom.w+margin.right);
                        ageom.h = max(ageom.h, cgeom.y+cgeom.h+margin.top);
                }
@@ -624,8 +624,8 @@ void List::Item::render_special(const Part &part, GL::Renderer &renderer) const
 {
        if(part.get_name()=="children")
        {
-               for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
-                       (*i)->widget->render(renderer);
+               for(const Child *c: children)
+                       c->widget->render(renderer);
        }
 }
 
@@ -651,12 +651,13 @@ void List::MultiColumnItem::check_widths(vector<unsigned> &widths) const
                widths.resize(children.size(), 0);
 
        unsigned n = 0;
-       for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i, ++n)
+       for(const Child *c: children)
        {
                Geometry cgeom;
-               (*i)->widget->autosize(cgeom);
+               c->widget->autosize(cgeom);
                // TODO invent a better way to specify spacings
                widths[n] = max(widths[n], cgeom.w+8);
+               ++n;
        }
 }
 
@@ -672,10 +673,10 @@ void List::MultiColumnItem::set_widths(const vector<unsigned> &widths)
        const Sides &margin = part->get_margin();
        int x = margin.left;
        unsigned n = 0;
-       for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i, ++n)
+       for(const Child *c: children)
        {
-               (*i)->widget->set_position(x, margin.bottom);
-               x += widths[n];
+               c->widget->set_position(x, margin.bottom);
+               x += widths[n++];
        }
 }
 
@@ -684,14 +685,14 @@ void List::MultiColumnItem::on_style_change()
        if(!style)
                return;
 
-       for(std::list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
-               (*i)->widget->autosize();
+       for(const Child *c: children)
+               c->widget->autosize();
 
        vector<unsigned> widths;
        List *list = static_cast<List *>(parent);
-       for(vector<Item *>::const_iterator i=list->items.begin(); i!=list->items.end(); ++i)
-               if(*i!=this)
-                       if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(*i))
+       for(Item *i: list->items)
+               if(i!=this)
+                       if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(i))
                                mci->check_widths(widths);
 
        vector<unsigned> self_widths(widths);
@@ -702,8 +703,8 @@ void List::MultiColumnItem::on_style_change()
 
        if(update_all)
        {
-               for(vector<Item *>::const_iterator i=list->items.begin(); i!=list->items.end(); ++i)
-                       if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(*i))
+               for(Item *i: list->items)
+                       if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(i))
                                mci->set_widths(self_widths);
        }