Derive BuildInfo::Loader from ObjectLoader

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 0ac20c91e0fce90f67caa5d7f07d0739215d094c..e9dcec0777e28f1201bc5a223f0853839b5d88f8 100644 (file)
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -67,7 +67,7 @@ void BuildInfo::unique()
 
 
 BuildInfo::Loader::Loader(BuildInfo &bi):
-       binfo(bi)
+       DataFile::ObjectLoader<BuildInfo>(bi)
 {
        add("cflag",   &Loader::cflag);
        add("incpath", &Loader::incpath);
@@ -80,35 +80,35 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
 
 void BuildInfo::Loader::cflag(const std::string &s)
 {
-       binfo.cflags.push_back(s);
+       obj.cflags.push_back(s);
 }
 
 void BuildInfo::Loader::incpath(const std::string &s)
 {
-       binfo.incpath.push_back(s);
+       obj.incpath.push_back(s);
 }
 
 void BuildInfo::Loader::define(const std::string &s)
 {
-       binfo.defines.push_back(s);
+       obj.defines.push_back(s);
 }
 
 void BuildInfo::Loader::ldflag(const std::string &s)
 {
-       binfo.ldflags.push_back(s);
+       obj.ldflags.push_back(s);
 }
 
 void BuildInfo::Loader::libpath(const std::string &s)
 {
-       binfo.libpath.push_back(s);
+       obj.libpath.push_back(s);
 }
 
 void BuildInfo::Loader::library(const std::string &s)
 {
-       binfo.libs.push_back(s);
+       obj.libs.push_back(s);
 }
 
 void BuildInfo::Loader::warning(const std::string &s)
 {
-       binfo.warnings.push_back(s);
+       obj.warnings.push_back(s);
 }

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 11de3b0fe7b2a938b93d76c0bb253210851cb54e..0d7b64aeae4e8e82be35bfe9117cf26f7cd3c2e0 100644 (file)
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -3,7 +3,7 @@
 
 #include <list>
 #include <string>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "misc.h"
 
 /**
@@ -13,11 +13,8 @@ form.  Allows combining with other BuildInfos to support package dependencies.
 class BuildInfo
 {
 public:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<BuildInfo>
        {
-       private:
-               BuildInfo &binfo;
-               
        public:
                Loader(BuildInfo &);
        private: