Use ObjectLoaders where appropriate

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index 5efed1a08ad06bd1ef4db470b3c263f4f4d53f09..140cca16f667a40def5f4497b1c772a66df5a6c0 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -2,7 +2,7 @@
 #define COMPONENT_H_
 
 #include <string>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include <msp/fs/path.h>
 #include "buildinfo.h"
 #include "installmap.h"
@@ -20,14 +20,10 @@ their own.
 class Component
 {
 public:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<Component>
        {
-       private:
-               Component &comp;
-
        public:
                Loader(Component &);
-               Component &get_object() { return comp; }
        private:
                void source(const std::string &);
                void require(const std::string &);
@@ -37,7 +33,6 @@ public:
 
        enum Type
        {
-               HEADERS,
                LIBRARY,
                PROGRAM,
                MODULE,