X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.h;h=91a6ef07e7c7e75845994b361ab2f2d0c3cd493d;hb=93db1636eac4ded5d89555d4c7e06b2126c3e4b0;hp=f18487bfeeb61493bc5ab0459f81903deff13ddf;hpb=30b1243ff16b908ae18b4ab9d70f772c9196b949;p=builder.git

diff --git a/source/config.h b/source/config.h
index f18487b..91a6ef0 100644
--- a/source/config.h
+++ b/source/config.h
@@ -21,14 +21,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 +42,7 @@ private:
 
 	SourcePackage &package;
 	OptionMap options;
+	InputOptions pending_options;
 	Msp::Time::TimeStamp mtime;
 	bool changed;
 
@@ -59,19 +61,8 @@ public:
 	/** 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 &);
-
-	/** Expands any variable references in options. */
-	void finish();
-
 	void save() const;
-private:
 	bool set_option(const std::string &, const std::string &);
-public:
 	void load();
 };