Use std::unique_ptr for managing memory

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

diff --git a/source/container.cpp b/source/container.cpp
index ef837a2d26180a20faa9808bec18fc7868cab0d3..88e59524e8ddac754a69b7506d230d6d019957be 100644 (file)
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -21,7 +21,7 @@ Container::~Container()
 void Container::add(Widget &wdg)
 {
        wdg.set_parent(this);
-       children.push_back(create_child(&wdg));
+       children.push_back(make_unique<Child>(*this, &wdg));
        if(wdg.get_animation_interval())
                check_animation_interval();
        children_rebuild_needed = true;
@@ -31,23 +31,19 @@ void Container::add(Widget &wdg)
 
 void Container::remove(Widget &wdg)
 {
-       auto i = find_if(children, [&wdg](const Child *c){ return c->widget==&wdg; });
+       auto i = find_if(children, [&wdg](const unique_ptr<Child> &c){ return c->widget==&wdg; });
        if(i==children.end())
                throw hierarchy_error("widget not in container");
 
-       wdg.set_parent(0);
-       delete *i;
+       if(&wdg==saved_input_focus)
+               saved_input_focus = nullptr;
+       wdg.set_parent(nullptr);
        children.erase(i);
        if(wdg.get_animation_interval())
                check_animation_interval();
        on_child_removed(wdg);
 }
 
-Container::Child *Container::create_child(Widget *wdg)
-{
-       return new Child(*this, wdg);
-}
-
 Geometry Container::determine_child_geometry(const Widget &child, const Part &part) const
 {
        Geometry pgeom = part.get_geometry();
@@ -78,31 +74,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(const Child *c: children)
+       vector<Widget *> result;
+       for(const unique_ptr<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(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);
-               if(wdg2)
+               if(Widget *wdg2 = cont->find_descendant_at(x-cgeom.x, y-cgeom.y))
                        return wdg2;
        }
        return wdg;
@@ -110,11 +105,13 @@ Widget *Container::get_descendant_at(int x, int y) const
 
 void Container::raise(Widget &wdg)
 {
-       auto i = find_if(children, [&wdg](const Child *c){ return c->widget==&wdg; });
+       auto i = find_if(children, [&wdg](const unique_ptr<Child> &c){ return c->widget==&wdg; });
        if(i==children.end())
                throw hierarchy_error("widget not in container");
 
-       children.splice(children.end(), children, i);
+       unique_ptr<Child> c = move(*i);
+       children.erase(i);
+       children.push_back(move(c));
 }
 
 void Container::set_pointer_focus(Widget *wdg, bool grab)
@@ -161,7 +158,7 @@ Widget *Container::get_final_input_focus() const
 void Container::check_animation_interval()
 {
        Time::TimeDelta shortest;
-       for(const Child *c: children)
+       for(const unique_ptr<Child> &c: children)
        {
                const Time::TimeDelta &child_iv = c->widget->get_animation_interval();
                if(child_iv && (!shortest || child_iv<shortest))
@@ -179,7 +176,7 @@ void Container::rebuild_hierarchy()
        if(children_rebuild_needed)
        {
                children_rebuild_needed = false;
-               for(Child *c: children)
+               for(const unique_ptr<Child> &c: children)
                        c->widget->rebuild_hierarchy();
        }
 }
@@ -209,9 +206,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();
@@ -223,7 +220,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)
        {
@@ -242,18 +239,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)
@@ -275,7 +272,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);
@@ -317,7 +314,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();
 }
@@ -325,7 +322,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();
 }
 
@@ -339,7 +336,7 @@ bool Container::navigate(Navigation nav)
 
 void Container::animate(const Time::TimeDelta &dt)
 {
-       for(Child *c: children)
+       for(const unique_ptr<Child> &c: children)
        {
                const Time::TimeDelta &child_iv = c->widget->get_animation_interval();
                if(!child_iv)
@@ -357,7 +354,7 @@ void Container::animate(const Time::TimeDelta &dt)
 
 void Container::on_reparent()
 {
-       for(const Child *c: children)
+       for(const unique_ptr<Child> &c: children)
        {
                if(Container *o = dynamic_cast<Container *>(c->widget))
                        o->on_reparent();
@@ -394,11 +391,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);
        }
 }
 
@@ -424,7 +421,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();
        }
 }