From 83811974793dca7df790310181888966e21bb7da Mon Sep 17 00:00:00 2001 From: AJR Date: Mon, 30 Sep 2024 20:44:11 -0400 Subject: [PATCH] emu/debug, osd/modules/debugger/qt: Clean up #includes a bit --- src/emu/debug/debugcmd.h | 3 --- src/emu/debug/dvbpoints.cpp | 3 ++- src/emu/debug/dvbpoints.h | 1 - src/emu/debug/dvdisasm.cpp | 5 +++-- src/emu/debug/dvdisasm.h | 6 +++--- src/emu/debug/dvmemory.cpp | 1 - src/emu/debug/dvrpoints.cpp | 2 +- src/emu/debug/dvrpoints.h | 1 - src/emu/debug/dvwpoints.cpp | 1 + src/emu/debug/dvwpoints.h | 1 - src/emu/debug/points.cpp | 2 ++ src/emu/debug/points.h | 1 - src/osd/modules/debugger/qt/breakpointswindow.cpp | 3 --- src/osd/modules/debugger/qt/dasmwindow.cpp | 1 + src/osd/modules/debugger/qt/logwindow.cpp | 4 ---- src/osd/modules/debugger/qt/mainwindow.cpp | 1 + src/osd/modules/debugger/qt/memorywindow.cpp | 1 + src/osd/modules/debugger/qt/windowqt.cpp | 1 + src/osd/modules/debugger/qt/windowqt.h | 2 -- 19 files changed, 16 insertions(+), 24 deletions(-) diff --git a/src/emu/debug/debugcmd.h b/src/emu/debug/debugcmd.h index 134f838f8a722..cf38c6d903a27 100644 --- a/src/emu/debug/debugcmd.h +++ b/src/emu/debug/debugcmd.h @@ -13,9 +13,6 @@ #pragma once -#include "debugcpu.h" -#include "debugcon.h" - #include diff --git a/src/emu/debug/dvbpoints.cpp b/src/emu/debug/dvbpoints.cpp index d7be62c1eaab8..0290f8719dc73 100644 --- a/src/emu/debug/dvbpoints.cpp +++ b/src/emu/debug/dvbpoints.cpp @@ -9,8 +9,9 @@ ***************************************************************************/ #include "emu.h" -#include "debugger.h" #include "dvbpoints.h" + +#include "debugcpu.h" #include "points.h" #include diff --git a/src/emu/debug/dvbpoints.h b/src/emu/debug/dvbpoints.h index 1bf365f521e8d..be291fa66d8ea 100644 --- a/src/emu/debug/dvbpoints.h +++ b/src/emu/debug/dvbpoints.h @@ -12,7 +12,6 @@ #pragma once -#include "debugcpu.h" #include "debugvw.h" #include diff --git a/src/emu/debug/dvdisasm.cpp b/src/emu/debug/dvdisasm.cpp index a189a5b021097..17cc766ef9419 100644 --- a/src/emu/debug/dvdisasm.cpp +++ b/src/emu/debug/dvdisasm.cpp @@ -9,10 +9,11 @@ ***************************************************************************/ #include "emu.h" -#include "debugvw.h" #include "dvdisasm.h" + +#include "debugbuf.h" #include "debugcpu.h" -#include "debugger.h" + //************************************************************************** // DEBUG VIEW DISASM SOURCE diff --git a/src/emu/debug/dvdisasm.h b/src/emu/debug/dvdisasm.h index 4778793532234..ef4c5e9cf8798 100644 --- a/src/emu/debug/dvdisasm.h +++ b/src/emu/debug/dvdisasm.h @@ -14,9 +14,6 @@ #pragma once #include "debugvw.h" -#include "debugbuf.h" - -#include "vecstream.h" //************************************************************************** @@ -38,6 +35,9 @@ enum disasm_right_column // TYPE DEFINITIONS //************************************************************************** +// forward declaration +class debug_disasm_buffer; + // a disassembly view_source class debug_view_disasm_source : public debug_view_source { diff --git a/src/emu/debug/dvmemory.cpp b/src/emu/debug/dvmemory.cpp index da792305c0d4d..7c10407822b0e 100644 --- a/src/emu/debug/dvmemory.cpp +++ b/src/emu/debug/dvmemory.cpp @@ -12,7 +12,6 @@ #include "dvmemory.h" #include "debugcpu.h" -#include "debugger.h" #include #include diff --git a/src/emu/debug/dvrpoints.cpp b/src/emu/debug/dvrpoints.cpp index 7295a1b2170e4..a36f42bd1d046 100644 --- a/src/emu/debug/dvrpoints.cpp +++ b/src/emu/debug/dvrpoints.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "dvrpoints.h" -#include "debugger.h" +#include "debugcpu.h" #include "points.h" #include diff --git a/src/emu/debug/dvrpoints.h b/src/emu/debug/dvrpoints.h index 307ccbc212eb5..31b821d7faeb2 100644 --- a/src/emu/debug/dvrpoints.h +++ b/src/emu/debug/dvrpoints.h @@ -12,7 +12,6 @@ #pragma once -#include "debugcpu.h" #include "debugvw.h" #include diff --git a/src/emu/debug/dvwpoints.cpp b/src/emu/debug/dvwpoints.cpp index 21d3f30c5ca7e..116904232a13c 100644 --- a/src/emu/debug/dvwpoints.cpp +++ b/src/emu/debug/dvwpoints.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "dvwpoints.h" +#include "debugcpu.h" #include "points.h" #include diff --git a/src/emu/debug/dvwpoints.h b/src/emu/debug/dvwpoints.h index 650a0aefad5e4..df1145742b670 100644 --- a/src/emu/debug/dvwpoints.h +++ b/src/emu/debug/dvwpoints.h @@ -12,7 +12,6 @@ #pragma once -#include "debugcpu.h" #include "debugvw.h" diff --git a/src/emu/debug/points.cpp b/src/emu/debug/points.cpp index 961488eebb2e0..12e4b61484323 100644 --- a/src/emu/debug/points.cpp +++ b/src/emu/debug/points.cpp @@ -10,8 +10,10 @@ #include "emu.h" #include "points.h" + #include "debugger.h" #include "debugcon.h" +#include "debugcpu.h" //************************************************************************** diff --git a/src/emu/debug/points.h b/src/emu/debug/points.h index 42abd46398f59..cf9e5bfc44dc4 100644 --- a/src/emu/debug/points.h +++ b/src/emu/debug/points.h @@ -13,7 +13,6 @@ #pragma once -#include "debugcpu.h" #include "express.h" diff --git a/src/osd/modules/debugger/qt/breakpointswindow.cpp b/src/osd/modules/debugger/qt/breakpointswindow.cpp index 16c8af6bdb30e..dd3f473dc1235 100644 --- a/src/osd/modules/debugger/qt/breakpointswindow.cpp +++ b/src/osd/modules/debugger/qt/breakpointswindow.cpp @@ -3,9 +3,6 @@ #include "emu.h" #include "breakpointswindow.h" -#include "debug/debugcon.h" -#include "debug/debugcpu.h" - #include "util/xmlfile.h" #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) diff --git a/src/osd/modules/debugger/qt/dasmwindow.cpp b/src/osd/modules/debugger/qt/dasmwindow.cpp index 144e2f32f5d3c..e90054a329282 100644 --- a/src/osd/modules/debugger/qt/dasmwindow.cpp +++ b/src/osd/modules/debugger/qt/dasmwindow.cpp @@ -3,6 +3,7 @@ #include "emu.h" #include "dasmwindow.h" +#include "debugger.h" #include "debug/debugcon.h" #include "debug/debugcpu.h" #include "debug/dvdisasm.h" diff --git a/src/osd/modules/debugger/qt/logwindow.cpp b/src/osd/modules/debugger/qt/logwindow.cpp index dfbe947cacad3..c3a6b442f0fd8 100644 --- a/src/osd/modules/debugger/qt/logwindow.cpp +++ b/src/osd/modules/debugger/qt/logwindow.cpp @@ -3,10 +3,6 @@ #include "emu.h" #include "logwindow.h" -#include "debug/debugcon.h" -#include "debug/debugcpu.h" -#include "debug/dvdisasm.h" - #include "util/xmlfile.h" #include diff --git a/src/osd/modules/debugger/qt/mainwindow.cpp b/src/osd/modules/debugger/qt/mainwindow.cpp index ac4540bd6388c..0085dac364b70 100644 --- a/src/osd/modules/debugger/qt/mainwindow.cpp +++ b/src/osd/modules/debugger/qt/mainwindow.cpp @@ -3,6 +3,7 @@ #include "emu.h" #include "mainwindow.h" +#include "debugger.h" #include "debug/debugcon.h" #include "debug/debugcpu.h" #include "debug/dvdisasm.h" diff --git a/src/osd/modules/debugger/qt/memorywindow.cpp b/src/osd/modules/debugger/qt/memorywindow.cpp index f5e7502f4d4f9..ec250055383e2 100644 --- a/src/osd/modules/debugger/qt/memorywindow.cpp +++ b/src/osd/modules/debugger/qt/memorywindow.cpp @@ -3,6 +3,7 @@ #include "emu.h" #include "memorywindow.h" +#include "debugger.h" #include "debug/dvmemory.h" #include "debug/debugcon.h" #include "debug/debugcpu.h" diff --git a/src/osd/modules/debugger/qt/windowqt.cpp b/src/osd/modules/debugger/qt/windowqt.cpp index cd0998fab862a..294871e6d2280 100644 --- a/src/osd/modules/debugger/qt/windowqt.cpp +++ b/src/osd/modules/debugger/qt/windowqt.cpp @@ -9,6 +9,7 @@ #include "logwindow.h" #include "memorywindow.h" +#include "debugger.h" #include "debug/debugcon.h" #include "debug/debugcpu.h" diff --git a/src/osd/modules/debugger/qt/windowqt.h b/src/osd/modules/debugger/qt/windowqt.h index 8085f9a63bf16..b5e933e8a0c4e 100644 --- a/src/osd/modules/debugger/qt/windowqt.h +++ b/src/osd/modules/debugger/qt/windowqt.h @@ -5,8 +5,6 @@ #include "../xmlconfig.h" -#include "debugger.h" - #include #include