X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstyle.h;h=08e274c3803755d1ef1432a7bfcc154ff7eb3962;hb=5e8285302c1d04b631682a82d56c5afc46d20ad5;hp=620aa21245bdf03f2ca0c788ffb9aa9c88dc2b67;hpb=51fd0d0fe7ad8a617de8f71985e0c4cb60fec3a9;p=libs%2Fgltk.git

diff --git a/source/style.h b/source/style.h
index 620aa21..08e274c 100644
--- a/source/style.h
+++ b/source/style.h
@@ -3,7 +3,7 @@
 
 #include <msp/gl/color.h>
 #include <msp/gl/font.h>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "part.h"
 
 namespace Msp {
@@ -18,18 +18,11 @@ generic properties.
 class Style
 {
 public:
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::CollectionObjectLoader<Style, Resources>
 	{
-	private:
-		Style &style;
-		Resources &res;
-
 	public:
-		typedef Resources Collection;
-
 		Loader(Style &, Resources &);
-		Style &get_object() const { return style; }
-		Resources &get_collection() const { return res; }
+
 	private:
 		void font(const std::string &);
 		void font_color(float, float, float);