From 76bbd4682958b3904b95fe062d51f55978515a10 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 8 May 2015 17:28:03 -0400 Subject: [PATCH] Core: Remove some header inclusions in header files Replaces them with forward declarations of used types, or removes them entirely if they aren't used at all. This also replaces certain Common headers with less inclusive ones (in terms of definitions they pull in). --- Source/Core/Common/ENetUtil.h | 1 - Source/Core/Core/ActionReplay.cpp | 1 + Source/Core/Core/ActionReplay.h | 6 +++- Source/Core/Core/Boot/Boot.cpp | 1 + Source/Core/Core/Boot/Boot.h | 5 +--- Source/Core/Core/Boot/Boot_BS2Emu.cpp | 14 +++++----- Source/Core/Core/ConfigManager.h | 2 +- Source/Core/Core/Core.cpp | 5 ++-- Source/Core/Core/Core.h | 1 - Source/Core/Core/CoreParameter.cpp | 12 ++++---- Source/Core/Core/DSP/DSPAnalyzer.h | 2 +- Source/Core/Core/DSP/DSPBreakpoints.h | 3 +- Source/Core/Core/DSP/DSPCore.cpp | 1 + Source/Core/Core/DSP/DSPCore.h | 2 -- Source/Core/Core/DSP/DSPIntArithmetic.cpp | 2 ++ Source/Core/Core/DSP/DSPIntExtOps.h | 2 +- Source/Core/Core/DSP/DSPIntMisc.cpp | 3 +- Source/Core/Core/DSP/DSPIntMultiplier.cpp | 1 + Source/Core/Core/DSP/DSPIntUtil.h | 2 -- Source/Core/Core/DSP/DSPInterpreter.cpp | 2 ++ Source/Core/Core/DSP/DSPInterpreter.h | 2 +- Source/Core/Core/DSP/DSPMemoryMap.h | 2 +- Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp | 1 + Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp | 2 ++ Source/Core/Core/DSP/Jit/DSPJitMisc.cpp | 2 ++ Source/Core/Core/DSPEmulator.h | 2 +- Source/Core/Core/GeckoCode.cpp | 1 + Source/Core/Core/GeckoCode.h | 1 - Source/Core/Core/HLE/HLE.h | 1 + Source/Core/Core/HLE/HLE_OS.h | 2 -- Source/Core/Core/HW/DSPHLE/DSPHLE.h | 1 + Source/Core/Core/HW/DSPLLE/DSPLLE.cpp | 1 + Source/Core/Core/HW/DSPLLE/DSPLLE.h | 8 ++++-- Source/Core/Core/HW/DVDInterface.cpp | 1 + Source/Core/Core/HW/DVDInterface.h | 4 +-- Source/Core/Core/HW/EXI.cpp | 1 + Source/Core/Core/HW/EXI.h | 6 ++-- Source/Core/Core/HW/EXI_Channel.cpp | 1 + Source/Core/Core/HW/EXI_Channel.h | 5 ++-- Source/Core/Core/HW/EXI_Device.cpp | 3 +- Source/Core/Core/HW/EXI_Device.h | 5 ++-- Source/Core/Core/HW/EXI_DeviceAD16.cpp | 2 +- Source/Core/Core/HW/EXI_DeviceAD16.h | 2 ++ Source/Core/Core/HW/EXI_DeviceAGP.cpp | 1 + Source/Core/Core/HW/EXI_DeviceAGP.h | 4 +++ Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp | 3 +- Source/Core/Core/HW/EXI_DeviceAMBaseboard.h | 2 ++ Source/Core/Core/HW/EXI_DeviceEthernet.cpp | 1 + Source/Core/Core/HW/EXI_DeviceEthernet.h | 2 ++ Source/Core/Core/HW/EXI_DeviceGecko.cpp | 4 +++ Source/Core/Core/HW/EXI_DeviceGecko.h | 7 +++-- Source/Core/Core/HW/EXI_DeviceIPL.cpp | 2 ++ Source/Core/Core/HW/EXI_DeviceIPL.h | 3 +- Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp | 2 ++ Source/Core/Core/HW/EXI_DeviceMemoryCard.h | 7 ++++- Source/Core/Core/HW/GCKeyboard.cpp | 1 - Source/Core/Core/HW/GCKeyboard.h | 9 +++--- Source/Core/Core/HW/GCKeyboardEmu.cpp | 2 +- Source/Core/Core/HW/GCKeyboardEmu.h | 3 +- Source/Core/Core/HW/GCMemcard.cpp | 1 + Source/Core/Core/HW/GCMemcardDirectory.cpp | 2 ++ Source/Core/Core/HW/GCMemcardDirectory.h | 7 +++++ Source/Core/Core/HW/GCMemcardRaw.cpp | 2 ++ Source/Core/Core/HW/GCMemcardRaw.h | 4 ++- Source/Core/Core/HW/GCPad.h | 10 ++++--- Source/Core/Core/HW/GPFifo.cpp | 1 + Source/Core/Core/HW/GPFifo.h | 3 +- Source/Core/Core/HW/MMIO.h | 2 +- Source/Core/Core/HW/MMIOHandlers.h | 2 +- Source/Core/Core/HW/SI.h | 2 +- Source/Core/Core/HW/SI_Device.h | 2 +- Source/Core/Core/HW/SI_DeviceDanceMat.cpp | 1 + Source/Core/Core/HW/SI_DeviceDanceMat.h | 2 ++ Source/Core/Core/HW/SI_DeviceGCController.cpp | 2 ++ Source/Core/Core/HW/SI_DeviceKeyboard.cpp | 2 ++ Source/Core/Core/HW/SI_DeviceKeyboard.h | 5 +++- Source/Core/Core/HW/SI_GCAdapter.cpp | 4 +++ Source/Core/Core/HW/SI_GCAdapter.h | 4 +-- Source/Core/Core/HW/Sram.cpp | 1 + Source/Core/Core/HW/Wiimote.h | 3 +- .../HW/WiimoteEmu/Attachment/Attachment.cpp | 1 + .../HW/WiimoteEmu/Attachment/Attachment.h | 3 +- .../Core/HW/WiimoteEmu/Attachment/Classic.cpp | 1 + .../Core/HW/WiimoteEmu/Attachment/Classic.h | 2 ++ .../Core/HW/WiimoteEmu/Attachment/Drums.cpp | 1 + .../Core/HW/WiimoteEmu/Attachment/Drums.h | 2 ++ .../Core/HW/WiimoteEmu/Attachment/Guitar.cpp | 1 + .../Core/HW/WiimoteEmu/Attachment/Guitar.h | 2 ++ .../Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp | 1 + .../Core/HW/WiimoteEmu/Attachment/Nunchuk.h | 2 ++ .../HW/WiimoteEmu/Attachment/Turntable.cpp | 1 + .../Core/HW/WiimoteEmu/Attachment/Turntable.h | 2 ++ Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp | 3 +- Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h | 4 ++- .../Core/Core/HW/WiimoteReal/WiimoteReal.cpp | 3 +- Source/Core/Core/HW/WiimoteReal/WiimoteReal.h | 9 +++--- Source/Core/Core/HotkeyManager.cpp | 4 ++- Source/Core/Core/HotkeyManager.h | 2 +- Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h | 2 +- .../Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp | 3 +- .../Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h | 4 ++- .../Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h | 5 +++- .../Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 5 ++-- .../Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h | 10 ++++++- .../Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h | 2 ++ .../Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp | 3 +- .../Core/IPC_HLE/WII_IPC_HLE_Device_hid.h | 4 ++- .../Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h | 1 + .../IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp | 2 ++ .../IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h | 4 +++ .../Core/IPC_HLE/WII_IPC_HLE_Device_stm.h | 1 + .../Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 2 +- .../Core/IPC_HLE/WII_IPC_HLE_Device_usb.h | 4 ++- .../Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h | 3 ++ .../Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h | 3 +- Source/Core/Core/IPC_HLE/WII_Socket.cpp | 1 + Source/Core/Core/IPC_HLE/WII_Socket.h | 1 - Source/Core/Core/Movie.cpp | 1 + Source/Core/Core/NetPlayClient.cpp | 2 ++ Source/Core/Core/NetPlayClient.h | 2 -- Source/Core/Core/NetPlayProto.h | 3 +- Source/Core/Core/NetPlayServer.cpp | 1 + Source/Core/Core/NetPlayServer.h | 1 - Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp | 1 + Source/Core/Core/PowerPC/JitILCommon/IR.cpp | 1 + Source/Core/Core/ec_wii.h | 3 +- Source/Core/DolphinQt/GameList/GameFile.cpp | 20 ++++++------- .../Core/DolphinQt/GameList/GameTracker.cpp | 1 + Source/Core/DolphinWX/Cheats/CheatsWindow.cpp | 1 + .../Core/DolphinWX/Config/PathConfigPane.cpp | 1 + .../Core/DolphinWX/Config/WiiConfigPane.cpp | 24 ++++++++-------- Source/Core/DolphinWX/Config/WiiConfigPane.h | 2 +- Source/Core/DolphinWX/GameListCtrl.cpp | 4 +-- Source/Core/DolphinWX/ISOFile.cpp | 16 +++++------ Source/Core/DolphinWX/ISOFile.h | 10 +++---- Source/Core/DolphinWX/ISOProperties.cpp | 28 +++++++++---------- Source/Core/DolphinWX/ISOProperties.h | 2 +- Source/Core/DolphinWX/MainAndroid.cpp | 8 +++--- Source/Core/DolphinWX/NetPlay/NetWindow.cpp | 2 +- 139 files changed, 308 insertions(+), 169 deletions(-) diff --git a/Source/Core/Common/ENetUtil.h b/Source/Core/Common/ENetUtil.h index 219f51d425..c4ac84c2a8 100644 --- a/Source/Core/Common/ENetUtil.h +++ b/Source/Core/Common/ENetUtil.h @@ -5,7 +5,6 @@ #pragma once #include -#include "Common.h" namespace ENetUtil { diff --git a/Source/Core/Core/ActionReplay.cpp b/Source/Core/Core/ActionReplay.cpp index e3035ae1d2..33830703f7 100644 --- a/Source/Core/Core/ActionReplay.cpp +++ b/Source/Core/Core/ActionReplay.cpp @@ -23,6 +23,7 @@ #include #include "Common/CommonTypes.h" +#include "Common/IniFile.h" #include "Common/StringUtil.h" #include "Common/Logging/LogManager.h" diff --git a/Source/Core/Core/ActionReplay.h b/Source/Core/Core/ActionReplay.h index 3207a1c4fa..0786a67d51 100644 --- a/Source/Core/Core/ActionReplay.h +++ b/Source/Core/Core/ActionReplay.h @@ -4,7 +4,11 @@ #pragma once -#include "Common/IniFile.h" +#include +#include +#include "Common/CommonTypes.h" + +class IniFile; namespace ActionReplay { diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp index f89324e847..46eb2a657f 100644 --- a/Source/Core/Core/Boot/Boot.cpp +++ b/Source/Core/Core/Boot/Boot.cpp @@ -12,6 +12,7 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" +#include "Core/CoreParameter.h" #include "Core/Host.h" #include "Core/PatchEngine.h" #include "Core/Boot/Boot.h" diff --git a/Source/Core/Core/Boot/Boot.h b/Source/Core/Core/Boot/Boot.h index a562ba889a..2a4cb0ef04 100644 --- a/Source/Core/Core/Boot/Boot.h +++ b/Source/Core/Core/Boot/Boot.h @@ -7,10 +7,7 @@ #include #include -#include "Core/CoreParameter.h" - #include "DiscIO/Volume.h" -using DiscIO::IVolume; struct CountrySetting { @@ -58,5 +55,5 @@ private: static bool Load_BS2(const std::string& _rBootROMFilename); static void Load_FST(bool _bIsWii); - static bool SetupWiiMemory(IVolume::ECountry country); + static bool SetupWiiMemory(DiscIO::IVolume::ECountry country); }; diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp index 2860d536a0..7156422fcf 100644 --- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp @@ -163,18 +163,18 @@ bool CBoot::EmulatedBS2_GC(bool skipAppLoader) return true; } -bool CBoot::SetupWiiMemory(IVolume::ECountry country) +bool CBoot::SetupWiiMemory(DiscIO::IVolume::ECountry country) { static const CountrySetting SETTING_EUROPE = {"EUR", "PAL", "EU", "LE"}; - static const std::map country_settings = { - {IVolume::COUNTRY_EUROPE, SETTING_EUROPE}, - {IVolume::COUNTRY_USA, {"USA", "NTSC", "US", "LU"}}, - {IVolume::COUNTRY_JAPAN, {"JPN", "NTSC", "JP", "LJ"}}, - {IVolume::COUNTRY_KOREA, {"KOR", "NTSC", "KR", "LKH"}}, + static const std::map country_settings = { + {DiscIO::IVolume::COUNTRY_EUROPE, SETTING_EUROPE}, + {DiscIO::IVolume::COUNTRY_USA, {"USA", "NTSC", "US", "LU"}}, + {DiscIO::IVolume::COUNTRY_JAPAN, {"JPN", "NTSC", "JP", "LJ"}}, + {DiscIO::IVolume::COUNTRY_KOREA, {"KOR", "NTSC", "KR", "LKH"}}, //TODO: Determine if Taiwan have their own specific settings. // Also determine if there are other specific settings // for other countries. - {IVolume::COUNTRY_TAIWAN, {"JPN", "NTSC", "JP", "LJ"}} + {DiscIO::IVolume::COUNTRY_TAIWAN, {"JPN", "NTSC", "JP", "LJ"}} }; auto entryPos = country_settings.find(country); const CountrySetting& country_setting = diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index 8a713946dd..44e5cc37cc 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -8,7 +8,7 @@ #include #include "Common/SysConf.h" -#include "Core/Boot/Boot.h" +#include "Core/CoreParameter.h" #include "Core/HW/EXI_Device.h" #include "Core/HW/SI_Device.h" diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index fc63203d04..c407305884 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -23,6 +23,7 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" +#include "Core/CoreParameter.h" #include "Core/CoreTiming.h" #include "Core/DSPEmulator.h" #include "Core/Host.h" @@ -33,7 +34,6 @@ #include "Core/State.h" #include "Core/Boot/Boot.h" #include "Core/FifoPlayer/FifoPlayer.h" - #include "Core/HW/AudioInterface.h" #include "Core/HW/CPU.h" #include "Core/HW/DSP.h" @@ -48,6 +48,7 @@ #include "Core/HW/VideoInterface.h" #include "Core/HW/Wiimote.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" #include "Core/IPC_HLE/WII_Socket.h" #include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/PowerPC.h" @@ -57,7 +58,7 @@ #endif #include "DiscIO/FileMonitor.h" - +#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/VideoBackendBase.h" diff --git a/Source/Core/Core/Core.h b/Source/Core/Core/Core.h index 63eabe247b..f431bfd5c5 100644 --- a/Source/Core/Core/Core.h +++ b/Source/Core/Core/Core.h @@ -15,7 +15,6 @@ #include #include "Common/CommonTypes.h" -#include "Core/CoreParameter.h" // TODO: ugly, remove extern bool g_aspect_wide; diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp index bce8101b09..90052de6af 100644 --- a/Source/Core/Core/CoreParameter.cpp +++ b/Source/Core/Core/CoreParameter.cpp @@ -373,17 +373,17 @@ void SCoreStartupParameter::CheckMemcardPath(std::string& memcardPath, std::stri } } -IVolume::ELanguage SCoreStartupParameter::GetCurrentLanguage(bool wii) const +DiscIO::IVolume::ELanguage SCoreStartupParameter::GetCurrentLanguage(bool wii) const { - IVolume::ELanguage language; + DiscIO::IVolume::ELanguage language; if (wii) - language = (IVolume::ELanguage)SConfig::GetInstance().m_SYSCONF->GetData("IPL.LNG"); + language = (DiscIO::IVolume::ELanguage)SConfig::GetInstance().m_SYSCONF->GetData("IPL.LNG"); else - language = (IVolume::ELanguage)(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage + 1); + language = (DiscIO::IVolume::ELanguage)(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage + 1); // Get rid of invalid values (probably doesn't matter, but might as well do it) - if (language > IVolume::ELanguage::LANGUAGE_UNKNOWN || language < 0) - language = IVolume::ELanguage::LANGUAGE_UNKNOWN; + if (language > DiscIO::IVolume::ELanguage::LANGUAGE_UNKNOWN || language < 0) + language = DiscIO::IVolume::ELanguage::LANGUAGE_UNKNOWN; return language; } diff --git a/Source/Core/Core/DSP/DSPAnalyzer.h b/Source/Core/Core/DSP/DSPAnalyzer.h index 5a603d7429..fbb88282cc 100644 --- a/Source/Core/Core/DSP/DSPAnalyzer.h +++ b/Source/Core/Core/DSP/DSPAnalyzer.h @@ -5,7 +5,7 @@ #pragma once #include -#include "Core/DSP/DSPInterpreter.h" +#include "Common/CommonTypes.h" // Basic code analysis. namespace DSPAnalyzer diff --git a/Source/Core/Core/DSP/DSPBreakpoints.h b/Source/Core/Core/DSP/DSPBreakpoints.h index 6f07679a5a..c01996daa9 100644 --- a/Source/Core/Core/DSP/DSPBreakpoints.h +++ b/Source/Core/Core/DSP/DSPBreakpoints.h @@ -4,7 +4,8 @@ #pragma once -#include "Common/Common.h" +#include +#include "Common/CommonTypes.h" // super fast breakpoints for a limited range. // To be used interchangeably with the BreakPoints class. diff --git a/Source/Core/Core/DSP/DSPCore.cpp b/Source/Core/Core/DSP/DSPCore.cpp index b002b3d3c9..8e47d4a3f1 100644 --- a/Source/Core/Core/DSP/DSPCore.cpp +++ b/Source/Core/Core/DSP/DSPCore.cpp @@ -34,6 +34,7 @@ #include "Core/DSP/DSPEmitter.h" #include "Core/DSP/DSPHost.h" #include "Core/DSP/DSPHWInterface.h" +#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPIntUtil.h" SDSP g_dsp; diff --git a/Source/Core/Core/DSP/DSPCore.h b/Source/Core/Core/DSP/DSPCore.h index 63d8e3ed21..1d2bc7c1ad 100644 --- a/Source/Core/Core/DSP/DSPCore.h +++ b/Source/Core/Core/DSP/DSPCore.h @@ -29,8 +29,6 @@ #include #include -#include "Common/Thread.h" - #include "Core/DSP/DSPBreakpoints.h" #include "Core/DSP/DSPCaptureLogger.h" #include "Core/DSP/DSPEmitter.h" diff --git a/Source/Core/Core/DSP/DSPIntArithmetic.cpp b/Source/Core/Core/DSP/DSPIntArithmetic.cpp index 1878ca384c..1bc766db47 100644 --- a/Source/Core/Core/DSP/DSPIntArithmetic.cpp +++ b/Source/Core/Core/DSP/DSPIntArithmetic.cpp @@ -7,6 +7,8 @@ #include "Core/DSP/DSPIntCCUtil.h" #include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPIntUtil.h" +#include "Core/DSP/DSPMemoryMap.h" +#include "Core/DSP/DSPTables.h" // Arithmetic and accumulator control. diff --git a/Source/Core/Core/DSP/DSPIntExtOps.h b/Source/Core/Core/DSP/DSPIntExtOps.h index dbe1d07f0f..0d6c2d35bf 100644 --- a/Source/Core/Core/DSP/DSPIntExtOps.h +++ b/Source/Core/Core/DSP/DSPIntExtOps.h @@ -25,7 +25,7 @@ #pragma once -#include "Core/DSP/DSPTables.h" +#include "Core/DSP/DSPCommon.h" // Extended opcode support. // Many opcode have the lower 0xFF (some only 0x7f) free - there, an opcode extension diff --git a/Source/Core/Core/DSP/DSPIntMisc.cpp b/Source/Core/Core/DSP/DSPIntMisc.cpp index f03e4b9a28..7561657789 100644 --- a/Source/Core/Core/DSP/DSPIntMisc.cpp +++ b/Source/Core/Core/DSP/DSPIntMisc.cpp @@ -6,8 +6,9 @@ #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPInterpreter.h" - #include "Core/DSP/DSPIntUtil.h" +#include "Core/DSP/DSPMemoryMap.h" +#include "Core/DSP/DSPTables.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPIntMultiplier.cpp b/Source/Core/Core/DSP/DSPIntMultiplier.cpp index bff947bded..5ef9db6835 100644 --- a/Source/Core/Core/DSP/DSPIntMultiplier.cpp +++ b/Source/Core/Core/DSP/DSPIntMultiplier.cpp @@ -10,6 +10,7 @@ #include "Core/DSP/DSPIntCCUtil.h" #include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPIntUtil.h" +#include "Core/DSP/DSPTables.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPIntUtil.h b/Source/Core/Core/DSP/DSPIntUtil.h index 09c475afbc..2781af7995 100644 --- a/Source/Core/Core/DSP/DSPIntUtil.h +++ b/Source/Core/Core/DSP/DSPIntUtil.h @@ -28,8 +28,6 @@ #include "Common/CommonTypes.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/DSPInterpreter.h" -#include "Core/DSP/DSPMemoryMap.h" #include "Core/DSP/DSPStacks.h" diff --git a/Source/Core/Core/DSP/DSPInterpreter.cpp b/Source/Core/Core/DSP/DSPInterpreter.cpp index fe5bc56ae1..db0d42e2fe 100644 --- a/Source/Core/Core/DSP/DSPInterpreter.cpp +++ b/Source/Core/Core/DSP/DSPInterpreter.cpp @@ -26,7 +26,9 @@ #include "Core/DSP/DSPAnalyzer.h" #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPHWInterface.h" +#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPIntUtil.h" +#include "Core/DSP/DSPMemoryMap.h" #include "Core/DSP/DSPTables.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPInterpreter.h b/Source/Core/Core/DSP/DSPInterpreter.h index 0feabd1f67..8098fdd2c9 100644 --- a/Source/Core/Core/DSP/DSPInterpreter.h +++ b/Source/Core/Core/DSP/DSPInterpreter.h @@ -4,7 +4,7 @@ #pragma once -#include "Core/DSP/DSPTables.h" +#include "Core/DSP/DSPCommon.h" #define DSP_REG_MASK 0x1f diff --git a/Source/Core/Core/DSP/DSPMemoryMap.h b/Source/Core/Core/DSP/DSPMemoryMap.h index 9069603fac..7fec666a37 100644 --- a/Source/Core/Core/DSP/DSPMemoryMap.h +++ b/Source/Core/Core/DSP/DSPMemoryMap.h @@ -28,7 +28,7 @@ #include "Common/CommonTypes.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPTables.h" u16 dsp_imem_read(u16 addr); void dsp_dmem_write(u16 addr, u16 val); diff --git a/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp b/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp index ecab111ad0..ca98514750 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp @@ -8,6 +8,7 @@ #include "Core/DSP/DSPEmitter.h" #include "Core/DSP/DSPIntCCUtil.h" #include "Core/DSP/DSPIntUtil.h" +#include "Core/DSP/DSPMemoryMap.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp b/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp index b842111f74..0c7aef6950 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp @@ -6,7 +6,9 @@ #include "Core/DSP/DSPEmitter.h" #include "Core/DSP/DSPIntCCUtil.h" +#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPIntUtil.h" +#include "Core/DSP/DSPMemoryMap.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp b/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp index 646339ff83..d2371c230c 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp @@ -3,7 +3,9 @@ // Refer to the license.txt file included. #include "Core/DSP/DSPEmitter.h" +#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPIntUtil.h" +#include "Core/DSP/DSPMemoryMap.h" using namespace Gen; diff --git a/Source/Core/Core/DSPEmulator.h b/Source/Core/Core/DSPEmulator.h index ac366f44ec..374e8f26f7 100644 --- a/Source/Core/Core/DSPEmulator.h +++ b/Source/Core/Core/DSPEmulator.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/ChunkFile.h" +class PointerWrap; class DSPEmulator { diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp index d05c1cba67..118e43e74a 100644 --- a/Source/Core/Core/GeckoCode.cpp +++ b/Source/Core/Core/GeckoCode.cpp @@ -5,6 +5,7 @@ #include #include "Common/CommonPaths.h" +#include "Common/FileUtil.h" #include "Common/Thread.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/GeckoCode.h b/Source/Core/Core/GeckoCode.h index 89902ef186..204e7c6e56 100644 --- a/Source/Core/Core/GeckoCode.h +++ b/Source/Core/Core/GeckoCode.h @@ -4,7 +4,6 @@ #pragma once -#include #include #include diff --git a/Source/Core/Core/HLE/HLE.h b/Source/Core/Core/HLE/HLE.h index 8a78507996..c73d8223ac 100644 --- a/Source/Core/Core/HLE/HLE.h +++ b/Source/Core/Core/HLE/HLE.h @@ -5,6 +5,7 @@ #pragma once #include +#include #include "Common/CommonTypes.h" diff --git a/Source/Core/Core/HLE/HLE_OS.h b/Source/Core/Core/HLE/HLE_OS.h index a62eadd234..a3d8fcfcf4 100644 --- a/Source/Core/Core/HLE/HLE_OS.h +++ b/Source/Core/Core/HLE/HLE_OS.h @@ -4,8 +4,6 @@ #pragma once -#include "Common/CommonTypes.h" - namespace HLE_OS { void HLE_GeneralDebugPrint(); diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.h b/Source/Core/Core/HW/DSPHLE/DSPHLE.h index ae64e5b5e8..c444664a99 100644 --- a/Source/Core/Core/HW/DSPHLE/DSPHLE.h +++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.h @@ -8,6 +8,7 @@ #include "Core/HW/DSP.h" #include "Core/HW/DSPHLE/MailHandler.h" +class PointerWrap; class UCodeInterface; class DSPHLE : public DSPEmulator { diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp index 24402c21cd..9571da1bdb 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp @@ -12,6 +12,7 @@ #include "Common/CPUDetect.h" #include "Common/Event.h" #include "Common/IniFile.h" +#include "Common/Thread.h" #include "Common/Logging/LogManager.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.h b/Source/Core/Core/HW/DSPLLE/DSPLLE.h index 39b9e26adc..f87bfd642d 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.h +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.h @@ -5,11 +5,13 @@ #pragma once #include +#include +#include -#include "Common/Thread.h" - +#include "Common/Flag.h" #include "Core/DSPEmulator.h" -#include "Core/HW/DSPLLE/DSPLLEGlobals.h" + +class PointerWrap; class DSPLLE : public DSPEmulator { diff --git a/Source/Core/Core/HW/DVDInterface.cpp b/Source/Core/Core/HW/DVDInterface.cpp index a66ca82125..0b02c8cc97 100644 --- a/Source/Core/Core/HW/DVDInterface.cpp +++ b/Source/Core/Core/HW/DVDInterface.cpp @@ -9,6 +9,7 @@ #include "AudioCommon/AudioCommon.h" +#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/HW/DVDInterface.h b/Source/Core/Core/HW/DVDInterface.h index f246f583d2..6b6ae30680 100644 --- a/Source/Core/Core/HW/DVDInterface.h +++ b/Source/Core/Core/HW/DVDInterface.h @@ -7,9 +7,9 @@ #include #include "Common/CommonTypes.h" -#include "DiscIO/Volume.h" class PointerWrap; +namespace DiscIO { class IVolume; } namespace MMIO { class Mapping; } namespace DVDInterface @@ -79,7 +79,7 @@ enum DICommand DVDLowAudioBufferConfig = 0xe4 }; -enum DIInterruptType +enum DIInterruptType : int { INT_DEINT = 0, INT_TCINT = 1, diff --git a/Source/Core/Core/HW/EXI.cpp b/Source/Core/Core/HW/EXI.cpp index 4eb3a003e8..d6c1697c18 100644 --- a/Source/Core/Core/HW/EXI.cpp +++ b/Source/Core/Core/HW/EXI.cpp @@ -9,6 +9,7 @@ #include "Core/CoreTiming.h" #include "Core/Movie.h" #include "Core/HW/EXI.h" +#include "Core/HW/EXI_Channel.h" #include "Core/HW/MMIO.h" #include "Core/HW/ProcessorInterface.h" #include "Core/HW/Sram.h" diff --git a/Source/Core/Core/HW/EXI.h b/Source/Core/Core/HW/EXI.h index f1bbd195cc..f88aec39cd 100644 --- a/Source/Core/Core/HW/EXI.h +++ b/Source/Core/Core/HW/EXI.h @@ -5,11 +5,11 @@ #pragma once #include "Common/CommonTypes.h" -#include "Common/Thread.h" - -#include "Core/HW/EXI_Channel.h" +class CEXIChannel; +class IEXIDevice; class PointerWrap; +enum TEXIDevices : int; namespace MMIO { class Mapping; } enum diff --git a/Source/Core/Core/HW/EXI_Channel.cpp b/Source/Core/Core/HW/EXI_Channel.cpp index c70280f06a..babb13334c 100644 --- a/Source/Core/Core/HW/EXI_Channel.cpp +++ b/Source/Core/Core/HW/EXI_Channel.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Core/ConfigManager.h" #include "Core/CoreTiming.h" #include "Core/Movie.h" diff --git a/Source/Core/Core/HW/EXI_Channel.h b/Source/Core/Core/HW/EXI_Channel.h index c816231330..bb05dafd50 100644 --- a/Source/Core/Core/HW/EXI_Channel.h +++ b/Source/Core/Core/HW/EXI_Channel.h @@ -5,10 +5,11 @@ #pragma once #include - #include "Common/CommonTypes.h" -#include "Core/HW/EXI_Device.h" +class IEXIDevice; +class PointerWrap; +enum TEXIDevices : int; namespace MMIO { class Mapping; } class CEXIChannel diff --git a/Source/Core/Core/HW/EXI_Device.cpp b/Source/Core/Core/HW/EXI_Device.cpp index bfd5f1ba11..8a301f4710 100644 --- a/Source/Core/Core/HW/EXI_Device.cpp +++ b/Source/Core/Core/HW/EXI_Device.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - +#include "Common/ChunkFile.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HW/EXI_Device.h" @@ -16,7 +16,6 @@ #include "Core/HW/EXI_DeviceMic.h" #include "Core/HW/Memmap.h" - // --- interface IEXIDevice --- void IEXIDevice::ImmWrite(u32 _uData, u32 _uSize) { diff --git a/Source/Core/Core/HW/EXI_Device.h b/Source/Core/Core/HW/EXI_Device.h index e22aac9f90..70fe47732a 100644 --- a/Source/Core/Core/HW/EXI_Device.h +++ b/Source/Core/Core/HW/EXI_Device.h @@ -4,10 +4,11 @@ #pragma once -#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -enum TEXIDevices +class PointerWrap; + +enum TEXIDevices : int { EXIDEVICE_DUMMY, EXIDEVICE_MEMORYCARD, diff --git a/Source/Core/Core/HW/EXI_DeviceAD16.cpp b/Source/Core/Core/HW/EXI_DeviceAD16.cpp index ef26d99a30..60a559681c 100644 --- a/Source/Core/Core/HW/EXI_DeviceAD16.cpp +++ b/Source/Core/Core/HW/EXI_DeviceAD16.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Core/Core.h" - #include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_DeviceAD16.h" diff --git a/Source/Core/Core/HW/EXI_DeviceAD16.h b/Source/Core/Core/HW/EXI_DeviceAD16.h index e1e31c5978..46376b4faa 100644 --- a/Source/Core/Core/HW/EXI_DeviceAD16.h +++ b/Source/Core/Core/HW/EXI_DeviceAD16.h @@ -6,6 +6,8 @@ #include "Core/HW/EXI_Device.h" +class PointerWrap; + class CEXIAD16 : public IEXIDevice { public: diff --git a/Source/Core/Core/HW/EXI_DeviceAGP.cpp b/Source/Core/Core/HW/EXI_DeviceAGP.cpp index d3beb4e94d..03efb3a685 100644 --- a/Source/Core/Core/HW/EXI_DeviceAGP.cpp +++ b/Source/Core/Core/HW/EXI_DeviceAGP.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Common/FileUtil.h" #include "Common/MemoryUtil.h" #include "Common/StdMakeUnique.h" diff --git a/Source/Core/Core/HW/EXI_DeviceAGP.h b/Source/Core/Core/HW/EXI_DeviceAGP.h index 3f4b6913c7..19766771de 100644 --- a/Source/Core/Core/HW/EXI_DeviceAGP.h +++ b/Source/Core/Core/HW/EXI_DeviceAGP.h @@ -6,9 +6,13 @@ #include #include +#include +#include #include "Core/HW/EXI_Device.h" +class PointerWrap; + class CEXIAgp : public IEXIDevice { diff --git a/Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp index c46c3b9079..218181fe24 100644 --- a/Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp +++ b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp @@ -2,8 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" +#include "Common/Logging/Log.h" #include "Core/Core.h" - #include "Core/HW/EXI.h" #include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_DeviceAMBaseboard.h" diff --git a/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h index 5ab2c7fe3b..e5c802d8dc 100644 --- a/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h +++ b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h @@ -6,6 +6,8 @@ #include "Core/HW/EXI_Device.h" +class PointerWrap; + class CEXIAMBaseboard : public IEXIDevice { public: diff --git a/Source/Core/Core/HW/EXI_DeviceEthernet.cpp b/Source/Core/Core/HW/EXI_DeviceEthernet.cpp index 9eff4899e2..9aef67a9df 100644 --- a/Source/Core/Core/HW/EXI_DeviceEthernet.cpp +++ b/Source/Core/Core/HW/EXI_DeviceEthernet.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Common/Network.h" #include "Core/ConfigManager.h" #include "Core/HW/EXI.h" diff --git a/Source/Core/Core/HW/EXI_DeviceEthernet.h b/Source/Core/Core/HW/EXI_DeviceEthernet.h index bd060f1434..5479c2c64c 100644 --- a/Source/Core/Core/HW/EXI_DeviceEthernet.h +++ b/Source/Core/Core/HW/EXI_DeviceEthernet.h @@ -11,6 +11,8 @@ #include "Common/Thread.h" #include "Core/HW/EXI_Device.h" +class PointerWrap; + // Network Control Register A enum NCRA { diff --git a/Source/Core/Core/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/HW/EXI_DeviceGecko.cpp index 00bf044fc1..10727ddd98 100644 --- a/Source/Core/Core/HW/EXI_DeviceGecko.cpp +++ b/Source/Core/Core/HW/EXI_DeviceGecko.cpp @@ -2,7 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" +#include "Common/CommonFuncs.h" #include "Common/StdMakeUnique.h" +#include "Common/StringUtil.h" +#include "Common/Thread.h" #include "Core/Core.h" #include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_DeviceGecko.h" diff --git a/Source/Core/Core/HW/EXI_DeviceGecko.h b/Source/Core/Core/HW/EXI_DeviceGecko.h index e78da26499..f704cf9a2f 100644 --- a/Source/Core/Core/HW/EXI_DeviceGecko.h +++ b/Source/Core/Core/HW/EXI_DeviceGecko.h @@ -5,12 +5,13 @@ #pragma once #include +#include +#include #include - +#include #include -#include "Common/Thread.h" - +#include "Common/CommonTypes.h" #include "Core/HW/EXI_Device.h" class GeckoSockServer diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI_DeviceIPL.cpp index 9a5dac25cb..af0e06e850 100644 --- a/Source/Core/Core/HW/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/HW/EXI_DeviceIPL.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" @@ -14,6 +15,7 @@ #include "Core/Movie.h" #include "Core/NetPlayProto.h" #include "Core/HW/EXI_DeviceIPL.h" +#include "Core/HW/Sram.h" #include "Core/HW/SystemTimers.h" // We should provide an option to choose from the above, or figure out the checksum (the algo in yagcd seems wrong) diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.h b/Source/Core/Core/HW/EXI_DeviceIPL.h index 9e44a7b47c..2dc5a896e2 100644 --- a/Source/Core/Core/HW/EXI_DeviceIPL.h +++ b/Source/Core/Core/HW/EXI_DeviceIPL.h @@ -7,7 +7,8 @@ #include #include "Core/HW/EXI_Device.h" -#include "Core/HW/Sram.h" + +class PointerWrap; class CEXIIPL : public IEXIDevice { diff --git a/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp index a0f622a610..3cc6597220 100644 --- a/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp @@ -2,9 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/NandPaths.h" +#include "Common/StdMakeUnique.h" #include "Common/StringUtil.h" #include "Core/ConfigManager.h" #include "Core/Core.h" diff --git a/Source/Core/Core/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/HW/EXI_DeviceMemoryCard.h index e3d381f10a..a0e4a47e76 100644 --- a/Source/Core/Core/HW/EXI_DeviceMemoryCard.h +++ b/Source/Core/Core/HW/EXI_DeviceMemoryCard.h @@ -3,10 +3,15 @@ // Refer to the license.txt file included. #pragma once -#include "Common/StdMakeUnique.h" + +#include +#include + #include "Core/HW/EXI_Device.h" class MemoryCardBase; +class PointerWrap; + class CEXIMemoryCard : public IEXIDevice { public: diff --git a/Source/Core/Core/HW/GCKeyboard.cpp b/Source/Core/Core/HW/GCKeyboard.cpp index 154b7cd308..183b6b0927 100644 --- a/Source/Core/Core/HW/GCKeyboard.cpp +++ b/Source/Core/Core/HW/GCKeyboard.cpp @@ -3,7 +3,6 @@ // Refer to the license.txt file included. #include "Common/CommonTypes.h" - #include "Core/ConfigManager.h" #include "Core/HW/GCKeyboard.h" #include "Core/HW/GCKeyboardEmu.h" diff --git a/Source/Core/Core/HW/GCKeyboard.h b/Source/Core/Core/HW/GCKeyboard.h index f535567381..e3625f6649 100644 --- a/Source/Core/Core/HW/GCKeyboard.h +++ b/Source/Core/Core/HW/GCKeyboard.h @@ -2,12 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/CommonTypes.h" -#include "InputCommon/InputConfig.h" -#include "InputCommon/KeyboardStatus.h" - #pragma once +#include "Common/CommonTypes.h" + +class InputConfig; +struct KeyboardStatus; + namespace Keyboard { diff --git a/Source/Core/Core/HW/GCKeyboardEmu.cpp b/Source/Core/Core/HW/GCKeyboardEmu.cpp index f2c9934cf4..88760606ae 100644 --- a/Source/Core/Core/HW/GCKeyboardEmu.cpp +++ b/Source/Core/Core/HW/GCKeyboardEmu.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Core/Host.h" #include "Core/HW/GCKeyboardEmu.h" +#include "InputCommon/KeyboardStatus.h" static const u16 keys0_bitmasks[] = { diff --git a/Source/Core/Core/HW/GCKeyboardEmu.h b/Source/Core/Core/HW/GCKeyboardEmu.h index adbc14dd15..4b67015b98 100644 --- a/Source/Core/Core/HW/GCKeyboardEmu.h +++ b/Source/Core/Core/HW/GCKeyboardEmu.h @@ -7,7 +7,8 @@ #include #include "InputCommon/ControllerEmu.h" -#include "InputCommon/KeyboardStatus.h" + +struct KeyboardStatus; class GCKeyboard : public ControllerEmu { diff --git a/Source/Core/Core/HW/GCMemcard.cpp b/Source/Core/Core/HW/GCMemcard.cpp index a9fad205f9..bff42faddb 100644 --- a/Source/Core/Core/HW/GCMemcard.cpp +++ b/Source/Core/Core/HW/GCMemcard.cpp @@ -7,6 +7,7 @@ #include #include "Common/ColorUtil.h" +#include "Common/FileUtil.h" #include "Core/HW/GCMemcard.h" static void ByteSwap(u8 *valueA, u8 *valueB) diff --git a/Source/Core/Core/HW/GCMemcardDirectory.cpp b/Source/Core/Core/HW/GCMemcardDirectory.cpp index 514e38165f..693615b2fb 100644 --- a/Source/Core/Core/HW/GCMemcardDirectory.cpp +++ b/Source/Core/Core/HW/GCMemcardDirectory.cpp @@ -2,8 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. #include +#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/FileSearch.h" +#include "Common/FileUtil.h" #include "Common/StdMakeUnique.h" #include "Common/Thread.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/HW/GCMemcardDirectory.h b/Source/Core/Core/HW/GCMemcardDirectory.h index 1273ffbd4e..b4adb4f019 100644 --- a/Source/Core/Core/HW/GCMemcardDirectory.h +++ b/Source/Core/Core/HW/GCMemcardDirectory.h @@ -4,6 +4,13 @@ #pragma once +#include +#include +#include +#include +#include +#include + #include "Common/Event.h" #include "Core/HW/GCMemcard.h" #include "DiscIO/Volume.h" diff --git a/Source/Core/Core/HW/GCMemcardRaw.cpp b/Source/Core/Core/HW/GCMemcardRaw.cpp index 3c934eea98..c1258210d6 100644 --- a/Source/Core/Core/HW/GCMemcardRaw.cpp +++ b/Source/Core/Core/HW/GCMemcardRaw.cpp @@ -4,7 +4,9 @@ #include #include "Common/ChunkFile.h" +#include "Common/FileUtil.h" #include "Common/StdMakeUnique.h" +#include "Common/Thread.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HW/GCMemcard.h" diff --git a/Source/Core/Core/HW/GCMemcardRaw.h b/Source/Core/Core/HW/GCMemcardRaw.h index 9971277637..07b78e7491 100644 --- a/Source/Core/Core/HW/GCMemcardRaw.h +++ b/Source/Core/Core/HW/GCMemcardRaw.h @@ -5,9 +5,11 @@ #pragma once #include +#include +#include +#include #include "Common/Event.h" #include "Common/Flag.h" -#include "Common/Thread.h" #include "Core/HW/GCMemcard.h" class PointerWrap; diff --git a/Source/Core/Core/HW/GCPad.h b/Source/Core/Core/HW/GCPad.h index 5d70f9274c..6fa8670409 100644 --- a/Source/Core/Core/HW/GCPad.h +++ b/Source/Core/Core/HW/GCPad.h @@ -2,12 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/CommonTypes.h" -#include "InputCommon/GCPadStatus.h" -#include "InputCommon/InputConfig.h" - #pragma once +#include "Common/CommonTypes.h" +#include "InputCommon/ControllerInterface/Device.h" + +class InputConfig; +struct GCPadStatus; + namespace Pad { diff --git a/Source/Core/Core/HW/GPFifo.cpp b/Source/Core/Core/HW/GPFifo.cpp index 239a86dd1a..f0732dbfe4 100644 --- a/Source/Core/Core/HW/GPFifo.cpp +++ b/Source/Core/Core/HW/GPFifo.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Common/ChunkFile.h" +#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Core/HW/GPFifo.h" diff --git a/Source/Core/Core/HW/GPFifo.h b/Source/Core/Core/HW/GPFifo.h index 55dc81dffd..3937bf5c18 100644 --- a/Source/Core/Core/HW/GPFifo.h +++ b/Source/Core/Core/HW/GPFifo.h @@ -4,7 +4,8 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" + class PointerWrap; namespace GPFifo diff --git a/Source/Core/Core/HW/MMIO.h b/Source/Core/Core/HW/MMIO.h index 0322737c28..85dc6d145e 100644 --- a/Source/Core/Core/HW/MMIO.h +++ b/Source/Core/Core/HW/MMIO.h @@ -8,7 +8,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/HW/MMIOHandlers.h" diff --git a/Source/Core/Core/HW/MMIOHandlers.h b/Source/Core/Core/HW/MMIOHandlers.h index 4e9a2f4242..3a9e53e98c 100644 --- a/Source/Core/Core/HW/MMIOHandlers.h +++ b/Source/Core/Core/HW/MMIOHandlers.h @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" // All the templated and very repetitive MMIO-related code is isolated in this // file for easier reading. It mostly contains code related to handling methods diff --git a/Source/Core/Core/HW/SI.h b/Source/Core/Core/HW/SI.h index 2e06b269a1..fda3cb4586 100644 --- a/Source/Core/Core/HW/SI.h +++ b/Source/Core/Core/HW/SI.h @@ -5,10 +5,10 @@ #pragma once #include "Common/CommonTypes.h" -#include "Core/HW/SI_Device.h" class PointerWrap; class ISIDevice; +enum SIDevices : int; namespace MMIO { class Mapping; } // SI number of channels diff --git a/Source/Core/Core/HW/SI_Device.h b/Source/Core/Core/HW/SI_Device.h index 196b1b6ba8..1e3c071994 100644 --- a/Source/Core/Core/HW/SI_Device.h +++ b/Source/Core/Core/HW/SI_Device.h @@ -38,7 +38,7 @@ enum TSIDevices }; // For configuration use, since some devices can have the same SI Device ID -enum SIDevices +enum SIDevices : int { SIDEVICE_NONE, SIDEVICE_N64_MIC, diff --git a/Source/Core/Core/HW/SI_DeviceDanceMat.cpp b/Source/Core/Core/HW/SI_DeviceDanceMat.cpp index aee323a914..6166b17ba5 100644 --- a/Source/Core/Core/HW/SI_DeviceDanceMat.cpp +++ b/Source/Core/Core/HW/SI_DeviceDanceMat.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Core/HW/SI_DeviceDanceMat.h" +#include "InputCommon/GCPadStatus.h" CSIDevice_DanceMat::CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber) : CSIDevice_GCController(device, _iDeviceNumber) {} diff --git a/Source/Core/Core/HW/SI_DeviceDanceMat.h b/Source/Core/Core/HW/SI_DeviceDanceMat.h index 9599c9eda2..eea2437acf 100644 --- a/Source/Core/Core/HW/SI_DeviceDanceMat.h +++ b/Source/Core/Core/HW/SI_DeviceDanceMat.h @@ -6,6 +6,8 @@ #include "Core/HW/SI_DeviceGCController.h" +struct GCPadStatus; + class CSIDevice_DanceMat : public CSIDevice_GCController { public: diff --git a/Source/Core/Core/HW/SI_DeviceGCController.cpp b/Source/Core/Core/HW/SI_DeviceGCController.cpp index 76dd046747..de9369c80e 100644 --- a/Source/Core/Core/HW/SI_DeviceGCController.cpp +++ b/Source/Core/Core/HW/SI_DeviceGCController.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/Movie.h" @@ -16,6 +17,7 @@ #include "Core/HW/SI_GCAdapter.h" #endif #include "Core/HW/SystemTimers.h" +#include "InputCommon/GCPadStatus.h" // --- standard GameCube controller --- CSIDevice_GCController::CSIDevice_GCController(SIDevices device, int _iDeviceNumber) diff --git a/Source/Core/Core/HW/SI_DeviceKeyboard.cpp b/Source/Core/Core/HW/SI_DeviceKeyboard.cpp index a6abb31508..bb3e936f5b 100644 --- a/Source/Core/Core/HW/SI_DeviceKeyboard.cpp +++ b/Source/Core/Core/HW/SI_DeviceKeyboard.cpp @@ -2,8 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Core/HW/GCKeyboard.h" #include "Core/HW/SI_DeviceKeyboard.h" +#include "InputCommon/KeyboardStatus.h" // --- GameCube keyboard --- CSIDevice_Keyboard::CSIDevice_Keyboard(SIDevices device, int _iDeviceNumber) diff --git a/Source/Core/Core/HW/SI_DeviceKeyboard.h b/Source/Core/Core/HW/SI_DeviceKeyboard.h index 8155b80ec0..66fe258d6a 100644 --- a/Source/Core/Core/HW/SI_DeviceKeyboard.h +++ b/Source/Core/Core/HW/SI_DeviceKeyboard.h @@ -4,7 +4,10 @@ #pragma once -#include "InputCommon/KeyboardStatus.h" +#include "Core/HW/SI_Device.h" + +class PointerWrap; +struct KeyboardStatus; class CSIDevice_Keyboard : public ISIDevice { diff --git a/Source/Core/Core/HW/SI_GCAdapter.cpp b/Source/Core/Core/HW/SI_GCAdapter.cpp index 9ec2f2ecf5..d2bab270b9 100644 --- a/Source/Core/Core/HW/SI_GCAdapter.cpp +++ b/Source/Core/Core/HW/SI_GCAdapter.cpp @@ -4,11 +4,15 @@ #include +#include "Common/Flag.h" +#include "Common/Thread.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/CoreTiming.h" +#include "Core/HW/SI.h" #include "Core/HW/SI_GCAdapter.h" #include "Core/HW/SystemTimers.h" +#include "InputCommon/GCPadStatus.h" namespace SI_GCAdapter { diff --git a/Source/Core/Core/HW/SI_GCAdapter.h b/Source/Core/Core/HW/SI_GCAdapter.h index 8c81e043c1..6efc599633 100644 --- a/Source/Core/Core/HW/SI_GCAdapter.h +++ b/Source/Core/Core/HW/SI_GCAdapter.h @@ -6,9 +6,7 @@ #include -#include "Common/Thread.h" -#include "Core/HW/SI.h" -#include "InputCommon/GCPadStatus.h" +struct GCPadStatus; namespace SI_GCAdapter { diff --git a/Source/Core/Core/HW/Sram.cpp b/Source/Core/Core/HW/Sram.cpp index 4bc3fde7e4..d95c463f01 100644 --- a/Source/Core/Core/HW/Sram.cpp +++ b/Source/Core/Core/HW/Sram.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/FileUtil.h" #include "Core/ConfigManager.h" #include "Core/HW/Sram.h" diff --git a/Source/Core/Core/HW/Wiimote.h b/Source/Core/Core/HW/Wiimote.h index 81f2e83c5c..f64e6c89a5 100644 --- a/Source/Core/Core/HW/Wiimote.h +++ b/Source/Core/Core/HW/Wiimote.h @@ -5,7 +5,8 @@ #pragma once #include "Common/ChunkFile.h" -#include "InputCommon/InputConfig.h" + +class InputConfig; enum { diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp index cd74da649f..9ad7761b53 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Common/CommonTypes.h" +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/Attachment/Attachment.h" namespace WiimoteEmu diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h index d7310b2f7c..c677046b7e 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h @@ -4,12 +4,13 @@ #pragma once -#include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "InputCommon/ControllerEmu.h" namespace WiimoteEmu { +struct ExtensionReg; + class Attachment : public ControllerEmu { public: diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp index bc26216e4e..cd60b5ba49 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/Attachment/Classic.h" namespace WiimoteEmu diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h index 8076d2b15b..05128da221 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h @@ -9,6 +9,8 @@ namespace WiimoteEmu { +struct ExtensionReg; + class Classic : public Attachment { public: diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp index b1551480da..2e0baa28a7 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/Attachment/Drums.h" namespace WiimoteEmu diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h index e1de04c2e9..956c1e4b4b 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h @@ -9,6 +9,8 @@ namespace WiimoteEmu { +struct ExtensionReg; + class Drums : public Attachment { public: diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp index fde46ac811..76791d9568 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/Attachment/Guitar.h" namespace WiimoteEmu diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h index bf25fe9d1d..9e6d161c29 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h @@ -9,6 +9,8 @@ namespace WiimoteEmu { +struct ExtensionReg; + class Guitar : public Attachment { public: diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp index ef5d3fb04f..3d0b32e5a1 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h" namespace WiimoteEmu diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h index 4c58c2454c..421fa7f910 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h @@ -9,6 +9,8 @@ namespace WiimoteEmu { +struct ExtensionReg; + class Nunchuk : public Attachment { public: diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp index 2a6b8ce87c..c20a1188ee 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/Attachment/Turntable.h" namespace WiimoteEmu diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h index a3259a3883..7be98bce02 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h @@ -9,6 +9,8 @@ namespace WiimoteEmu { +struct ExtensionReg; + class Turntable : public Attachment { public: diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp index e12cd6d8bf..1249e52c3a 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp @@ -4,14 +4,13 @@ #include +#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/Timer.h" - #include "Core/ConfigManager.h" #include "Core/Host.h" #include "Core/Movie.h" #include "Core/NetPlayClient.h" - #include "Core/HW/WiimoteEmu/MatrixMath.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/WiimoteHid.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h index 685602732e..5c6203ecb6 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h @@ -5,9 +5,9 @@ #pragma once #include +#include #include -#include "Common/ChunkFile.h" #include "Core/Core.h" #include "Core/HW/WiimoteEmu/Encryption.h" #include "Core/HW/WiimoteEmu/WiimoteHid.h" @@ -20,6 +20,8 @@ #define WIIMOTE_REG_EXT_SIZE 0x100 #define WIIMOTE_REG_IR_SIZE 0x34 +class PointerWrap; + namespace WiimoteReal { class Wiimote; diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp index 319a6bddb7..f6b43bd084 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -6,11 +6,12 @@ #include #include +#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/IniFile.h" #include "Common/StringUtil.h" +#include "Common/Thread.h" #include "Common/Timer.h" - #include "Core/ConfigManager.h" #include "Core/Host.h" #include "Core/HW/WiimoteEmu/WiimoteHid.h" diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h index 42c4743591..d4e30a3e4c 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h @@ -4,19 +4,20 @@ #pragma once +#include +#include +#include #include -#include "Common/ChunkFile.h" #include "Common/FifoQueue.h" -#include "Common/Thread.h" #include "Common/Timer.h" - #include "Core/HW/Wiimote.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteReal/WiimoteRealBase.h" - #include "InputCommon/InputConfig.h" +class PointerWrap; + typedef std::vector Report; namespace WiimoteReal diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp index 5a8f1f0c9f..c1f1e0f2f2 100644 --- a/Source/Core/Core/HotkeyManager.cpp +++ b/Source/Core/Core/HotkeyManager.cpp @@ -2,8 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include +#include + #include "Core/ConfigManager.h" -#include "Core/CoreParameter.h" #include "Core/HotkeyManager.h" const std::string hotkey_labels[] = diff --git a/Source/Core/Core/HotkeyManager.h b/Source/Core/Core/HotkeyManager.h index 4054a4fac5..8e30276716 100644 --- a/Source/Core/Core/HotkeyManager.h +++ b/Source/Core/Core/HotkeyManager.h @@ -4,7 +4,7 @@ #pragma once -#include "Core/CoreParameter.h" +#include #include "InputCommon/InputConfig.h" struct HotkeyStatus diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h index 73eb5605c6..6c2570a36e 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h @@ -6,10 +6,10 @@ #include #include +#include #include "Common/ChunkFile.h" #include "Common/StringUtil.h" - #include "Core/HW/Memmap.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index 4ce39ee2ce..fe6c813e06 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -5,15 +5,14 @@ #include #include +#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/Logging/LogManager.h" - #include "Core/ConfigManager.h" #include "Core/CoreTiming.h" #include "Core/HW/DVDInterface.h" #include "Core/HW/Memmap.h" #include "Core/HW/SystemTimers.h" - #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h index 4ca874ed1d..df73fce078 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h @@ -5,9 +5,11 @@ #pragma once #include -#include "Core/HW/DVDInterface.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" +class PointerWrap; +namespace DVDInterface { enum DIInterruptType : int; } + class CWII_IPC_HLE_Device_di : public IWII_IPC_HLE_Device { public: diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h index a60fcb2351..1085654822 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h @@ -4,9 +4,12 @@ #pragma once -#include "Common/FileUtil.h" +#include #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" +class PointerWrap; +namespace File { class IOFile; } + std::string HLE_IPC_BuildFilename(std::string _pFilename); void HLE_IPC_CreateVirtualFATFilesystem(); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp index e827a2a308..0c6734c13a 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -36,15 +36,14 @@ // need to include this before polarssl/aes.h, // otherwise we may not get __STDC_FORMAT_MACROS #include - #include +#include "Common/ChunkFile.h" #include "Common/CommonPaths.h" #include "Common/FileUtil.h" #include "Common/NandPaths.h" #include "Common/StdMakeUnique.h" #include "Common/StringUtil.h" - #include "Core/ConfigManager.h" #include "Core/ec_wii.h" #include "Core/Movie.h" @@ -52,7 +51,9 @@ #include "Core/HW/DVDInterface.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" #include "Core/PowerPC/PowerPC.h" +#include "DiscIO/NANDContentLoader.h" #ifdef _WIN32 #include diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h index fb3f3d18a5..9f4bd7bca3 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h @@ -6,9 +6,17 @@ #include #include +#include +#include #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" -#include "DiscIO/NANDContentLoader.h" + +class PointerWrap; +namespace DiscIO +{ + class INANDContentLoader; + struct SNANDContent; +} class CWII_IPC_HLE_Device_es : public IWII_IPC_HLE_Device { diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h index fafc972e27..7251da7a1d 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h @@ -6,6 +6,8 @@ #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" +class PointerWrap; + struct NANDStat { u32 BlockSize; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp index a310b1e394..5f6fa3ea58 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp @@ -2,9 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include +#include #include +#include "Common/Thread.h" #include "Core/Core.h" #include "Core/Debugger/Debugger_SymbolMap.h" #include "Core/HW/WII_IPC.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h index 48c25a07c2..74e4aaf9a0 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h @@ -5,8 +5,10 @@ #pragma once #include +#include +#include +#include -#include "Common/Thread.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h index acce2a47a4..28cfc077fd 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h @@ -4,6 +4,7 @@ #pragma once +#include #include #include #include diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp index a75c6c1a51..6ff9ed61ba 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp @@ -2,7 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" +#include "Common/FileUtil.h" #include "Common/SDCardUtil.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h index 0101edd755..5e777433be 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h @@ -6,8 +6,12 @@ #pragma once +#include #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" +class PointerWrap; +namespace File { class IOFile; } + class CWII_IPC_HLE_Device_sdio_slot0 : public IWII_IPC_HLE_Device { public: diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h index 66a980bc3f..2a564554e7 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h @@ -4,6 +4,7 @@ #pragma once +#include #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" enum diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index 3a3abd01dd..fb459dd328 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -13,7 +13,7 @@ #include "Core/HW/Wiimote.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" - +#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" void CWII_IPC_HLE_Device_usb_oh1_57e_305::EnqueueReply(u32 CommandAddress) diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h index 7bbc03d088..d7a0731d3b 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h @@ -5,6 +5,7 @@ #pragma once #include +#include #include #include @@ -12,7 +13,8 @@ #include "Core/IPC_HLE/hci.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" -#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" + +class CWII_IPC_HLE_WiiMote; struct SQueuedEvent { diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h index 21ed6becf3..42c1b5745d 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h @@ -4,6 +4,9 @@ #pragma once +#include +#include + #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" class CWII_IPC_HLE_Device_usb_kbd : public IWII_IPC_HLE_Device 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 e03951bbbd..be389301d7 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h @@ -7,7 +7,8 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonFuncs.h" +#include "Common/CommonTypes.h" #include "Core/IPC_HLE/hci.h" class CWII_IPC_HLE_Device_usb_oh1_57e_305; diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.cpp b/Source/Core/Core/IPC_HLE/WII_Socket.cpp index da7e0a27b9..a4e31aa81b 100644 --- a/Source/Core/Core/IPC_HLE/WII_Socket.cpp +++ b/Source/Core/Core/IPC_HLE/WII_Socket.cpp @@ -4,6 +4,7 @@ #include +#include "Common/FileUtil.h" #include "Core/Core.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.h b/Source/Core/Core/IPC_HLE/WII_Socket.h index 4956c4dd24..5937f1135e 100644 --- a/Source/Core/Core/IPC_HLE/WII_Socket.h +++ b/Source/Core/Core/IPC_HLE/WII_Socket.h @@ -47,7 +47,6 @@ typedef struct pollfd pollfd_t; #include #include -#include "Common/FileUtil.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h" diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index 18264cac55..afcc7a243f 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -29,6 +29,7 @@ #include "Core/HW/WiimoteEmu/Attachment/Classic.h" #include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" #include "Core/PowerPC/PowerPC.h" #include "InputCommon/GCPadStatus.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 1802a67e59..b324092d46 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ENetUtil.h" +#include "Common/Timer.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/Movie.h" diff --git a/Source/Core/Core/NetPlayClient.h b/Source/Core/Core/NetPlayClient.h index e47dcb7e94..ff25c15524 100644 --- a/Source/Core/Core/NetPlayClient.h +++ b/Source/Core/Core/NetPlayClient.h @@ -9,10 +9,8 @@ #include #include #include "Common/CommonTypes.h" -#include "Common/ENetUtil.h" #include "Common/FifoQueue.h" #include "Common/Thread.h" -#include "Common/Timer.h" #include "Common/TraversalClient.h" #include "Core/NetPlayProto.h" #include "InputCommon/GCPadStatus.h" diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h index 84904082e3..94f4a28a17 100644 --- a/Source/Core/Core/NetPlayProto.h +++ b/Source/Core/Core/NetPlayProto.h @@ -4,9 +4,8 @@ #pragma once +#include #include "Common/CommonTypes.h" -#include "Common/CommonTypes.h" - #include "Core/HW/EXI_Device.h" struct NetSettings diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index 977d87e1fc..c2f0a3f751 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -4,6 +4,7 @@ #include #include +#include "Common/ENetUtil.h" #include "Common/IniFile.h" #include "Common/StdMakeUnique.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/NetPlayServer.h b/Source/Core/Core/NetPlayServer.h index e1a22c8de9..feee883121 100644 --- a/Source/Core/Core/NetPlayServer.h +++ b/Source/Core/Core/NetPlayServer.h @@ -9,7 +9,6 @@ #include #include #include -#include "Common/ENetUtil.h" #include "Common/Thread.h" #include "Common/Timer.h" #include "Common/TraversalClient.h" diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp index 2dfd652a70..27a8650ca2 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp @@ -9,6 +9,7 @@ #include #include "Common/Common.h" +#include "Common/FileUtil.h" #include "Common/Intrinsics.h" #include "Common/StdMakeUnique.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/PowerPC/JitILCommon/IR.cpp b/Source/Core/Core/PowerPC/JitILCommon/IR.cpp index 811c8854b6..96e1be6354 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/IR.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/IR.cpp @@ -126,6 +126,7 @@ TODO (in no particular order): #include #include +#include "Common/FileUtil.h" #include "Common/StdMakeUnique.h" #include "Common/StringUtil.h" #include "Core/Core.h" diff --git a/Source/Core/Core/ec_wii.h b/Source/Core/Core/ec_wii.h index 51226e02da..1b93bdd941 100644 --- a/Source/Core/Core/ec_wii.h +++ b/Source/Core/Core/ec_wii.h @@ -24,7 +24,8 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonFuncs.h" +#include "Common/CommonTypes.h" void get_ng_cert(u8* ng_cert_out, u32 NG_id, u32 NG_key_id, const u8* NG_priv, const u8* NG_sig); void get_ap_sig_and_cert(u8 *sig_out, u8 *ap_cert_out, u64 title_id, u8 *data, u32 data_size, const u8 *NG_priv, u32 NG_id); diff --git a/Source/Core/DolphinQt/GameList/GameFile.cpp b/Source/Core/DolphinQt/GameList/GameFile.cpp index e97117d033..9960e0d9c9 100644 --- a/Source/Core/DolphinQt/GameList/GameFile.cpp +++ b/Source/Core/DolphinQt/GameList/GameFile.cpp @@ -28,9 +28,9 @@ static const u32 CACHE_REVISION = 0x007; static const u32 DATASTREAM_REVISION = 15; // Introduced in Qt 5.2 -static QMap ConvertLocalizedStrings(std::map strings) +static QMap ConvertLocalizedStrings(std::map strings) { - QMap result; + QMap result; for (auto entry : strings) result.insert(entry.first, QString::fromStdString(entry.second).trimmed()); @@ -50,16 +50,16 @@ static QMap CastLocalizedStrings(QMap strings) return result; } -static QString GetLanguageString(IVolume::ELanguage language, QMap strings) +static QString GetLanguageString(DiscIO::IVolume::ELanguage language, QMap strings) { if (strings.contains(language)) return strings.value(language); // English tends to be a good fallback when the requested language isn't available - if (language != IVolume::ELanguage::LANGUAGE_ENGLISH) + if (language != DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH) { - if (strings.contains(IVolume::ELanguage::LANGUAGE_ENGLISH)) - return strings.value(IVolume::ELanguage::LANGUAGE_ENGLISH); + if (strings.contains(DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH)) + return strings.value(DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH); } // If English isn't available either, just pick something @@ -180,8 +180,8 @@ bool GameFile::LoadFromCache() >> m_is_disc_two >> m_revision; m_country = (DiscIO::IVolume::ECountry)country; - m_names = CastLocalizedStrings(names); - m_descriptions = CastLocalizedStrings(descriptions); + m_names = CastLocalizedStrings(names); + m_descriptions = CastLocalizedStrings(descriptions); file.close(); return true; } @@ -245,7 +245,7 @@ QString GameFile::GetCompany() const return m_company; } -QString GameFile::GetDescription(IVolume::ELanguage language) const +QString GameFile::GetDescription(DiscIO::IVolume::ELanguage language) const { return GetLanguageString(language, m_descriptions); } @@ -255,7 +255,7 @@ QString GameFile::GetDescription() const return GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(m_platform != GAMECUBE_DISC)); } -QString GameFile::GetName(IVolume::ELanguage language) const +QString GameFile::GetName(DiscIO::IVolume::ELanguage language) const { return GetLanguageString(language, m_names); } diff --git a/Source/Core/DolphinQt/GameList/GameTracker.cpp b/Source/Core/DolphinQt/GameList/GameTracker.cpp index 4320350e40..d3023ee8cc 100644 --- a/Source/Core/DolphinQt/GameList/GameTracker.cpp +++ b/Source/Core/DolphinQt/GameList/GameTracker.cpp @@ -4,6 +4,7 @@ #include "Common/CDUtils.h" #include "Common/FileSearch.h" +#include "Common/FileUtil.h" #include "Core/ConfigManager.h" #include "DolphinQt/GameList/GameGrid.h" diff --git a/Source/Core/DolphinWX/Cheats/CheatsWindow.cpp b/Source/Core/DolphinWX/Cheats/CheatsWindow.cpp index e89743f49f..d5b5fa9d57 100644 --- a/Source/Core/DolphinWX/Cheats/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/Cheats/CheatsWindow.cpp @@ -22,6 +22,7 @@ #include #include "Common/CommonTypes.h" +#include "Common/FileUtil.h" #include "Common/IniFile.h" #include "Common/StringUtil.h" #include "Core/ActionReplay.h" diff --git a/Source/Core/DolphinWX/Config/PathConfigPane.cpp b/Source/Core/DolphinWX/Config/PathConfigPane.cpp index 92ff816912..99ec81fd0f 100644 --- a/Source/Core/DolphinWX/Config/PathConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/PathConfigPane.cpp @@ -13,6 +13,7 @@ #include #include +#include "Common/FileUtil.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "DiscIO/NANDContentLoader.h" diff --git a/Source/Core/DolphinWX/Config/WiiConfigPane.cpp b/Source/Core/DolphinWX/Config/WiiConfigPane.cpp index b2e08b5bee..5aef022e6b 100644 --- a/Source/Core/DolphinWX/Config/WiiConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/WiiConfigPane.cpp @@ -126,7 +126,7 @@ void WiiConfigPane::OnConnectKeyboardCheckBoxChanged(wxCommandEvent& event) void WiiConfigPane::OnSystemLanguageChoiceChanged(wxCommandEvent& event) { - IVolume::ELanguage wii_system_lang = (IVolume::ELanguage)m_system_language_choice->GetSelection(); + DiscIO::IVolume::ELanguage wii_system_lang = (DiscIO::IVolume::ELanguage)m_system_language_choice->GetSelection(); SConfig::GetInstance().m_SYSCONF->SetData("IPL.LNG", wii_system_lang); u8 country_code = GetSADRCountryCode(wii_system_lang); @@ -141,28 +141,28 @@ void WiiConfigPane::OnAspectRatioChoiceChanged(wxCommandEvent& event) // Change from IPL.LNG value to IPL.SADR country code. // http://wiibrew.org/wiki/Country_Codes -u8 WiiConfigPane::GetSADRCountryCode(IVolume::ELanguage language) +u8 WiiConfigPane::GetSADRCountryCode(DiscIO::IVolume::ELanguage language) { switch (language) { - case IVolume::LANGUAGE_JAPANESE: + case DiscIO::IVolume::LANGUAGE_JAPANESE: return 1; // Japan - case IVolume::LANGUAGE_ENGLISH: + case DiscIO::IVolume::LANGUAGE_ENGLISH: return 49; // USA - case IVolume::LANGUAGE_GERMAN: + case DiscIO::IVolume::LANGUAGE_GERMAN: return 78; // Germany - case IVolume::LANGUAGE_FRENCH: + case DiscIO::IVolume::LANGUAGE_FRENCH: return 77; // France - case IVolume::LANGUAGE_SPANISH: + case DiscIO::IVolume::LANGUAGE_SPANISH: return 105; // Spain - case IVolume::LANGUAGE_ITALIAN: + case DiscIO::IVolume::LANGUAGE_ITALIAN: return 83; // Italy - case IVolume::LANGUAGE_DUTCH: + case DiscIO::IVolume::LANGUAGE_DUTCH: return 94; // Netherlands - case IVolume::LANGUAGE_SIMPLIFIED_CHINESE: - case IVolume::LANGUAGE_TRADITIONAL_CHINESE: + case DiscIO::IVolume::LANGUAGE_SIMPLIFIED_CHINESE: + case DiscIO::IVolume::LANGUAGE_TRADITIONAL_CHINESE: return 157; // China - case IVolume::LANGUAGE_KOREAN: + case DiscIO::IVolume::LANGUAGE_KOREAN: return 136; // Korea } diff --git a/Source/Core/DolphinWX/Config/WiiConfigPane.h b/Source/Core/DolphinWX/Config/WiiConfigPane.h index 949e3741fc..28c3265d1e 100644 --- a/Source/Core/DolphinWX/Config/WiiConfigPane.h +++ b/Source/Core/DolphinWX/Config/WiiConfigPane.h @@ -29,7 +29,7 @@ private: void OnSystemLanguageChoiceChanged(wxCommandEvent&); void OnAspectRatioChoiceChanged(wxCommandEvent&); - static u8 GetSADRCountryCode(IVolume::ELanguage language); + static u8 GetSADRCountryCode(DiscIO::IVolume::ELanguage language); wxArrayString m_system_language_strings; wxArrayString m_aspect_ratio_strings; diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 979d2c9c74..cebf091b2f 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -85,8 +85,8 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is sortData = -sortData; } - IVolume::ELanguage languageOne = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(iso1->GetPlatform() != GameListItem::GAMECUBE_DISC); - IVolume::ELanguage languageOther = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(iso2->GetPlatform() != GameListItem::GAMECUBE_DISC); + DiscIO::IVolume::ELanguage languageOne = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(iso1->GetPlatform() != GameListItem::GAMECUBE_DISC); + DiscIO::IVolume::ELanguage languageOther = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(iso2->GetPlatform() != GameListItem::GAMECUBE_DISC); switch (sortData) { diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index ab947e6de1..24d6c202fe 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -40,7 +40,7 @@ static const u32 CACHE_REVISION = 0x123; #define DVD_BANNER_WIDTH 96 #define DVD_BANNER_HEIGHT 32 -static std::string GetLanguageString(IVolume::ELanguage language, std::map strings) +static std::string GetLanguageString(DiscIO::IVolume::ELanguage language, std::map strings) { auto end = strings.end(); auto it = strings.find(language); @@ -48,9 +48,9 @@ static std::string GetLanguageString(IVolume::ELanguage language, std::mapsecond; // English tends to be a good fallback when the requested language isn't available - if (language != IVolume::ELanguage::LANGUAGE_ENGLISH) + if (language != DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH) { - it = strings.find(IVolume::ELanguage::LANGUAGE_ENGLISH); + it = strings.find(DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH); if (it != end) return it->second; } @@ -207,7 +207,7 @@ std::string GameListItem::GetCompany() const return m_company; } -std::string GameListItem::GetDescription(IVolume::ELanguage language) const +std::string GameListItem::GetDescription(DiscIO::IVolume::ELanguage language) const { return GetLanguageString(language, m_descriptions); } @@ -217,7 +217,7 @@ std::string GameListItem::GetDescription() const return GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(m_Platform != GAMECUBE_DISC)); } -std::string GameListItem::GetName(IVolume::ELanguage language) const +std::string GameListItem::GetName(DiscIO::IVolume::ELanguage language) const { return GetLanguageString(language, m_names); } @@ -233,10 +233,10 @@ std::string GameListItem::GetName() const return name; } -std::vector GameListItem::GetLanguages() const +std::vector GameListItem::GetLanguages() const { - std::vector languages; - for (std::pair name : m_names) + std::vector languages; + for (std::pair name : m_names) languages.push_back(name.first); return languages; } diff --git a/Source/Core/DolphinWX/ISOFile.h b/Source/Core/DolphinWX/ISOFile.h index 2f65d7eec4..cbe68d489d 100644 --- a/Source/Core/DolphinWX/ISOFile.h +++ b/Source/Core/DolphinWX/ISOFile.h @@ -25,11 +25,11 @@ public: bool IsValid() const {return m_Valid;} const std::string& GetFileName() const {return m_FileName;} - std::string GetName(IVolume::ELanguage language) const; + std::string GetName(DiscIO::IVolume::ELanguage language) const; std::string GetName() const; - std::string GetDescription(IVolume::ELanguage language) const; + std::string GetDescription(DiscIO::IVolume::ELanguage language) const; std::string GetDescription() const; - std::vector GetLanguages() const; + std::vector GetLanguages() const; std::string GetCompany() const; int GetRevision() const { return m_Revision; } const std::string& GetUniqueID() const {return m_UniqueID;} @@ -59,8 +59,8 @@ public: private: std::string m_FileName; - std::map m_names; - std::map m_descriptions; + std::map m_names; + std::map m_descriptions; std::string m_company; std::string m_UniqueID; diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index 7985b598cd..c80aef751f 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -494,9 +494,9 @@ void CISOProperties::CreateGUIControls() wxStaticText* const m_LangText = new wxStaticText(m_Information, wxID_ANY, _("Show Language:")); - IVolume::ELanguage preferred_language = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(OpenISO->IsWadFile() || OpenISO->IsWiiDisc()); + DiscIO::IVolume::ELanguage preferred_language = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(OpenISO->IsWadFile() || OpenISO->IsWiiDisc()); - std::vector languages = OpenGameListItem->GetLanguages(); + std::vector languages = OpenGameListItem->GetLanguages(); int preferred_language_index = 0; for (size_t i = 0; i < languages.size(); ++i) { @@ -505,37 +505,37 @@ void CISOProperties::CreateGUIControls() switch (languages[i]) { - case IVolume::LANGUAGE_JAPANESE: + case DiscIO::IVolume::LANGUAGE_JAPANESE: arrayStringFor_Lang.Add(_("Japanese")); break; - case IVolume::LANGUAGE_ENGLISH: + case DiscIO::IVolume::LANGUAGE_ENGLISH: arrayStringFor_Lang.Add(_("English")); break; - case IVolume::LANGUAGE_GERMAN: + case DiscIO::IVolume::LANGUAGE_GERMAN: arrayStringFor_Lang.Add(_("German")); break; - case IVolume::LANGUAGE_FRENCH: + case DiscIO::IVolume::LANGUAGE_FRENCH: arrayStringFor_Lang.Add(_("French")); break; - case IVolume::LANGUAGE_SPANISH: + case DiscIO::IVolume::LANGUAGE_SPANISH: arrayStringFor_Lang.Add(_("Spanish")); break; - case IVolume::LANGUAGE_ITALIAN: + case DiscIO::IVolume::LANGUAGE_ITALIAN: arrayStringFor_Lang.Add(_("Italian")); break; - case IVolume::LANGUAGE_DUTCH: + case DiscIO::IVolume::LANGUAGE_DUTCH: arrayStringFor_Lang.Add(_("Dutch")); break; - case IVolume::LANGUAGE_SIMPLIFIED_CHINESE: + case DiscIO::IVolume::LANGUAGE_SIMPLIFIED_CHINESE: arrayStringFor_Lang.Add(_("Simplified Chinese")); break; - case IVolume::LANGUAGE_TRADITIONAL_CHINESE: + case DiscIO::IVolume::LANGUAGE_TRADITIONAL_CHINESE: arrayStringFor_Lang.Add(_("Traditional Chinese")); break; - case IVolume::LANGUAGE_KOREAN: + case DiscIO::IVolume::LANGUAGE_KOREAN: arrayStringFor_Lang.Add(_("Korean")); break; - case IVolume::LANGUAGE_UNKNOWN: + case DiscIO::IVolume::LANGUAGE_UNKNOWN: default: arrayStringFor_Lang.Add(_("Unknown")); break; @@ -1486,7 +1486,7 @@ void CISOProperties::OnChangeBannerLang(wxCommandEvent& event) ChangeBannerDetails(OpenGameListItem->GetLanguages()[event.GetSelection()]); } -void CISOProperties::ChangeBannerDetails(IVolume::ELanguage language) +void CISOProperties::ChangeBannerDetails(DiscIO::IVolume::ELanguage language) { wxString const shortName = StrToWxStr(OpenGameListItem->GetName(language)); wxString const comment = StrToWxStr(OpenGameListItem->GetDescription(language)); diff --git a/Source/Core/DolphinWX/ISOProperties.h b/Source/Core/DolphinWX/ISOProperties.h index bb362b3fd2..b74d0ffd0b 100644 --- a/Source/Core/DolphinWX/ISOProperties.h +++ b/Source/Core/DolphinWX/ISOProperties.h @@ -235,7 +235,7 @@ private: void PatchList_Load(); void PatchList_Save(); void ActionReplayList_Save(); - void ChangeBannerDetails(IVolume::ELanguage language); + void ChangeBannerDetails(DiscIO::IVolume::ELanguage language); long GetElementStyle(const char* section, const char* key); void SetCheckboxValueFromGameini(const char* section, const char* key, wxCheckBox* checkbox); diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index a38f312f49..097ad732af 100644 --- a/Source/Core/DolphinWX/MainAndroid.cpp +++ b/Source/Core/DolphinWX/MainAndroid.cpp @@ -202,8 +202,8 @@ static std::string GetTitle(std::string filename) auto end = titles.end(); // English tends to be a good fallback when the requested language isn't available - //if (language != IVolume::ELanguage::LANGUAGE_ENGLISH) { - auto it = titles.find(IVolume::ELanguage::LANGUAGE_ENGLISH); + //if (language != DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH) { + auto it = titles.find(DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH); if (it != end) return it->second; //} @@ -245,8 +245,8 @@ static std::string GetDescription(std::string filename) auto end = descriptions.end(); // English tends to be a good fallback when the requested language isn't available - //if (language != IVolume::ELanguage::LANGUAGE_ENGLISH) { - auto it = descriptions.find(IVolume::ELanguage::LANGUAGE_ENGLISH); + //if (language != DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH) { + auto it = descriptions.find(DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH); if (it != end) return it->second; //} diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp index 75d839fe1b..deb721e0f3 100644 --- a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp @@ -69,7 +69,7 @@ static wxString FailureReasonStringForHostLabel(int reason) static std::string BuildGameName(const GameListItem& game) { // Lang needs to be consistent - IVolume::ELanguage const lang = IVolume::LANGUAGE_ENGLISH; + DiscIO::IVolume::ELanguage const lang = DiscIO::IVolume::LANGUAGE_ENGLISH; std::string name(game.GetName(lang));