X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Fcontainer.cpp;fp=source%2Fcontainer.cpp;h=88e59524e8ddac754a69b7506d230d6d019957be;hp=5c175031d76515e8b2bd2c269bdd9806baeb39bc;hb=394e5c9969a30b604bfaf78fc05a8c2d5c98ab5b;hpb=90d5f5f2ebaeb8aaa4aa47a0c2207f96758cba8c

diff --git a/source/container.cpp b/source/container.cpp
index 5c17503..88e5952 100644
--- 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(new Child(*this, &wdg));
+	children.push_back(make_unique<Child>(*this, &wdg));
 	if(wdg.get_animation_interval())
 		check_animation_interval();
 	children_rebuild_needed = true;
@@ -31,14 +31,13 @@ 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();
@@ -78,7 +77,7 @@ void Container::reposition_child(Widget &child, const Part &part) const
 vector<Widget *> Container::get_children() const
 {
 	vector<Widget *> result;
-	for(const Child *c: children)
+	for(const unique_ptr<Child> &c: children)
 		result.push_back(c->widget);
 	return result;
 }
@@ -106,13 +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");
 
-	Child *c = *i;
+	unique_ptr<Child> c = move(*i);
 	children.erase(i);
-	children.push_back(c);
+	children.push_back(move(c));
 }
 
 void Container::set_pointer_focus(Widget *wdg, bool grab)
@@ -159,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))
@@ -177,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();
 	}
 }
@@ -337,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)
@@ -355,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();