]> Shamusworld >> Repos - virtualjaguar/commitdiff
Change QDesktopService to QStandardPaths
authorTeemu Hukkanen <tjhukkan@iki.fi>
Sat, 8 Nov 2014 10:13:23 +0000 (10:13 +0000)
committerTeemu Hukkanen <tjhukkan@iki.fi>
Sat, 8 Nov 2014 10:13:23 +0000 (10:13 +0000)
src/gui/mainwin.cpp

index e8ebb63eb7059618a396ebb1ea49c184ddbd52c8..e84be10b4af5ec19350681e092211dafc90cfe13 100644 (file)
@@ -1155,10 +1155,10 @@ void MainWin::ReadSettings(void)
        vjs.allowWritesToROM = settings.value("writeROM", false).toBool();
        vjs.biosType         = settings.value("biosType", BT_M_SERIES).toInt();
        vjs.useFastBlitter   = settings.value("useFastBlitter", false).toBool();
-       strcpy(vjs.EEPROMPath, settings.value("EEPROMs", QDesktopServices::storageLocation(QDesktopServices::DataLocation).append("/eeproms/")).toString().toAscii().data());
-       strcpy(vjs.ROMPath, settings.value("ROMs", QDesktopServices::storageLocation(QDesktopServices::DataLocation).append("/software/")).toString().toAscii().data());
-       strcpy(vjs.alpineROMPath, settings.value("DefaultROM", "").toString().toAscii().data());
-       strcpy(vjs.absROMPath, settings.value("DefaultABS", "").toString().toAscii().data());
+       strcpy(vjs.EEPROMPath, settings.value("EEPROMs", QStandardPaths::writableLocation(QStandardPaths::DataLocation).append("/eeproms/")).toString().toUtf8().data());
+       strcpy(vjs.ROMPath, settings.value("ROMs", QStandardPaths::writableLocation(QStandardPaths::DataLocation).append("/software/")).toString().toUtf8().data());
+       strcpy(vjs.alpineROMPath, settings.value("DefaultROM", "").toString().toUtf8().data());
+       strcpy(vjs.absROMPath, settings.value("DefaultABS", "").toString().toUtf8().data());
 
 WriteLog("MainWin: Paths\n");
 WriteLog("   EEPROMPath = \"%s\"\n", vjs.EEPROMPath);