summaryrefslogtreecommitdiff
path: root/src/Configuration.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Configuration.hh')
-rw-r--r--src/Configuration.hh5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Configuration.hh b/src/Configuration.hh
index 6909c799..b26541fd 100644
--- a/src/Configuration.hh
+++ b/src/Configuration.hh
@@ -37,8 +37,8 @@
*/
class Configuration {
public:
- explicit Configuration(const std::string &file);
- Configuration();
+ explicit Configuration(const std::string &file, bool autosave = True);
+ Configuration(bool autosave = True);
virtual ~Configuration();
inline const std::string &file() const {
@@ -58,6 +58,7 @@ public:
void save();
bool load();
+ bool merge(const std::string &file, bool overwrite = False);
void create();
void setValue(const std::string &rname, bool value);