Qsettings

build/depends.py

@@ -970,6 +970,7 @@ def sources(self, build):
                    "util/statmodel.cpp",
                    "util/time.cpp",
                    "util/timer.cpp",
+                   "util/config-parser.cpp",
                    "util/performancetimer.cpp",
                    "util/threadcputimer.cpp",
                    "util/version.cpp",

src/mixxx.cpp

@@ -67,6 +67,7 @@
 #include "util/statsmanager.h"
 #include "util/timer.h"
 #include "util/time.h"
+#include "util/config-parser.h"
 #include "util/version.h"
 #include "controlpushbutton.h"
 #include "util/compatibility.h"
@@ -124,6 +125,13 @@ MixxxMainWindow::MixxxMainWindow(QApplication* pApp, const CmdlineArgs& args)
     // after an upgrade and make any needed changes.
     m_pUpgrader = new Upgrade;
     m_pConfig = m_pUpgrader->versionUpgrade(args.getSettingsPath());
+
+    registerConfigPath(m_pConfig->getSettingsPath() + "/mixxx_qsettings_temp.cfg");
+    UserSettings user_settings;
+    // I need to explicitely ask for a reference because QSettings doesn't
+    // support move in Qt4
+    auto& qsettings = user_settings.getQSettings();
+
     ControlDoublePrivate::setUserConfig(m_pConfig);
 
     // First load launch image to show a the user a quick responds

src/test/config_parser_test.cpp

@@ -0,0 +1,41 @@
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <QFile>
+#include <QTemporaryFile>
+
+#include "test/mixxxtest.h"
+
+#include "util/config-parser.h"
+
+const QString kConfigLocation(QDir::currentPath() +
+                              "/src/test/settings-dummy-data/mixxx.cfg");
+
+TEST(QSETTINGS, readConfigtest) {
+    QSettings::SettingsMap map;
+    QFile configFile(kConfigLocation);
+    EXPECT_TRUE(configFile.open(QIODevice::ReadOnly));
+    EXPECT_TRUE(readConfig(configFile, map));
+    EXPECT_EQ(265, map.size());
+}
+
+TEST(QSETTINGS, writeConfigtest) {
+    QSettings::SettingsMap map;
+    QFile configFile(kConfigLocation);
+    EXPECT_TRUE(configFile.open(QIODevice::ReadOnly));
+    EXPECT_TRUE(readConfig(configFile, map));
+
+    QTemporaryFile saveFile;
+    saveFile.open();
+    writeConfig(saveFile, map);
+    saveFile.close();
+
+    auto map2 = QSettings::SettingsMap();
+    saveFile.open();
+    readConfig(saveFile, map2);
+
+    EXPECT_EQ(map.size(), map2.size());
+
+    for (const auto& key : map.keys()) {
+        EXPECT_QSTRING_EQ(map[key].toString(), map2[key].toString());
+    }
+}