Clear old settings before merging in new ones

sailfishos · Mar 29, 2013 · babdefe · babdefe
1 parent 8fa3ad8
commit babdefe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/libssu/ssusettings.cpp b/libssu/ssusettings.cpp
@@ -33,7 +33,7 @@ SsuSettings::SsuSettings(const QString &fileName, const QString &settingsDirecto
   merge();
 }
 
-void SsuSettings::merge(){
+void SsuSettings::merge(bool keepOld){
   if (settingsd == "")
     return;
 
@@ -63,6 +63,10 @@ void SsuSettings::merge(){
 
   settingsFiles.sort();
 
+  // delete all keys in the cached settings
+  if (settingsFiles.count() > 0 && !keepOld)
+    clear();
+
   foreach (const QString &settingsFile, settingsFiles){
     QSettings settings(settingsFile, QSettings::IniFormat);
     QStringList groups = settings.childGroups();

diff --git a/libssu/ssusettings.h b/libssu/ssusettings.h
@@ -29,7 +29,7 @@ class SsuSettings: public QSettings {
 
   private:
     QString defaultSettingsFile, settingsd;
-    void merge();
+    void merge(bool keepOld=false);
     void upgrade();
 
 };