Update loaders to use ObjectLoader as base class

[libs/gltk.git] / source / style.h

diff --git a/source/style.h b/source/style.h
index 56f7ac484afce3e94fd2ee4b639b70466e32eeeb..08e274c3803755d1ef1432a7bfcc154ff7eb3962 100644 (file)
--- 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);
@@ -46,8 +39,8 @@ private:
        PartSeq parts;
 
 public:
-       Style(Resources &);
-       const GL::Font &get_font() const  { return *font; }
+       Style();
+       const GL::Font &get_font() const;
        unsigned get_font_size() const { return font_size; }
        const GL::Color &get_font_color() const { return font_color; }
        const PartSeq &get_parts() const { return parts; }