From 522a5c35ad97718478ccdc75ae519ce910dd6dcb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 29 Jul 2014 20:55:07 -0400 Subject: [PATCH] Convert some more header inclusions into forward declarations --- Source/Core/Core/HW/DSPHLE/MailHandler.cpp | 1 + Source/Core/Core/HW/DSPHLE/MailHandler.h | 4 ++-- Source/Core/Core/HW/GCMemcardRaw.cpp | 3 +++ Source/Core/Core/HW/GCMemcardRaw.h | 3 ++- Source/Core/Core/HW/HW.cpp | 1 + Source/Core/Core/HW/HW.h | 3 +-- Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp | 1 + Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h | 3 +-- Source/Core/VideoBackends/Software/Clipper.cpp | 2 +- Source/Core/VideoBackends/Software/Clipper.h | 5 ++--- Source/Core/VideoBackends/Software/OpcodeDecoder.cpp | 1 + Source/Core/VideoBackends/Software/OpcodeDecoder.h | 3 ++- Source/Core/VideoBackends/Software/Rasterizer.cpp | 1 + Source/Core/VideoBackends/Software/Rasterizer.h | 3 ++- Source/Core/VideoBackends/Software/SWVertexLoader.cpp | 5 +++-- Source/Core/VideoBackends/Software/SWVertexLoader.h | 2 +- Source/Core/VideoBackends/Software/SetupUnit.cpp | 1 + Source/Core/VideoBackends/Software/SetupUnit.h | 3 ++- Source/Core/VideoBackends/Software/Tev.cpp | 2 +- Source/Core/VideoBackends/Software/Tev.h | 3 ++- Source/Core/VideoCommon/VideoState.cpp | 1 + Source/Core/VideoCommon/VideoState.h | 3 +-- 22 files changed, 33 insertions(+), 21 deletions(-) diff --git a/Source/Core/Core/HW/DSPHLE/MailHandler.cpp b/Source/Core/Core/HW/DSPHLE/MailHandler.cpp index 7ce13142ab..b2a987440d 100644 --- a/Source/Core/Core/HW/DSPHLE/MailHandler.cpp +++ b/Source/Core/Core/HW/DSPHLE/MailHandler.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Core/HW/DSPHLE/MailHandler.h" CMailHandler::CMailHandler() diff --git a/Source/Core/Core/HW/DSPHLE/MailHandler.h b/Source/Core/Core/HW/DSPHLE/MailHandler.h index 21b3747e61..9c523ebe60 100644 --- a/Source/Core/Core/HW/DSPHLE/MailHandler.h +++ b/Source/Core/Core/HW/DSPHLE/MailHandler.h @@ -5,10 +5,10 @@ #pragma once #include - -#include "Common/ChunkFile.h" #include "Common/Common.h" +class PointerWrap; + class CMailHandler { public: diff --git a/Source/Core/Core/HW/GCMemcardRaw.cpp b/Source/Core/Core/HW/GCMemcardRaw.cpp index 8df0df5238..96f80df94f 100644 --- a/Source/Core/Core/HW/GCMemcardRaw.cpp +++ b/Source/Core/Core/HW/GCMemcardRaw.cpp @@ -1,9 +1,12 @@ // Copyright 2013 Dolphin Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. + +#include "Common/ChunkFile.h" #include "Core/Core.h" #include "Core/HW/GCMemcard.h" #include "Core/HW/GCMemcardRaw.h" + #define SIZE_TO_Mb (1024 * 8 * 16) #define MC_HDR_SIZE 0xA000 diff --git a/Source/Core/Core/HW/GCMemcardRaw.h b/Source/Core/Core/HW/GCMemcardRaw.h index 11f1c01bdb..f64af669e8 100644 --- a/Source/Core/Core/HW/GCMemcardRaw.h +++ b/Source/Core/Core/HW/GCMemcardRaw.h @@ -4,10 +4,11 @@ #pragma once -#include "Common/ChunkFile.h" #include "Common/Thread.h" #include "Core/HW/GCMemcard.h" +class PointerWrap; + // Data structure to be passed to the flushing thread. struct FlushData { diff --git a/Source/Core/Core/HW/HW.cpp b/Source/Core/Core/HW/HW.cpp index acc78f1c0f..6da1b86238 100644 --- a/Source/Core/Core/HW/HW.cpp +++ b/Source/Core/Core/HW/HW.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Common/Common.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/HW/HW.h b/Source/Core/Core/HW/HW.h index c01ec7b52d..1a7d7e0a56 100644 --- a/Source/Core/Core/HW/HW.h +++ b/Source/Core/Core/HW/HW.h @@ -4,8 +4,7 @@ #pragma once -#include "Common/ChunkFile.h" -#include "Common/Common.h" +class PointerWrap; namespace HW { diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp index 6f58591960..52edbec328 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Common/Common.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h index afa78d75e3..00caddacdc 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h @@ -6,11 +6,10 @@ #include #include - -#include "Common/ChunkFile.h" #include "Core/IPC_HLE/hci.h" class CWII_IPC_HLE_Device_usb_oh1_57e_305; +class PointerWrap; CWII_IPC_HLE_Device_usb_oh1_57e_305* GetUsbPointer(); void SetUsbPointer(CWII_IPC_HLE_Device_usb_oh1_57e_305* ptr); diff --git a/Source/Core/VideoBackends/Software/Clipper.cpp b/Source/Core/VideoBackends/Software/Clipper.cpp index 9e8e603a92..5e0398f540 100644 --- a/Source/Core/VideoBackends/Software/Clipper.cpp +++ b/Source/Core/VideoBackends/Software/Clipper.cpp @@ -35,6 +35,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "Common/ChunkFile.h" #include "VideoBackends/Software/BPMemLoader.h" #include "VideoBackends/Software/Clipper.h" #include "VideoBackends/Software/NativeVertexFormat.h" @@ -42,7 +43,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "VideoBackends/Software/SWStatistics.h" #include "VideoBackends/Software/XFMemLoader.h" - namespace Clipper { enum { NUM_CLIPPED_VERTICES = 33, NUM_INDICES = NUM_CLIPPED_VERTICES + 3 }; diff --git a/Source/Core/VideoBackends/Software/Clipper.h b/Source/Core/VideoBackends/Software/Clipper.h index a7e75277ae..cc303671d1 100644 --- a/Source/Core/VideoBackends/Software/Clipper.h +++ b/Source/Core/VideoBackends/Software/Clipper.h @@ -4,9 +4,8 @@ #pragma once -#include "Common/ChunkFile.h" -#include "Common/Common.h" -#include "VideoBackends/Software/NativeVertexFormat.h" +struct OutputVertexData; +class PointerWrap; namespace Clipper { diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index 33863c892c..f06b31b595 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Common/Common.h" #include "Core/HW/Memmap.h" #include "VideoBackends/Software/BPMemLoader.h" diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.h b/Source/Core/VideoBackends/Software/OpcodeDecoder.h index 5bd5d1d530..1363853213 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.h +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.h @@ -4,9 +4,10 @@ #pragma once -#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" +class PointerWrap; + namespace OpcodeDecoder { diff --git a/Source/Core/VideoBackends/Software/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Rasterizer.cpp index 1a5e469435..cfe038b0ea 100644 --- a/Source/Core/VideoBackends/Software/Rasterizer.cpp +++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp @@ -8,6 +8,7 @@ #include "VideoBackends/Software/BPMemLoader.h" #include "VideoBackends/Software/EfbInterface.h" #include "VideoBackends/Software/HwRasterizer.h" +#include "VideoBackends/Software/NativeVertexFormat.h" #include "VideoBackends/Software/Rasterizer.h" #include "VideoBackends/Software/SWStatistics.h" #include "VideoBackends/Software/SWVideoConfig.h" diff --git a/Source/Core/VideoBackends/Software/Rasterizer.h b/Source/Core/VideoBackends/Software/Rasterizer.h index 7d64b8aa5d..9e17d14da6 100644 --- a/Source/Core/VideoBackends/Software/Rasterizer.h +++ b/Source/Core/VideoBackends/Software/Rasterizer.h @@ -5,7 +5,8 @@ #pragma once #include "Common/ChunkFile.h" -#include "VideoBackends/Software/NativeVertexFormat.h" + +struct OutputVertexData; namespace Rasterizer { diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp index 52af0ae1a1..252debdab2 100644 --- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp +++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Common/Common.h" #include "VideoBackends/Software/CPMemLoader.h" @@ -22,13 +23,13 @@ SWVertexLoader::SWVertexLoader() : m_VertexSize(0), m_NumAttributeLoaders(0) - { +{ VertexLoader_Normal::Init(); VertexLoader_Position::Init(); VertexLoader_TextCoord::Init(); m_SetupUnit = new SetupUnit; - } +} SWVertexLoader::~SWVertexLoader() { diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.h b/Source/Core/VideoBackends/Software/SWVertexLoader.h index ed6bf0bb36..8a29c93300 100644 --- a/Source/Core/VideoBackends/Software/SWVertexLoader.h +++ b/Source/Core/VideoBackends/Software/SWVertexLoader.h @@ -4,12 +4,12 @@ #pragma once -#include "Common/ChunkFile.h" #include "Common/Common.h" #include "VideoBackends/Software/CPMemLoader.h" #include "VideoBackends/Software/NativeVertexFormat.h" +class PointerWrap; class SetupUnit; class SWVertexLoader diff --git a/Source/Core/VideoBackends/Software/SetupUnit.cpp b/Source/Core/VideoBackends/Software/SetupUnit.cpp index 171350db60..37e45f9f28 100644 --- a/Source/Core/VideoBackends/Software/SetupUnit.cpp +++ b/Source/Core/VideoBackends/Software/SetupUnit.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "VideoBackends/Software/Clipper.h" #include "VideoBackends/Software/CPMemLoader.h" #include "VideoBackends/Software/OpcodeDecoder.h" diff --git a/Source/Core/VideoBackends/Software/SetupUnit.h b/Source/Core/VideoBackends/Software/SetupUnit.h index 36163f06bd..053513f5f9 100644 --- a/Source/Core/VideoBackends/Software/SetupUnit.h +++ b/Source/Core/VideoBackends/Software/SetupUnit.h @@ -4,10 +4,11 @@ #pragma once -#include "Common/ChunkFile.h" #include "Common/Common.h" #include "VideoBackends/Software/NativeVertexFormat.h" +class PointerWrap; + class SetupUnit { u8 m_PrimType; diff --git a/Source/Core/VideoBackends/Software/Tev.cpp b/Source/Core/VideoBackends/Software/Tev.cpp index 5511ca789c..33fcca219c 100644 --- a/Source/Core/VideoBackends/Software/Tev.cpp +++ b/Source/Core/VideoBackends/Software/Tev.cpp @@ -4,8 +4,8 @@ #include +#include "Common/ChunkFile.h" #include "Common/Common.h" - #include "VideoBackends/Software/DebugUtil.h" #include "VideoBackends/Software/EfbInterface.h" #include "VideoBackends/Software/SWStatistics.h" diff --git a/Source/Core/VideoBackends/Software/Tev.h b/Source/Core/VideoBackends/Software/Tev.h index ecb5fde9f0..7ecb2852f0 100644 --- a/Source/Core/VideoBackends/Software/Tev.h +++ b/Source/Core/VideoBackends/Software/Tev.h @@ -4,9 +4,10 @@ #pragma once -#include "Common/ChunkFile.h" #include "VideoBackends/Software/BPMemLoader.h" +class PointerWrap; + class Tev { struct InputRegType diff --git a/Source/Core/VideoCommon/VideoState.cpp b/Source/Core/VideoCommon/VideoState.cpp index 4a0f541169..a8d5ddcf04 100644 --- a/Source/Core/VideoCommon/VideoState.cpp +++ b/Source/Core/VideoCommon/VideoState.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "VideoCommon/BPMemory.h" #include "VideoCommon/CommandProcessor.h" #include "VideoCommon/CPMemory.h" diff --git a/Source/Core/VideoCommon/VideoState.h b/Source/Core/VideoCommon/VideoState.h index ba366ca526..e26e573e84 100644 --- a/Source/Core/VideoCommon/VideoState.h +++ b/Source/Core/VideoCommon/VideoState.h @@ -4,8 +4,7 @@ #pragma once -#include "Common/ChunkFile.h" -#include "Common/Common.h" +class PointerWrap; void VideoCommon_DoState(PointerWrap &p); void VideoCommon_RunLoop(bool enable);