Also remove the SafeKeyFile wrapper class.

rtgui/cacheimagedata.cc

@@ -19,7 +19,6 @@
 #include "cacheimagedata.h"
 #include <vector>
 #include <glib/gstdio.h>
-#include "../rtengine/safekeyfile.h"
 #include "version.h"
 #include <locale.h>
 
@@ -35,7 +34,8 @@ CacheImageData::CacheImageData ()
 int CacheImageData::load (const Glib::ustring& fname)
 {
     setlocale(LC_NUMERIC, "C"); // to set decimal point to "."
-    rtengine::SafeKeyFile keyFile;
+
+    Glib::KeyFile keyFile;
 
     try {
         if (keyFile.load_from_file (fname)) {
@@ -194,21 +194,12 @@ int CacheImageData::load (const Glib::ustring& fname)
 int CacheImageData::save (const Glib::ustring& fname)
 {
 
-    rtengine::SafeKeyFile keyFile;
+    Glib::ustring keyData;
 
-    if (Glib::file_test(fname, Glib::FILE_TEST_EXISTS)) {
-        try {
-            keyFile.load_from_file (fname);
-        } catch (Glib::Error &err) {
-            if (options.rtSettings.verbose) {
-                printf("CacheImageData::save / Error code %d while reading values from \"%s\":\n%s\n", err.code(), fname.c_str(), err.what().c_str());
-            }
-        } catch (...) {
-            if (options.rtSettings.verbose) {
-                printf("CacheImageData::save / Unknown exception while trying to save \"%s\"!\n", fname.c_str());
-            }
-        }
-    }
+    try {
+
+    Glib::KeyFile keyFile;
+    keyFile.load_from_file (fname);
 
     keyFile.set_string  ("General", "MD5", md5);
     keyFile.set_string  ("General", "Version", VERSION); // Application's version
@@ -256,6 +247,22 @@ int CacheImageData::save (const Glib::ustring& fname)
         keyFile.set_integer ("ExtraRawInfo", "ThumbImageOffset", thumbOffset);
     }
 
+    keyData = keyFile.to_data ();
+
+    } catch (Glib::Error &err) {
+        if (options.rtSettings.verbose) {
+            printf("CacheImageData::save / Error code %d while reading values from \"%s\":\n%s\n", err.code(), fname.c_str(), err.what().c_str());
+        }
+    } catch (...) {
+        if (options.rtSettings.verbose) {
+            printf("CacheImageData::save / Unknown exception while trying to save \"%s\"!\n", fname.c_str());
+        }
+    }
+
+    if (keyData.empty ()) {
+        return 1;
+    }
+
     FILE *f = g_fopen (fname.c_str (), "wt");
 
     if (!f) {
@@ -265,7 +272,7 @@ int CacheImageData::save (const Glib::ustring& fname)
 
         return 1;
     } else {
-        fprintf (f, "%s", keyFile.to_data().c_str());
+        fprintf (f, "%s", keyData.c_str ());
         fclose (f);
         return 0;
     }

rtgui/options.cc

@@ -21,7 +21,6 @@
 #include <glib/gstdio.h>
 #include <sstream>
 #include "multilangmgr.h"
-#include "../rtengine/safekeyfile.h"
 #include "addsetids.h"
 #include "guiutils.h"
 #include "version.h"
@@ -726,7 +725,8 @@ void Options::filterOutParsedExtensions ()
 int Options::readFromFile (Glib::ustring fname)
 {
     setlocale(LC_NUMERIC, "C"); // to set decimal point to "."
-    rtengine::SafeKeyFile keyFile;
+
+    Glib::KeyFile keyFile;
 
     if( !Glib::file_test(fname, Glib::FILE_TEST_EXISTS)) {
         return 1;
@@ -1778,23 +1778,29 @@ int Options::readFromFile (Glib::ustring fname)
         if (options.rtSettings.verbose) {
             printf("Options::readFromFile / Error code %d while reading values from \"%s\":\n%s\n", err.code(), fname.c_str(), err.what().c_str());
         }
+        setDefaults ();
     } catch (...) {
         if (options.rtSettings.verbose) {
             printf("Options::readFromFile / Unknown exception while trying to load \"%s\"!\n", fname.c_str());
         }
+        setDefaults ();
     }
 
     return 1;
 
 }
 
-bool Options::safeDirGet(const rtengine::SafeKeyFile& keyFile, const Glib::ustring& section,
+bool Options::safeDirGet(const Glib::KeyFile& keyFile, const Glib::ustring& section,
                          const Glib::ustring& entryName, Glib::ustring& destination)
 {
-    if (keyFile.has_key(section, entryName) && !keyFile.get_string(section, entryName).empty()) {
-        destination = keyFile.get_string(section, entryName);
-        return true;
-    }
+    try {
+
+        if (keyFile.has_key (section, entryName) && !keyFile.get_string (section, entryName).empty ()) {
+            destination = keyFile.get_string (section, entryName);
+            return true;
+        }
+
+    } catch(Glib::KeyFileError&) {}
 
     return false;
 }
@@ -1802,9 +1808,13 @@ bool Options::safeDirGet(const rtengine::SafeKeyFile& keyFile, const Glib::ustri
 int Options::saveToFile (Glib::ustring fname)
 {
 
-    rtengine::SafeKeyFile keyFile;
-    keyFile.set_boolean ("General", "TabbedEditor", tabbedUI);
+    Glib::ustring keyData;
 
+    try {
+
+    Glib::KeyFile keyFile;
+
+    keyFile.set_boolean ("General", "TabbedEditor", tabbedUI);
     keyFile.set_boolean ("General", "StoreLastProfile", savesParamsAtExit);
 
     if (startupDir == STARTUPDIR_HOME) {
@@ -2104,6 +2114,14 @@ int Options::saveToFile (Glib::ustring fname)
     keyFile.set_string ("Dialogs", "LastVibranceCurvesDir", lastVibranceCurvesDir);
     keyFile.set_string ("Dialogs", "LastProfilingReferenceDir", lastProfilingReferenceDir);
 
+    keyData = keyFile.to_data ();
+
+    } catch (Glib::KeyFileError&) {}
+
+    if (keyData.empty ()) {
+        return 1;
+    }
+
     FILE *f = g_fopen (fname.c_str (), "wt");
 
     if (f == NULL) {
@@ -2113,7 +2131,7 @@ int Options::saveToFile (Glib::ustring fname)
 
         return 1;
     } else {
-        fprintf (f, "%s", keyFile.to_data().c_str());
+        fprintf (f, "%s", keyData.c_str ());
         fclose (f);
         return 0;
     }

rtgui/options.h

@@ -58,11 +58,6 @@ enum PPLoadLocation {PLL_Cache = 0, PLL_Input = 1};
 enum CPBKeyType {CPBKT_TID = 0, CPBKT_NAME = 1, CPBKT_TID_NAME = 2};
 enum prevdemo_t {PD_Sidecar = 1, PD_Fast = 0};
 
-namespace rtengine
-{
-class SafeKeyFile;
-}
-
 class Options
 {
 
@@ -87,7 +82,7 @@ private:
      * @param destination destination variable to store to
      * @return @c true if @p destination was changed
      */
-    bool safeDirGet(const rtengine::SafeKeyFile& keyFile, const Glib::ustring& section,
+    bool safeDirGet(const Glib::KeyFile& keyFile, const Glib::ustring& section,
                     const Glib::ustring& entryName, Glib::ustring& destination);
 
 public: