From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 14 Jun 2013 17:11:18 +0000 (+0300)
Subject: Use DerivedObjectLoader for widget loaders
X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=commitdiff_plain;h=df07e8f3e239b146cbc458d3cbd69758e590d255

Use DerivedObjectLoader for widget loaders
---

diff --git a/source/button.cpp b/source/button.cpp
index 939d026..b881b3f 100644
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -127,14 +127,14 @@ void Button::on_style_change()
 
 
 Button::Loader::Loader(Button &btn):
-	Widget::Loader(btn)
+	DataFile::DerivedObjectLoader<Button, Widget::Loader>(btn)
 {
 	add("text", &Loader::text);
 }
 
 void Button::Loader::text(const std::string &t)
 {
-	static_cast<Button &>(obj).text = t;
+	obj.text = t;
 }
 
 } // namespace GLtk
diff --git a/source/button.h b/source/button.h
index e99f16b..11d8bc7 100644
--- a/source/button.h
+++ b/source/button.h
@@ -16,7 +16,7 @@ in a spacial part "text".
 class Button: public Widget
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Button, Widget::Loader>
 	{
 	public:
 		Loader(Button &);
diff --git a/source/dropdown.cpp b/source/dropdown.cpp
index fcf35ba..ee8ec55 100644
--- a/source/dropdown.cpp
+++ b/source/dropdown.cpp
@@ -162,14 +162,14 @@ void Dropdown::list_item_selected(unsigned index)
 
 
 Dropdown::Loader::Loader(Dropdown &d):
-	Widget::Loader(d)
+	DataFile::DerivedObjectLoader<Dropdown, Widget::Loader>(d)
 {
 	add("item", &Loader::item);
 }
 
 void Dropdown::Loader::item(const string &v)
 {
-	dynamic_cast<BasicListData<string> &>(dynamic_cast<Dropdown &>(obj).list.get_data()).append(v);
+	dynamic_cast<BasicListData<string> &>(obj.list.get_data()).append(v);
 }
 
 } // namespace GLtk
diff --git a/source/dropdown.h b/source/dropdown.h
index fd98f11..7a0f04d 100644
--- a/source/dropdown.h
+++ b/source/dropdown.h
@@ -13,7 +13,7 @@ class List;
 class Dropdown: virtual public Widget, private Container
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Dropdown, Widget::Loader>
 	{
 	public:
 		Loader(Dropdown &);
diff --git a/source/entry.cpp b/source/entry.cpp
index da12702..1f77842 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -301,10 +301,5 @@ void Entry::slider_value_changed(double value)
 		first_row = text.get_n_lines()-visible_rows-static_cast<unsigned>(value);
 }
 
-
-Entry::Loader::Loader(Entry &ent):
-	Widget::Loader(ent)
-{ }
-
 } // namespace GLtk
 } // namespace Msp
diff --git a/source/entry.h b/source/entry.h
index cd7d9bc..0bba6f0 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -22,12 +22,6 @@ Special parts:
 class Entry: virtual public Widget, private Container
 {
 public:
-	class Loader: public Widget::Loader
-	{
-	public:
-		Loader(Entry &);
-	};
-
 	sigc::signal<void> signal_enter;
 
 private:
diff --git a/source/label.cpp b/source/label.cpp
index f9274b4..21974be 100644
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -50,14 +50,14 @@ void Label::on_style_change()
 
 
 Label::Loader::Loader(Label &l):
-	Widget::Loader(l)
+	DataFile::DerivedObjectLoader<Label, Widget::Loader>(l)
 {
 	add("text", &Loader::text);
 }
 
 void Label::Loader::text(const string &t)
 {
-	static_cast<Label &>(obj).text = t;
+	obj.text = t;
 }
 
 } // namespace GLtk
diff --git a/source/label.h b/source/label.h
index 9a0d1f2..6cd9bcb 100644
--- a/source/label.h
+++ b/source/label.h
@@ -13,7 +13,7 @@ Labels display static text.  There is one special part: "text".
 class Label: public Widget
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Label, Widget::Loader>
 	{
 	public:
 		Loader(Label &);
diff --git a/source/list.cpp b/source/list.cpp
index 378bf70..4ce35e2 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -310,13 +310,6 @@ void List::DataObserver::refresh_strings()
 }
 
 
-List::Loader::Loader(List &l):
-	Widget::Loader(l)
-{
-	add("item", &Loader::item);
-}
-
-
 void List::Item::autosize()
 {
 	Widget::autosize();
@@ -368,9 +361,15 @@ void List::BasicItem::on_style_change()
 }
 
 
+List::Loader::Loader(List &l):
+	DataFile::DerivedObjectLoader<List, Widget::Loader>(l)
+{
+	add("item", &Loader::item);
+}
+
 void List::Loader::item(const string &v)
 {
-	dynamic_cast<BasicListData<string> &>(*dynamic_cast<List &>(obj).data).append(v);
+	dynamic_cast<BasicListData<string> &>(*obj.data).append(v);
 }
 
 } // namespace GLtk
diff --git a/source/list.h b/source/list.h
index caf403a..561e388 100644
--- a/source/list.h
+++ b/source/list.h
@@ -17,7 +17,7 @@ to allow scrolling through a long list.
 class List: virtual public Widget, private Container
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<List, Widget::Loader>
 	{
 	public:
 		Loader(List &);
diff --git a/source/panel.cpp b/source/panel.cpp
index 389e3d9..9bc7524 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -77,8 +77,7 @@ void Panel::on_child_removed(Widget &wdg)
 
 
 Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
-	Widget::Loader(p),
-	pnl(p),
+	DataFile::DerivedObjectLoader<Panel, Widget::Loader>(p),
 	wdg_map(m)
 {
 	add("button",    &Loader::child<Button>);
@@ -98,7 +97,7 @@ void Panel::Loader::child(const string &n)
 {
 	RefPtr<T> chl = new T();
 	load_sub(*chl);
-	pnl.add(*chl.get());
+	obj.add(*chl.get());
 	wdg_map[n] = chl.release();
 }
 
@@ -106,7 +105,7 @@ void Panel::Loader::panel(const string &n)
 {
 	RefPtr<Panel> p = new Panel();
 	load_sub(*p, wdg_map);
-	pnl.add(*p.get());
+	obj.add(*p.get());
 	wdg_map[n] = p.release();
 }
 
diff --git a/source/panel.h b/source/panel.h
index c50725b..aa94ff3 100644
--- a/source/panel.h
+++ b/source/panel.h
@@ -16,13 +16,12 @@ ignored.
 class Panel: public Container
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Panel, Widget::Loader>
 	{
 	public:
 		typedef std::map<std::string, Widget *> WidgetMap;
 
 	private:
-		Panel &pnl;
 		WidgetMap &wdg_map;
 	
 	public:
diff --git a/source/slider.cpp b/source/slider.cpp
index dc8a28a..32e221e 100644
--- a/source/slider.cpp
+++ b/source/slider.cpp
@@ -68,17 +68,12 @@ void Slider::end_drag()
 
 
 Slider::Loader::Loader(Slider &s):
-	Widget::Loader(s)
+	DataFile::DerivedObjectLoader<Slider, Widget::Loader>(s)
 {
 	add("range", &Slider::min, &Slider::max);
 	add("step",  &Slider::step);
 	add("value", &Slider::value);
 }
 
-Slider &Slider::Loader::get_object() const
-{
-	return static_cast<Slider &>(obj);
-}
-
 } // namespace GLtk
 } // namespace Msp
diff --git a/source/slider.h b/source/slider.h
index e2d8109..6612c61 100644
--- a/source/slider.h
+++ b/source/slider.h
@@ -15,11 +15,10 @@ variations.
 class Slider: public Widget
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Slider, Widget::Loader>
 	{
 	public:
 		Loader(Slider &);
-		Slider &get_object() const;
 	};
 
 	sigc::signal<void, double> signal_value_changed;
diff --git a/source/toggle.cpp b/source/toggle.cpp
index 789ae37..e34b43a 100644
--- a/source/toggle.cpp
+++ b/source/toggle.cpp
@@ -103,27 +103,21 @@ void Toggle::on_style_change()
 
 
 Toggle::Loader::Loader(Toggle &t):
-	Widget::Loader(t)
+	DataFile::DerivedObjectLoader<Toggle, Widget::Loader>(t)
 {
 	add("exclusive", &Toggle::exclusive);
 	add("text",      &Loader::text);
 	add("value",     &Toggle::value);
 }
 
-Toggle &Toggle::Loader::get_object() const
-{
-	return static_cast<Toggle &>(obj);
-}
-
 void Toggle::Loader::finish()
 {
-	Toggle &tgl = get_object();
-	tgl.set_state(ACTIVE, (tgl.value ? ACTIVE : NORMAL));
+	obj.set_state(ACTIVE, (obj.value ? ACTIVE : NORMAL));
 }
 
 void Toggle::Loader::text(const string &t)
 {
-	get_object().text = t;
+	obj.text = t;
 }
 
 } // namespace GLtk
diff --git a/source/toggle.h b/source/toggle.h
index fd7e762..0a8a893 100644
--- a/source/toggle.h
+++ b/source/toggle.h
@@ -14,11 +14,10 @@ Allows toggling a value between two states.
 class Toggle: public Widget
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Toggle, Widget::Loader>
 	{
 	public:
 		Loader(Toggle &);
-		Toggle &get_object() const;
 	private:
 		virtual void finish();
 		void text(const std::string &);