X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Fcontainer.cpp;fp=source%2Fcontainer.cpp;h=d5fa6d59e3d0882fc593611c640af316d6124947;hp=6e1a3562f5280a853d1996f6b99e973f0a0d25eb;hb=b4a3d651f57c46507aaa99a71a14fea15f0e430d;hpb=70e7a223a069874cda84673a4ca541aa44b12bf2

diff --git a/source/container.cpp b/source/container.cpp
index 6e1a356..d5fa6d5 100644
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include "container.h"
 #include "part.h"
 
@@ -41,19 +42,16 @@ 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");
+	wdg.set_parent(0);
+	delete *i;
+	children.erase(i);
+	if(wdg.get_animation_interval())
+		check_animation_interval();
+	on_child_removed(wdg);
 }
 
 Container::Child *Container::create_child(Widget *wdg)
@@ -94,14 +92,14 @@ void Container::reposition_child(Widget &child, const Part &part) const
 list<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);
+	for(const Child *c: children)
+		result.push_back(c->widget);
 	return result;
 }
 
 Widget *Container::get_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;
 
@@ -123,14 +121,11 @@ 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");
+	children.splice(children.end(), children, i);
 }
 
 void Container::set_pointer_focus(Widget *wdg, bool grab)
@@ -177,9 +172,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 +190,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();
 	}
 }
 
@@ -355,29 +350,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();
 	}
 }