Convert all list containers to vectors

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

diff --git a/source/container.cpp b/source/container.cpp
index 6e1a3562f5280a853d1996f6b99e973f0a0d25eb..64e3a9a7e296ce374819abddc035112a18948e53 100644 (file)
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include "container.h"
 #include "part.h"
 
@@ -11,17 +12,6 @@ hierarchy_error::hierarchy_error(const string &w):
 { }
 
 
-Container::Container():
-       click_focus(0),
-       click_button(0),
-       pointer_focus(0),
-       pointer_grabbed(false),
-       input_focus(0),
-       saved_input_focus(0),
-       touch_focus(0),
-       children_rebuild_needed(false)
-{ }
-
 Container::~Container()
 {
        while(!children.empty())
@@ -41,19 +31,18 @@ void Container::add(Widget &wdg)
 
 void Container::remove(Widget &wdg)
 {
-       for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
-               if((*i)->widget==&wdg)
-               {
-                       wdg.set_parent(0);
-                       delete *i;
-                       children.erase(i);
-                       if(wdg.get_animation_interval())
-                               check_animation_interval();
-                       on_child_removed(wdg);
-                       return;
-               }
+       auto i = find_if(children, [&wdg](const Child *c){ return c->widget==&wdg; });
+       if(i==children.end())
+               throw hierarchy_error("widget not in container");
 
-       throw hierarchy_error("widget not in container");
+       if(&wdg==saved_input_focus)
+               saved_input_focus = nullptr;
+       wdg.set_parent(nullptr);
+       delete *i;
+       children.erase(i);
+       if(wdg.get_animation_interval())
+               check_animation_interval();
+       on_child_removed(wdg);
 }
 
 Container::Child *Container::create_child(Widget *wdg)
@@ -91,30 +80,30 @@ void Container::reposition_child(Widget &child, const Part &part) const
        child.set_geometry(determine_child_geometry(child, part));
 }
 
-list<Widget *> Container::get_children() const
+vector<Widget *> Container::get_children() const
 {
-       list<Widget *> result;
-       for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
-               result.push_back((*i)->widget);
+       vector<Widget *> result;
+       for(const Child *c: children)
+               result.push_back(c->widget);
        return result;
 }
 
-Widget *Container::get_child_at(int x, int y) const
+Widget *Container::find_child_at(int x, int y) const
 {
-       for(list<Child *>::const_iterator i=children.end(); i!=children.begin();)
+       for(auto i=children.end(); i!=children.begin();)
                if((*--i)->widget->is_visible() && (*i)->widget->get_geometry().is_inside(x, y))
                        return (*i)->widget;
 
-       return 0;
+       return nullptr;
 }
 
-Widget *Container::get_descendant_at(int x, int y) const
+Widget *Container::find_descendant_at(int x, int y) const
 {
-       Widget *wdg = get_child_at(x, y);
+       Widget *wdg = find_child_at(x, y);
        if(Container *cont = dynamic_cast<Container *>(wdg))
        {
                const Geometry &cgeom = wdg->get_geometry();
-               Widget *wdg2 = cont->get_descendant_at(x-cgeom.x, y-cgeom.y);
+               Widget *wdg2 = cont->find_descendant_at(x-cgeom.x, y-cgeom.y);
                if(wdg2)
                        return wdg2;
        }
@@ -123,14 +112,13 @@ Widget *Container::get_descendant_at(int x, int y) const
 
 void Container::raise(Widget &wdg)
 {
-       for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
-               if((*i)->widget==&wdg)
-               {
-                       children.splice(children.end(), children, i);
-                       return;
-               }
+       auto i = find_if(children, [&wdg](const Child *c){ return c->widget==&wdg; });
+       if(i==children.end())
+               throw hierarchy_error("widget not in container");
 
-       throw hierarchy_error("widget not in container");
+       Child *c = *i;
+       children.erase(i);
+       children.push_back(c);
 }
 
 void Container::set_pointer_focus(Widget *wdg, bool grab)
@@ -177,9 +165,9 @@ Widget *Container::get_final_input_focus() const
 void Container::check_animation_interval()
 {
        Time::TimeDelta shortest;
-       for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+       for(const Child *c: children)
        {
-               const Time::TimeDelta &child_iv = (*i)->widget->get_animation_interval();
+               const Time::TimeDelta &child_iv = c->widget->get_animation_interval();
                if(child_iv && (!shortest || child_iv<shortest))
                        shortest = child_iv;
        }
@@ -195,8 +183,8 @@ void Container::rebuild_hierarchy()
        if(children_rebuild_needed)
        {
                children_rebuild_needed = false;
-               for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
-                       (*i)->widget->rebuild_hierarchy();
+               for(Child *c: children)
+                       c->widget->rebuild_hierarchy();
        }
 }
 
@@ -225,9 +213,9 @@ void Container::button_release(int x, int y, unsigned btn)
        {
                if(child==click_focus && btn==click_button)
                {
-                       click_focus = 0;
+                       click_focus = nullptr;
                        if(!pointer_focus)
-                               set_pointer_focus(get_child_at(x, y));
+                               set_pointer_focus(find_child_at(x, y));
                }
 
                const Geometry &cgeom = child->get_geometry();
@@ -239,7 +227,7 @@ void Container::pointer_motion(int x, int y)
 {
        Widget *child = get_pointer_target(x, y, false);
        if(!pointer_grabbed)
-               set_pointer_focus((child && child->get_geometry().is_inside(x, y)) ? child : 0);
+               set_pointer_focus((child && child->get_geometry().is_inside(x, y)) ? child : nullptr);
 
        if(child)
        {
@@ -258,18 +246,18 @@ Widget *Container::get_pointer_target(int x, int y, bool touch) const
                return touch_focus;
        else
        {
-               Widget *child = get_child_at(x, y);
+               Widget *child = find_child_at(x, y);
                if(child && child->is_enabled())
                        return child;
                else
-                       return 0;
+                       return nullptr;
        }
 }
 
 void Container::pointer_leave()
 {
        Widget::pointer_leave();
-       set_pointer_focus(0);
+       set_pointer_focus(nullptr);
 }
 
 void Container::touch_press(int x, int y, unsigned finger)
@@ -291,7 +279,7 @@ void Container::touch_release(int x, int y, unsigned finger)
        {
                // TODO track focus for each finger separately
                if(child==touch_focus)
-                       touch_focus = 0;
+                       touch_focus = nullptr;
 
                const Geometry &cgeom = child->get_geometry();
                child->touch_release(x-cgeom.x, y-cgeom.y, finger);
@@ -333,7 +321,7 @@ bool Container::character(wchar_t ch)
 
 void Container::focus_in()
 {
-       if(saved_input_focus && saved_input_focus->get_parent()==this)
+       if(saved_input_focus)
                set_input_focus(saved_input_focus);
        Widget::focus_in();
 }
@@ -341,7 +329,7 @@ void Container::focus_in()
 void Container::focus_out()
 {
        saved_input_focus = input_focus;
-       set_input_focus(0);
+       set_input_focus(nullptr);
        Widget::focus_out();
 }
 
@@ -355,29 +343,29 @@ bool Container::navigate(Navigation nav)
 
 void Container::animate(const Time::TimeDelta &dt)
 {
-       for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
+       for(Child *c: children)
        {
-               const Time::TimeDelta &child_iv = (*i)->widget->get_animation_interval();
+               const Time::TimeDelta &child_iv = c->widget->get_animation_interval();
                if(!child_iv)
                        continue;
 
-               (*i)->time_since_animate += dt;
-               if((*i)->time_since_animate>=child_iv)
+               c->time_since_animate += dt;
+               if(c->time_since_animate>=child_iv)
                {
-                       Time::TimeDelta child_dt = (*i)->time_since_animate;
-                       (*i)->time_since_animate = min((*i)->time_since_animate-child_iv, child_iv);
-                       (*i)->widget->animate(child_dt);
+                       Time::TimeDelta child_dt = c->time_since_animate;
+                       c->time_since_animate = min(c->time_since_animate-child_iv, child_iv);
+                       c->widget->animate(child_dt);
                }
        }
 }
 
 void Container::on_reparent()
 {
-       for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
+       for(const Child *c: children)
        {
-               if(Container *c = dynamic_cast<Container *>((*i)->widget))
-                       c->on_reparent();
-               (*i)->widget->update_style();
+               if(Container *o = dynamic_cast<Container *>(c->widget))
+                       o->on_reparent();
+               c->widget->update_style();
        }
 }
 
@@ -410,11 +398,11 @@ void Container::Child::visibility_changed(bool v)
        if(!v)
        {
                if(widget==container.click_focus)
-                       container.click_focus = 0;
+                       container.click_focus = nullptr;
                if(widget==container.pointer_focus)
-                       container.set_pointer_focus(0);
+                       container.set_pointer_focus(nullptr);
                if(widget==container.input_focus)
-                       container.set_input_focus(0);
+                       container.set_input_focus(nullptr);
        }
 }
 
@@ -440,7 +428,7 @@ void Container::Child::ungrab_pointer()
        if(container.pointer_grabbed && container.pointer_focus==widget)
        {
                // XXX Should set to the widget under pointer
-               container.set_pointer_focus(0);
+               container.set_pointer_focus(nullptr);
                container.signal_ungrab_pointer.emit();
        }
 }