QString no longer supports toAscii, use toUtf8 instead

[virtualjaguar] / src / gui / mainwin.cpp

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index cc5dab1880c251e9001a5f55f60f717d89970007..29363055dd2c86d34fbea135bb0d1e6df37ab648 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -454,13 +454,14 @@ void MainWin::closeEvent(QCloseEvent * event)
 
 void MainWin::keyPressEvent(QKeyEvent * e)
 {
+#ifndef VJ_REMOVE_DEV_CODE
        // From jaguar.cpp
        extern bool startM68KTracing;
        // From joystick.cpp
        extern int blit_start_log;
        // From blitter.cpp
        extern bool startConciseBlitLogging;
-
+#endif
 
        // We ignore the Alt key for now, since it causes problems with the GUI
        if (e->key() == Qt::Key_Alt)
@@ -468,6 +469,8 @@ void MainWin::keyPressEvent(QKeyEvent * e)
                e->accept();
                return;
        }
+// Bar this shite from release versions kthxbai
+#ifndef VJ_REMOVE_DEV_CODE
        else if (e->key() == Qt::Key_F11)
        {
                startM68KTracing = true;
@@ -486,6 +489,7 @@ void MainWin::keyPressEvent(QKeyEvent * e)
                e->accept();
                return;
        }
+#endif
        else if (e->key() == Qt::Key_F8)
        {
                // ggn: For extra NYAN pleasure...
@@ -958,7 +962,7 @@ void MainWin::LoadSoftware(QString file)
        powerButtonOn = false;
        TogglePowerState();
        // We have to load our software *after* the Jaguar RESET
-       cartridgeLoaded = JaguarLoadFile(file.toAscii().data());
+       cartridgeLoaded = JaguarLoadFile(file.toUtf8().data());
        SET32(jaguarMainRAM, 0, 0x00200000);            // Set top of stack...
 
        // This is icky because we've already done it
@@ -1151,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);