X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=155682616f44245bbe9ff5dbeb9f46f56a55552d;hb=81c4024fb6acf37df702a803dc4efdf82a81525a;hp=59c363ce02b658bfbf0de73afc0770d8901b16e7;hpb=9f032a71201e6ad964e46a2a06c4003503b7dd54;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index 59c363c..1556826 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -24,11 +24,10 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-DataFile::LoadableTypeRegistry<Panel::Loader, Panel::Loader::AddChildType> Panel::widget_registry;
+TypeRegistry<Panel::Loader::AddChildType, Panel::Loader &> Panel::widget_registry;
 bool Panel::widget_registry_init_done = false;
 
-Panel::Panel():
-	layout(0)
+Panel::Panel()
 {
 	input_type = INPUT_NAVIGATION;
 }
@@ -36,7 +35,7 @@ Panel::Panel():
 Panel::~Panel()
 {
 	delete layout;
-	layout = 0;
+	layout = nullptr;
 }
 
 void Panel::set_layout(Layout *l)
@@ -56,9 +55,9 @@ void Panel::render_special(const Part &part, GL::Renderer &renderer) const
 {
 	if(part.get_name()=="children")
 	{
-		for(list<Container::Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
-			if((*i)->widget->is_visible())
-				(*i)->widget->render(renderer);
+		for(const Container::Child *c: children)
+			if(c->widget->is_visible())
+				c->widget->render(renderer);
 	}
 }
 
@@ -109,7 +108,7 @@ bool Panel::navigate(Navigation nav)
 	}
 	else if(nav==NAV_NEXT || nav==NAV_PREVIOUS)
 	{
-		vector<Widget *>::iterator i = find(nav_order, input_focus);
+		auto i = find(nav_order, input_focus);
 
 		if(nav==NAV_NEXT)
 		{
@@ -135,14 +134,14 @@ bool Panel::navigate(Navigation nav)
 
 Widget *Panel::find_next_child(int origin_x, int origin_y, int origin_dim, int nav_x, int nav_y) const
 {
-	Widget *sibling = 0;
+	Widget *sibling = nullptr;
 	int best_score = 0;
-	for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+	for(const Child *c: children)
 	{
-		if((*i)->widget==input_focus || !(*i)->widget->is_focusable())
+		if(c->widget==input_focus || !c->widget->is_focusable())
 			continue;
 
-		const Geometry &cgeom = (*i)->widget->get_geometry();
+		const Geometry &cgeom = c->widget->get_geometry();
 		int dx = compute_delta(cgeom.x, cgeom.w, origin_x, origin_dim, nav_x);
 		int dy = compute_delta(cgeom.y, cgeom.h, origin_y, origin_dim, nav_y);
 
@@ -154,7 +153,7 @@ Widget *Panel::find_next_child(int origin_x, int origin_y, int origin_dim, int n
 
 		if(score>=0 && (!sibling || score<best_score))
 		{
-			sibling = (*i)->widget;
+			sibling = c->widget;
 			best_score = score;
 		}
 	}
@@ -196,7 +195,7 @@ void Panel::on_child_added(Widget &wdg)
 
 void Panel::on_child_removed(Widget &wdg)
 {
-	vector<Widget *>::iterator i = std::remove(nav_order.begin(), nav_order.end(), &wdg);
+	auto i = std::remove(nav_order.begin(), nav_order.end(), &wdg);
 	if(i!=nav_order.end())
 		nav_order.erase(i, nav_order.end());
 
@@ -211,7 +210,7 @@ void Panel::on_child_removed(Widget &wdg)
 Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 	DataFile::DerivedObjectLoader<Panel, Widget::Loader>(p),
 	wdg_map(m),
-	last_widget(0)
+	last_widget(nullptr)
 {
 	if(!widget_registry_init_done)
 	{
@@ -240,7 +239,7 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 	add("layout",    &Loader::layout);
 	add("row",       &Loader::arrangement<Row>);
 	add("stack",     &Loader::arrangement<Stack>);
-	widget_registry.add_all(*this);
+	widget_registry.invoke_all(*this);
 }
 
 Layout &Panel::Loader::get_layout()