core: Fix libdwarf and Qt build failure

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

diff --git a/src/gui/mainwin.h b/src/gui/mainwin.h
index e0aa8d1..515f9e0 100644 (file)
--- a/src/gui/mainwin.h
+++ b/src/gui/mainwin.h
@@ -11,7 +11,7 @@
 #define __MAINWIN_H__\r
 \r
 //Hrm. uh??? I thought this wasn't the way to do this stuff...???\r
-#include <QtWidgets>\r
+#include <QtWidgets/QtWidgets>\r
 #include "tom.h"\r
 \r
 #define RING_BUFFER_SIZE 32\r
@@ -22,11 +22,8 @@ class GLWidget;
 class AboutWindow;\r
 class HelpWindow;\r
 class FilePickerWindow;\r
-//class VideoOutputWindow;\r
+class VideoOutputWindow;\r
 //class DasmWindow;\r
-class m68KDasmWindow;\r
-class GPUDasmWindow;\r
-class DSPDasmWindow;\r
 class EmuStatusWindow;\r
 \r
 // Alpine\r
@@ -36,8 +33,13 @@ class CPUBrowserWindow;
 class OPBrowserWindow;\r
 class M68KDasmBrowserWindow;\r
 class RISCDasmBrowserWindow;\r
+class HWRegsBrowserWindow;\r
 \r
 // Debugger\r
+class SourcesWindow;\r
+class m68KDasmWindow;\r
+class GPUDasmWindow;\r
+class DSPDasmWindow;\r
 class AllWatchBrowserWindow;\r
 class LocalBrowserWindow;\r
 class CallStackBrowserWindow;\r
@@ -48,6 +50,7 @@ class NewFnctBreakpointWindow;
 class ExceptionVectorTableBrowserWindow;\r
 class FilesrcListWindow;\r
 class CartFilesListWindow;\r
+class SaveDumpAsWindow;\r
 \r
 \r
 // \r
@@ -63,8 +66,12 @@ class MainWin: public QMainWindow
                void SyncUI(void);\r
                void DebuggerRefreshWindows(void);\r
                void ViewRefreshWindows(void);\r
+               void RefreshWindows(void);\r
+               void CommonRefreshWindows(void);\r
                void AlpineRefreshWindows(void);\r
                void DebuggerResetWindows(void);\r
+               void CommonResetWindows(void);\r
+               void CommonReset(void);\r
                void DebuggerReset(void);\r
 \r
        protected:\r
@@ -108,10 +115,10 @@ class MainWin: public QMainWindow
                void ShowBreakpointsWin(void);\r
                void DeleteAllBreakpoints(void);\r
                void DisableAllBreakpoints(void);\r
-#if 0\r
+               void ShowSaveDumpAsWin(void);\r
+               void SelectdasmtabWidget(const int);\r
                void ShowVideoOutputWin(void);\r
-               void ShowDasmWin(void);\r
-#endif\r
+               //void ShowDasmWin(void);\r
                void ShowCartFilesListWin(void);\r
                // Alpine\r
                void ShowMemoryBrowserWin(void);\r
@@ -119,6 +126,7 @@ class MainWin: public QMainWindow
                void ShowCPUBrowserWin(void);\r
                void ShowOPBrowserWin(void);\r
                void ShowM68KDasmBrowserWin(void);\r
+               void ShowHWRegsBrowserWin(void);\r
                void ShowRISCDasmBrowserWin(void);\r
 \r
        private:\r
@@ -145,7 +153,8 @@ class MainWin: public QMainWindow
                OPBrowserWindow *opBrowseWin;\r
                M68KDasmBrowserWindow *m68kDasmBrowseWin;\r
                RISCDasmBrowserWindow *riscDasmBrowseWin;\r
-               //VideoOutputWindow *VideoOutputWin;\r
+               HWRegsBrowserWindow *hwRegsBrowseWin;\r
+               VideoOutputWindow *VideoOutputWin;\r
                AllWatchBrowserWindow *allWatchBrowseWin;\r
                LocalBrowserWindow *LocalBrowseWin;\r
                CallStackBrowserWindow *CallStackBrowseWin;\r
@@ -155,6 +164,7 @@ class MainWin: public QMainWindow
                //DasmWindow * DasmWin;\r
                QTabWidget *dasmtabWidget;\r
                //QDockWidget *dasmtabWidget;\r
+               SourcesWindow *SourcesWin;\r
                m68KDasmWindow *m68kDasmWin;\r
                GPUDasmWindow *GPUDasmWin;\r
                DSPDasmWindow *DSPDasmWin;\r
@@ -162,6 +172,7 @@ class MainWin: public QMainWindow
                BreakpointsWindow *BreakpointsWin;\r
                NewFnctBreakpointWindow *NewFunctionBreakpointWin;\r
                CartFilesListWindow *CartFilesListWin;\r
+               SaveDumpAsWindow *SaveDumpAsWin;\r
                QTimer *timer;\r
                bool running;\r
                int zoomLevel;\r
@@ -228,13 +239,14 @@ class MainWin: public QMainWindow
                QAction *cpuBrowseAct;\r
                QAction *opBrowseAct;\r
                QAction *m68kDasmBrowseAct;\r
+               QAction *hwRegsBrowseAct;\r
                QAction *riscDasmBrowseAct;\r
 \r
                // Debugger\r
                QAction *traceStepOverAct;\r
                QAction *traceStepIntoAct;\r
                QAction *restartAct;\r
-               //QAction *VideoOutputAct;\r
+               QAction *VideoOutputAct;\r
                QAction *heapallocatorBrowseAct;\r
                QAction *allWatchBrowseAct;\r
                QAction *LocalBrowseAct;\r
@@ -244,6 +256,7 @@ class MainWin: public QMainWindow
                QAction *BreakpointsAct;\r
                QAction *deleteAllBreakpointsAct;\r
                QAction *disableAllBreakpointsAct;\r
+               QAction *saveDumpAsAct;\r
                QAction *exceptionVectorTableBrowseAct;\r
                QAction *CartFilesListAct;\r
 \r