X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.h;h=3257794671530e119edcc9de67a9f78633d2d0c6;hb=c7df14c38a87ceca13df47fa700d3f9fa250be91;hp=8372af90f99c330c197a0343000b63d481df0013;hpb=bd61d7fbd0ba77356b6def1dd20f8cebe31de182;p=builder.git

diff --git a/source/config.h b/source/config.h
index 8372af9..3257794 100644
--- a/source/config.h
+++ b/source/config.h
@@ -6,7 +6,7 @@
 #include <msp/datafile/loader.h>
 #include <msp/fs/path.h>
 #include <msp/time/timestamp.h>
-#include "misc.h"
+#include "feature.h"
 
 class SourcePackage;
 
@@ -18,14 +18,11 @@ class Config
 {
 public:
 	/** A single configuration option. */
-	struct Option
+	struct Option: public Feature
 	{
-		std::string name;
-		std::string defv;
-		std::string descr;
 		std::string value;
 
-		Option(const std::string &, const std::string &, const std::string &);
+		Option(const Feature &);
 	};
 
 	typedef std::map<std::string, Option> OptionMap;
@@ -44,13 +41,18 @@ private:
 	OptionMap options;
 	InputOptions pending_options;
 	Msp::Time::TimeStamp mtime;
-	bool changed;
+	mutable bool changed;
 
 public:
 	Config(SourcePackage &);
 
-	/** Adds a configuration option with name, default value and description. */
-	void add_option(const std::string &, const std::string &, const std::string &);
+	/** Adds a configuration option based on a feature. */
+	const Option &add_option(const Feature &);
+
+	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;
@@ -58,12 +60,8 @@ public:
 	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;
-
-	void save() const;
-	bool set_option(const std::string &, const std::string &);
 	void load();
+	void save() const;
 };
 
 #endif