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 395954e..ff105ea 100644 (file)
--- a/src/gui/configdialog.h
+++ b/src/gui/configdialog.h
@@ -1,49 +1,60 @@
-//
-// configdialog.h - Configuration dialog
-//
-// by James Hammons
-// (C) 2010 Underground Software
-//
-// JPM = Jean-Paul Mari <djipi.mari@gmail.com>
-//
-// Who  When        What
-// ---  ----------  ------------------------------------------------------------
-// JPM  06/19/2016  Soft debugger support
-//
-
-#ifndef __CONFIGDIALOG_H__
-#define __CONFIGDIALOG_H__
-
-#include <QtWidgets>
-
-class GeneralTab;
-class ControllerTab;
-class AlpineTab;
-class DebuggerTab;
-
-class ConfigDialog: public QDialog
-{
-       Q_OBJECT
-
-       public:
-               ConfigDialog(QWidget * parent = 0);
-               ~ConfigDialog();
-               void UpdateVJSettings(void);
-
-       private:
-               void LoadDialogFromSettings(void);
-               QString CheckForTrailingSlash(QString);
-
-       private:
-               QTabWidget * tabWidget;
-               QDialogButtonBox * buttonBox;
-
-       public:
-               GeneralTab * generalTab;
-               ControllerTab * controllerTab1;
-//             ControllerTab * controllerTab2;
-               AlpineTab * alpineTab;
-               DebuggerTab * debuggerTab;
-};
-
-#endif // __CONFIGDIALOG_H__
+//\r
+// configdialog.h - Configuration dialog\r
+//\r
+// by James Hammons\r
+// (C) 2010 Underground Software\r
+//\r
+// JPM = Jean-Paul Mari <djipi.mari@gmail.com>\r
+//\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
+#define        NEWMODELSBIOSHANDLER                            // New Jaguar models and bios usage handler\r
+\r
+#include <QtWidgets/QtWidgets>\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
+\r
+class ConfigDialog: public QDialog\r
+{\r
+       Q_OBJECT\r
+\r
+       public:\r
+               ConfigDialog(QWidget * parent = 0);\r
+               ~ConfigDialog();\r
+               void UpdateVJSettings(void);\r
+\r
+       private:\r
+               void LoadDialogFromSettings(void);\r
+\r
+       private:\r
+               QTabWidget *tabWidget;\r
+               QDialogButtonBox *buttonBox;\r
+\r
+       public:\r
+               GeneralTab *generalTab;\r
+#ifdef NEWMODELSBIOSHANDLER\r
+               ModelsBiosTab *modelsbiosTab;\r
+#endif\r
+               ControllerTab *controllerTab1;\r
+//             ControllerTab *controllerTab2;\r
+               KeyBindingsTab *keybindingsTab;\r
+               AlpineTab *alpineTab;\r
+               DebuggerTab *debuggerTab;\r
+};\r
+\r
+#endif // __CONFIGDIALOG_H__\r