From 137a0c4e596409a1d35f0f6ea1bd6e4fcd5a3831 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sun, 7 Jul 2002 21:16:35 +0000
Subject: allow style options in the rc file to override those found in the
 style

---
 src/Configuration.hh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/Configuration.hh')

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);
-- 
cgit v1.2.3