Adjust option help texts

[builder.git] / source / config.h

diff --git a/source/config.h b/source/config.h
index 6babde995d94ad7628d70f385bead9ed211a067a..64e42259defb93454237f316a817155218ea31d7 100644 (file)
--- a/source/config.h
+++ b/source/config.h
@@ -29,6 +29,7 @@ public:
        };
 
        typedef std::map<std::string, Option> OptionMap;
+       typedef std::map<std::string, std::string> InputOptions;
 
 private:
        class Loader: public Msp::DataFile::ObjectLoader<Config>
@@ -41,8 +42,9 @@ private:
 
        SourcePackage &package;
        OptionMap options;
+       InputOptions pending_options;
        Msp::Time::TimeStamp mtime;
-       bool freeze_mtime;
+       bool changed;
 
 public:
        Config(SourcePackage &);
@@ -59,14 +61,6 @@ public:
        /** Checks whether an option exists. */
        bool is_option(const std::string &) const;
 
-       /** Selects the last profile used.  If the profile cache file is not
-       present, the default profile is assumed. */
-       void select_last_profile();
-
-       /** Selects a profile.  The profile cache file is updated, unless doing a
-       dry run. */
-       void select_profile(const std::string &);
-
        /** 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
@@ -77,7 +71,6 @@ public:
        void finish();
 
        void save() const;
-private:
        bool set_option(const std::string &, const std::string &);
        void load();
 };