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 713ec11abe9ec101dfe151d4abd71b1c6ed7741b..29363055dd2c86d34fbea135bb0d1e6df37ab648 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -330,7 +330,7 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
        // Do this in case original size isn't correct (mostly for the first-run case)
        ResizeMainWindow();
 
-       // Create our test pattern bitmap
+       // Create our test pattern bitmaps
        QImage tempImg(":/res/test-pattern.jpg");
        QImage tempImgScaled = tempImg.scaled(VIRTUAL_SCREEN_WIDTH, VIRTUAL_SCREEN_HEIGHT_PAL, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 
@@ -345,6 +345,20 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
                }
        }
 
+       QImage tempImg2(":/res/test-pattern-pal");
+       QImage tempImgScaled2 = tempImg2.scaled(VIRTUAL_SCREEN_WIDTH, VIRTUAL_SCREEN_HEIGHT_PAL, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+
+       for(uint32_t y=0; y<VIRTUAL_SCREEN_HEIGHT_PAL; y++)
+       {
+               const QRgb * scanline = (QRgb *)tempImgScaled2.constScanLine(y);
+
+               for(uint32_t x=0; x<VIRTUAL_SCREEN_WIDTH; x++)
+               {
+                       uint32_t pixel = (qRed(scanline[x]) << 24) | (qGreen(scanline[x]) << 16) | (qBlue(scanline[x]) << 8) | 0xFF;
+                       testPattern2[(y * VIRTUAL_SCREEN_WIDTH) + x] = pixel;
+               }
+       }
+
        // Set up timer based loop for animation...
        timer = new QTimer(this);
        connect(timer, SIGNAL(timeout()), this, SLOT(Timer()));
@@ -440,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)
@@ -454,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;
@@ -472,6 +489,7 @@ void MainWin::keyPressEvent(QKeyEvent * e)
                e->accept();
                return;
        }
+#endif
        else if (e->key() == Qt::Key_F8)
        {
                // ggn: For extra NYAN pleasure...
@@ -768,7 +786,10 @@ void MainWin::TogglePowerState(void)
                        // the same as the picture buffer's pitch.
                        for(uint32_t y=0; y<videoWidget->rasterHeight; y++)
                        {
-                               memcpy(videoWidget->buffer + (y * videoWidget->textureWidth), testPattern + (y * VIRTUAL_SCREEN_WIDTH), VIRTUAL_SCREEN_WIDTH * sizeof(uint32_t));
+                               if (vjs.hardwareTypeNTSC)
+                                       memcpy(videoWidget->buffer + (y * videoWidget->textureWidth), testPattern + (y * VIRTUAL_SCREEN_WIDTH), VIRTUAL_SCREEN_WIDTH * sizeof(uint32_t));
+                               else
+                                       memcpy(videoWidget->buffer + (y * videoWidget->textureWidth), testPattern2 + (y * VIRTUAL_SCREEN_WIDTH), VIRTUAL_SCREEN_WIDTH * sizeof(uint32_t));
                        }
                }
        }
@@ -941,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
@@ -1084,7 +1105,10 @@ void MainWin::ResizeMainWindow(void)
        {
                for(uint32_t y=0; y<videoWidget->rasterHeight; y++)
                {
-                       memcpy(videoWidget->buffer + (y * videoWidget->textureWidth), testPattern + (y * VIRTUAL_SCREEN_WIDTH), VIRTUAL_SCREEN_WIDTH * sizeof(uint32_t));
+                       if (vjs.hardwareTypeNTSC)
+                               memcpy(videoWidget->buffer + (y * videoWidget->textureWidth), testPattern + (y * VIRTUAL_SCREEN_WIDTH), VIRTUAL_SCREEN_WIDTH * sizeof(uint32_t));
+                       else
+                               memcpy(videoWidget->buffer + (y * videoWidget->textureWidth), testPattern2 + (y * VIRTUAL_SCREEN_WIDTH), VIRTUAL_SCREEN_WIDTH * sizeof(uint32_t));
                }
        }
 
@@ -1131,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);
@@ -1191,7 +1215,7 @@ WriteLog("Pipelined DSP = %s\n", (vjs.usePipelinedDSP ? "ON" : "off"));
        ReadProfiles(&settings);
 }
 
-
+  
 void MainWin::WriteSettings(void)
 {
        QSettings settings("Underground Software", "Virtual Jaguar");