Migrate from msppath to mspfs

[builder.git] / source / config.h

diff --git a/source/config.h b/source/config.h
index 69094b59777027e5e08056ae6e37408b372feb98..38ac5e44d98ac15f6079871e1a39d0ac9fbd4a80 100644 (file)
--- a/source/config.h
+++ b/source/config.h
@@ -10,12 +10,12 @@ Distributed under the LGPL
 
 #include <map>
 #include <string>
-#include <msp/parser/loader.h>
-#include <msp/path/path.h>
+#include <msp/datafile/loader.h>
+#include <msp/fs/path.h>
 #include <msp/time/timestamp.h>
 #include "misc.h"
 
-class Package;
+class SourcePackage;
 
 /**
 Manages configuration for a package.  A configuration may have an arbitary
@@ -38,7 +38,7 @@ public:
        };
        typedef std::map<std::string, Option> OptionMap;
 
-       Config(Package &);
+       Config(SourcePackage &);
        void add_option(const std::string &, const std::string &, const std::string &);
        const Option &get_option(const std::string &) const;
        const OptionMap &get_options() const          { return options; }
@@ -50,17 +50,17 @@ public:
        void finish();
        void save() const;
 private:
-       class Loader: public Msp::Parser::Loader
+       class Loader: public Msp::DataFile::Loader
        {
        public:
                Loader(Config &);
        private:
                Config &conf;
-               
+
                void option(const std::string &, const std::string &);
        };
 
-       Package         &package;
+       SourcePackage   &package;
        OptionMap       options;
        Msp::Time::TimeStamp mtime;
        bool freeze_mtime;