Use std::unique_ptr for managing memory

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

diff --git a/source/container.cpp b/source/container.cpp
index 9ef46f1ab85fcd511238ecb83f3f45cf912b7caa..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,25 +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");
 
        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)
-{
-       return new Child(*this, wdg);
-}
-
 Geometry Container::determine_child_geometry(const Widget &child, const Part &part) const
 {
        Geometry pgeom = part.get_geometry();
@@ -80,10 +74,10 @@ 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;
 }
@@ -103,8 +97,7 @@ Widget *Container::find_descendant_at(int x, int y) const
        if(Container *cont = dynamic_cast<Container *>(wdg))
        {
                const Geometry &cgeom = wdg->get_geometry();
-               Widget *wdg2 = cont->find_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;
@@ -112,11 +105,13 @@ Widget *Container::find_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)
@@ -163,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))
@@ -181,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();
        }
 }
@@ -341,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)
@@ -359,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();