Avoid a double verb in function name

[builder.git] / source / config.h

diff --git a/source/config.h b/source/config.h
index 355108fb2c35bcd26f5c012c107dc4d587703212..94997750b26497c4ab83003f41382b78b13104fb 100644 (file)
--- a/source/config.h
+++ b/source/config.h
@@ -3,11 +3,11 @@
 
 #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>
 
-typedef std::map<std::string, std::string> RawOptionMap;
+class SourcePackage;
 
 /**
 Manages configuration for a package.  A configuration may have an arbitary
@@ -16,41 +16,54 @@ amount of options, as well as a modification time (mtime).
 class Config
 {
 public:
-       /**
-       A single configuration option.
-       */
+       /** A single configuration option. */
        struct Option
        {
                std::string name;
-               std::string defv;
-               std::string descr;
+               std::string default_value;
+               std::string description;
                std::string value;
 
                Option(const std::string &, const std::string &, const std::string &);
        };
+
        typedef std::map<std::string, Option> OptionMap;
+       typedef std::map<std::string, std::string> InputOptions;
 
-       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; }
-       const Msp::Time::TimeStamp &get_mtime() const { return mtime; }
-       bool is_option(const std::string &) const;
-       bool process(const RawOptionMap &);
-       void load(const Msp::Path::Path &); 
-       void save(const Msp::Path::Path &) const;
 private:
-       class Loader: public Msp::Parser::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<Config>
        {
        public:
                Loader(Config &);
        private:
-               Config &conf;
-               
                void option(const std::string &, const std::string &);
        };
-       
+
+       SourcePackage &package;
        OptionMap options;
+       InputOptions pending_options;
        Msp::Time::TimeStamp mtime;
+       bool changed;
+
+public:
+       Config(SourcePackage &);
+
+       /** Adds a configuration option with name, default value and description. */
+       void add_option(const std::string &, const std::string &, const std::string &);
+
+       bool set_option(const std::string &, const std::string &);
+
+       /** Checks whether an option exists. */
+       bool is_option(const std::string &) const;
+
+       /** Gets a configuration option by name. */
+       const Option &get_option(const std::string &) const;
+
+       const OptionMap &get_options() const { return options; }
+       const Msp::Time::TimeStamp &get_mtime() const { return mtime; }
+
+       void load();
+       void save() const;
 };
 
 #endif