1 files changed, 12 insertions, 42 deletions
diff --git a/src/filedialogmemory.cpp b/src/filedialogmemory.cpp
index 0e3e9793..8cfeb6b5 100644
--- a/src/filedialogmemory.cpp
+++ b/src/filedialogmemory.cpp
@@ -18,44 +18,21 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "filedialogmemory.h"
+#include "settings.h"
 #include <QFileDialog>
 
+static std::map<QString, QString> g_Cache;
 
-FileDialogMemory::FileDialogMemory()
+void FileDialogMemory::save(Settings& s)
 {
+  s.paths().setRecent(g_Cache);
 }
 
-
-void FileDialogMemory::save(QSettings &settings)
+void FileDialogMemory::restore(const Settings& s)
 {
-  settings.remove("recentDirectories");
-  settings.beginWriteArray("recentDirectories");
-  int index = 0;
-  for (std::map<QString, QString>::const_iterator iter = instance().m_Cache.begin();
-       iter != instance().m_Cache.end(); ++iter) {
-    settings.setArrayIndex(index++);
-    settings.setValue("name", iter->first);
-    settings.setValue("directory", iter->second);
-  }
-  settings.endArray();
+  g_Cache = s.paths().recent();
 }
 
-
-void FileDialogMemory::restore(QSettings &settings)
-{
-  int size = settings.beginReadArray("recentDirectories");
-  for (int i = 0; i < size; ++i) {
-    settings.setArrayIndex(i);
-    QVariant name = settings.value("name");
-    QVariant dir  = settings.value("directory");
-    if (name.isValid() && dir.isValid()) {
-      instance().m_Cache.insert(std::make_pair(name.toString(), dir.toString()));
-    }
-  }
-  settings.endArray();
-}
-
-
 QString FileDialogMemory::getOpenFileName(
   const QString &dirID, QWidget *parent, const QString &caption,
   const QString &dir, const QString &filter, QString *selectedFilter,
@@ -64,8 +41,8 @@ QString FileDialogMemory::getOpenFileName(
   QString currentDir = dir;
 
   if (currentDir.isEmpty()) {
-    auto itor = instance().m_Cache.find(dirID);
-    if (itor != instance().m_Cache.end()) {
+    auto itor = g_Cache.find(dirID);
+    if (itor != g_Cache.end()) {
       currentDir = itor->second;
     }
   }
@@ -74,7 +51,7 @@ QString FileDialogMemory::getOpenFileName(
     parent, caption, currentDir, filter, selectedFilter, options);
 
   if (!result.isNull()) {
-    instance().m_Cache[dirID] = QFileInfo(result).path();
+    g_Cache[dirID] = QFileInfo(result).path();
   }
 
   return result;
@@ -88,8 +65,8 @@ QString FileDialogMemory::getExistingDirectory(
   QString currentDir = dir;
 
   if (currentDir.isEmpty()) {
-    auto itor = instance().m_Cache.find(dirID);
-    if (itor != instance().m_Cache.end()) {
+    auto itor = g_Cache.find(dirID);
+    if (itor != g_Cache.end()) {
       currentDir = itor->second;
     }
   }
@@ -98,15 +75,8 @@ QString FileDialogMemory::getExistingDirectory(
     parent, caption, currentDir, options);
 
   if (!result.isNull()) {
-    instance().m_Cache[dirID] = QFileInfo(result).path();
+    g_Cache[dirID] = result;
   }
 
   return result;
 }
-
-
-FileDialogMemory &FileDialogMemory::instance()
-{
-  static FileDialogMemory instance;
-  return instance;
-}