Fixes for compilation against GCC 6.

[virtualjaguar] / src / gui / alpinetab.cpp

diff --git a/src/gui/alpinetab.cpp b/src/gui/alpinetab.cpp
index 861141852ac76cf9089ef397674285e0daa1b3a8..d3e35f67709a5e8dacf4d2c56b9721f1cc053e49 100644 (file)
--- a/src/gui/alpinetab.cpp
+++ b/src/gui/alpinetab.cpp
@@ -5,7 +5,7 @@
 // (C) 2011 Underground Software
 // See the README and GPLv3 files for licensing and warranty information
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // WHO  WHEN        WHAT
 // ---  ----------  ------------------------------------------------------------
@@ -16,33 +16,29 @@
 
 AlpineTab::AlpineTab(QWidget * parent/*= 0*/): QWidget(parent)
 {
-//     antialiasChk = new QCheckBox(tr("Use Qt's built-in antialiasing"));
-
-// I'm thinking we should scan the bios folder for the 5 known BIOSes, and
-// just present a radio button to choose between them...
        QLabel * label1 = new QLabel("ROM to load:");
-//     QLabel * label2 = new QLabel("CD Boot ROM:");
+       QLabel * label2 = new QLabel("ABS to load:");
 //     QLabel * label3 = new QLabel("EEPROMs:");
 //     QLabel * label4 = new QLabel("Software:");
 
        edit1 = new QLineEdit("");
-//     edit2 = new QLineEdit("");
+       edit2 = new QLineEdit("");
 //     edit3 = new QLineEdit("");
 //     edit4 = new QLineEdit("");
        edit1->setPlaceholderText("ROM to load when Virtual Jaguar loads");
-//     edit2->setPlaceholderText("CD Boot ROM location");
+       edit2->setPlaceholderText("ABS to load when Virtual Jaguar loads");
 //     edit3->setPlaceholderText("EEPROM path");
 //     edit4->setPlaceholderText("Software path");
 
        QVBoxLayout * layout1 = new QVBoxLayout;
        layout1->addWidget(label1);
-//     layout1->addWidget(label2);
+       layout1->addWidget(label2);
 //     layout1->addWidget(label3);
 //     layout1->addWidget(label4);
 
        QVBoxLayout * layout2 = new QVBoxLayout;
        layout2->addWidget(edit1);
-//     layout2->addWidget(edit2);
+       layout2->addWidget(edit2);
 //     layout2->addWidget(edit3);
 //     layout2->addWidget(edit4);
 
@@ -58,6 +54,8 @@ AlpineTab::AlpineTab(QWidget * parent/*= 0*/): QWidget(parent)
 //     useDSP             = new QCheckBox(tr("Enable DSP"));
 //     useHostAudio       = new QCheckBox(tr("Enable audio playback"));
 //     useUnknownSoftware = new QCheckBox(tr("Allow unknown software in file chooser"));
+// Currently, this is unused, so let's signal this to the user:
+       writeROM->setDisabled(true);
 
        layout4->addWidget(writeROM);
 //     layout4->addWidget(useDSP);