From: Teemu Hukkanen <tjhukkan@iki.fi>
Date: Sat, 8 Nov 2014 10:13:23 +0000 (+0000)
Subject: Change QDesktopService to QStandardPaths
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ae68cf3e1b1a38f30d4201ec41ca761a72d3c96;hp=56f80e7876367f9da3cff765b46e842270d45a0d;p=virtualjaguar

Change QDesktopService to QStandardPaths
---

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index e8ebb63..e84be10 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -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);