X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.h;h=94997750b26497c4ab83003f41382b78b13104fb;hb=71554f76b7ae8f1f9d183dc0c522655ce458cb78;hp=9043208364b554e518feb8a74ff1a18e37df730e;hpb=f7e0a54c49480981a8d9bec064375323fce0aaf1;p=builder.git

diff --git a/source/config.h b/source/config.h
index 9043208..9499775 100644
--- 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,8 +20,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,24 +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 &);
 
+	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; }
 
-	/** 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 &);
-
-	void save() const;
-	bool set_option(const std::string &, const std::string &);
 	void load();
+	void save() const;
 };
 
 #endif