X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FConfiguration.hh;h=b26541fd97cd0a5b760373b24845aea75cb3cafc;hb=6b3f5abde4139d044312d5a3ab53c63e1acf371b;hp=6909c7993f497075f6f8ad1e7480fa398339c1c2;hpb=0305cbdc3ae8525c74b2bb9b23884035549e3407;p=chaz%2Fopenbox

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);