Using different out directories per build type is more trouble than it's worth

[builder.git] / source / config.h

diff --git a/source/config.h b/source/config.h
index 64e42259defb93454237f316a817155218ea31d7..92f558577d0c167454f3e05df0b112a0d1d57270 100644 (file)
--- a/source/config.h
+++ b/source/config.h
@@ -21,8 +21,8 @@ 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 &);
@@ -52,27 +52,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;
-       bool set_option(const std::string &, const std::string &);
        void load();
+       void save() const;
 };
 
 #endif