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

diff --git a/src/Configuration.hh b/src/Configuration.hh
index 6909c799..8f4a3157 100644
--- a/src/Configuration.hh
+++ b/src/Configuration.hh
@@ -37,27 +37,28 @@
  */
 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 {
-    return static_cast<const std::string &>(m_file);
+    return static_cast<const std::string &>(_file);
   }
   void setFile(const std::string &file);
 
   // defaults to true!
   inline bool autoSave() const {
-    return m_autosave;
+    return _autosave;
   }
   void setAutoSave(bool);
 
   inline bool isModified() const {
-    return m_modified;
+    return _modified;
   }
 
   void save();
   bool load();
+  bool merge(const std::string &file, bool overwrite = False);
   void create();
 
   void setValue(const std::string &rname, bool value);
@@ -87,11 +88,11 @@ private:
   std::string createClassName(const std::string &rname) const;
   char toUpper(char) const;
   
-  static bool m_initialized;
-  std::string m_file;
-  bool m_modified;
-  bool m_autosave;
-  XrmDatabase m_database;
+  static bool _initialized;
+  std::string _file;
+  bool _modified;
+  bool _autosave;
+  XrmDatabase _database;
 };
 
 #endif // __Configuration_hh