Fix for bad branch handling in OP.

[virtualjaguar] / src / gui / mainwin.h

diff --git a/src/gui/mainwin.h b/src/gui/mainwin.h
index 06ca4054e86a75e3c512a66afa92b704691ee68c..a29dbc6119343f2edd1f1a8fdf81e45a36bc84b4 100644 (file)
--- a/src/gui/mainwin.h
+++ b/src/gui/mainwin.h
@@ -9,7 +9,7 @@
 #define __MAINWIN_H__
 
 //Hrm. uh??? I thought this wasn't the way to do this stuff...???
-#include <QtGui>
+#include <QtWidgets>
 #include "tom.h"
 
 #define RING_BUFFER_SIZE 32
@@ -92,7 +92,9 @@ class MainWin: public QMainWindow
                int zoomLevel;
                bool powerButtonOn;
                bool showUntunedTankCircuit;
+       public:
                bool cartridgeLoaded;
+       private:
                bool allowUnknownSoftware;
                bool CDActive;
 //             bool alpineLoadSuccessful;
@@ -100,6 +102,7 @@ class MainWin: public QMainWindow
                bool loadAndGo;
                bool keyHeld[8];
                bool fullScreen;
+               bool scannedSoftwareFolder;
        public:
                bool plzDontKillMyComputer;
                uint32_t oldTimestamp;
@@ -144,6 +147,7 @@ class MainWin: public QMainWindow
                QIcon powerGreen;
                QIcon powerRed;
                uint32_t testPattern[VIRTUAL_SCREEN_WIDTH * VIRTUAL_SCREEN_HEIGHT_PAL];
+               uint32_t testPattern2[VIRTUAL_SCREEN_WIDTH * VIRTUAL_SCREEN_HEIGHT_PAL];
 };
 
 #endif // __MAINWIN_H__