core: Fix libdwarf and Qt build failure

[clinton/Virtual-Jaguar-Rx.git] / src / gui / configdialog.h

diff --git a/src/gui/configdialog.h b/src/gui/configdialog.h
index e8fa1bf..ff105ea 100644 (file)
--- a/src/gui/configdialog.h
+++ b/src/gui/configdialog.h
@@ -9,19 +9,26 @@
 // Who  When        What\r
 // ---  ----------  ------------------------------------------------------------\r
 // JPM  06/19/2016  Soft debugger support\r
 // Who  When        What\r
 // ---  ----------  ------------------------------------------------------------\r
 // JPM  06/19/2016  Soft debugger support\r

+// JPM  09/03/2018  Added a Models & Bios tab\r

 //\r
 \r
 #ifndef __CONFIGDIALOG_H__\r
 #define __CONFIGDIALOG_H__\r
 \r
 //\r
 \r
 #ifndef __CONFIGDIALOG_H__\r
 #define __CONFIGDIALOG_H__\r
 \r

-#include <QtWidgets>\r
+#define        NEWMODELSBIOSHANDLER                            // New Jaguar models and bios usage handler\r
+\r
+#include <QtWidgets/QtWidgets>\r

 \r
 class GeneralTab;\r
 \r
 class GeneralTab;\r

+#ifdef NEWMODELSBIOSHANDLER\r
+class ModelsBiosTab;\r
+#endif\r

 class ControllerTab;\r
 class AlpineTab;\r
 class DebuggerTab;\r
 class KeyBindingsTab;\r
 \r
 class ControllerTab;\r
 class AlpineTab;\r
 class DebuggerTab;\r
 class KeyBindingsTab;\r
 \r

+\r

 class ConfigDialog: public QDialog\r
 {\r
        Q_OBJECT\r
 class ConfigDialog: public QDialog\r
 {\r
        Q_OBJECT\r


@@ -33,19 +40,21 @@ class ConfigDialog: public QDialog
 \r
        private:\r
                void LoadDialogFromSettings(void);\r
 \r
        private:\r
                void LoadDialogFromSettings(void);\r

-               QString CheckForTrailingSlash(QString);\r

 \r
        private:\r
 \r
        private:\r

-               QTabWidget * tabWidget;\r
-               QDialogButtonBox * buttonBox;\r
+               QTabWidget *tabWidget;\r
+               QDialogButtonBox *buttonBox;\r

 \r
        public:\r
 \r
        public:\r

-               GeneralTab * generalTab;\r
-               ControllerTab * controllerTab1;\r
-//             ControllerTab * controllerTab2;\r
+               GeneralTab *generalTab;\r
+#ifdef NEWMODELSBIOSHANDLER\r
+               ModelsBiosTab *modelsbiosTab;\r
+#endif\r
+               ControllerTab *controllerTab1;\r
+//             ControllerTab *controllerTab2;\r

                KeyBindingsTab *keybindingsTab;\r
                KeyBindingsTab *keybindingsTab;\r

-               AlpineTab * alpineTab;\r
-               DebuggerTab * debuggerTab;\r
+               AlpineTab *alpineTab;\r
+               DebuggerTab *debuggerTab;\r

 };\r
 \r
 #endif // __CONFIGDIALOG_H__\r
 };\r
 \r
 #endif // __CONFIGDIALOG_H__\r