Remove some useless member functions

[builder.git] / source / config.h

diff --git a/source/config.h b/source/config.h
index f18487bfeeb61493bc5ab0459f81903deff13ddf..94997750b26497c4ab83003f41382b78b13104fb 100644 (file)
--- a/source/config.h
+++ b/source/config.h
@@ -6,7 +6,6 @@
 #include <msp/datafile/loader.h>
 #include <msp/fs/path.h>
 #include <msp/time/timestamp.h>
-#include "misc.h"
 
 class SourcePackage;
 
@@ -21,14 +20,15 @@ public:
        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;
 
 private:
        class Loader: public Msp::DataFile::ObjectLoader<Config>
@@ -41,6 +41,7 @@ private:
 
        SourcePackage &package;
        OptionMap options;
+       InputOptions pending_options;
        Msp::Time::TimeStamp mtime;
        bool changed;
 
@@ -50,29 +51,19 @@ public:
        /** Adds a configuration option with name, default value and description. */
        void add_option(const std::string &, const std::string &, const std::string &);
 
-       /** 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; }
+       bool set_option(const std::string &, const std::string &);
 
        /** Checks whether an option exists. */
        bool is_option(const std::string &) const;
 
-       /** Processes options from the given raw option map.  Nonexistent options
-       are ignored.  If any options were changed, the mtime of the configuration is
-       updated to the current time.  Return value indicates whether any options
-       were changed. */
-       bool update(const StringMap &);
+       /** Gets a configuration option by name. */
+       const Option &get_option(const std::string &) const;
 
-       /** Expands any variable references in options. */
-       void finish();
+       const OptionMap &get_options() const { return options; }
+       const Msp::Time::TimeStamp &get_mtime() const { return mtime; }
 
-       void save() const;
-private:
-       bool set_option(const std::string &, const std::string &);
-public:
        void load();
+       void save() const;
 };
 
 #endif