X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.h;h=140cca16f667a40def5f4497b1c772a66df5a6c0;hb=73efab6c6d83b936a6afa6e1efec0218f03e9180;hp=0d67fdeb874deaa60c1438f01764bbb1c697bf9c;hpb=e0c863681c8a5fad5918bb7730ecbc65fbdfbc64;p=builder.git

diff --git a/source/component.h b/source/component.h
index 0d67fde..140cca1 100644
--- 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,17 +20,11 @@ their own.
 class Component
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Component>
 	{
-	private:
-		Component &comp;
-		std::string inst_hdr;
-
 	public:
 		Loader(Component &);
-		Component &get_object() { return comp; }
 	private:
-		virtual void finish();
 		void source(const std::string &);
 		void require(const std::string &);
 		void build_info();
@@ -39,7 +33,6 @@ public:
 
 	enum Type
 	{
-		HEADERS,
 		LIBRARY,
 		PROGRAM,
 		MODULE,