From c698c07755fb95990f7b74ac525a65b2c725bfbf Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 21 Feb 2014 01:47:53 +0100 Subject: [PATCH] Make DiscIO/ mostly IWYU clean (and fix errors in rest of the project detected by this change). --- Source/Core/Core/Boot/Boot_WiiWAD.cpp | 1 + .../Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp | 1 + Source/Core/DiscIO/BannerLoader.cpp | 6 +++++- Source/Core/DiscIO/BannerLoader.h | 9 +++++++-- Source/Core/DiscIO/BannerLoaderGC.cpp | 9 ++++++++- Source/Core/DiscIO/BannerLoaderGC.h | 10 +++++++++- Source/Core/DiscIO/BannerLoaderWii.cpp | 8 ++++++-- Source/Core/DiscIO/BannerLoaderWii.h | 8 ++++++++ Source/Core/DiscIO/Blob.cpp | 5 +++++ Source/Core/DiscIO/CISOBlob.cpp | 5 +++-- Source/Core/DiscIO/CISOBlob.h | 3 +++ Source/Core/DiscIO/CompressedBlob.cpp | 8 ++++++-- Source/Core/DiscIO/CompressedBlob.h | 1 + Source/Core/DiscIO/DiscScrubber.cpp | 7 +++++++ Source/Core/DiscIO/DiscScrubber.h | 2 +- Source/Core/DiscIO/DriveBlob.cpp | 11 ++++++++++- Source/Core/DiscIO/DriveBlob.h | 1 + Source/Core/DiscIO/FileBlob.h | 3 +++ Source/Core/DiscIO/FileHandlerARC.cpp | 8 +++++++- Source/Core/DiscIO/FileHandlerARC.h | 1 + Source/Core/DiscIO/FileMonitor.cpp | 9 ++++++--- Source/Core/DiscIO/FileMonitor.h | 5 ++--- Source/Core/DiscIO/FileSystemGCWii.cpp | 4 ++++ Source/Core/DiscIO/FileSystemGCWii.h | 5 +++++ Source/Core/DiscIO/Filesystem.cpp | 1 - Source/Core/DiscIO/Filesystem.h | 8 +++++++- Source/Core/DiscIO/NANDContentLoader.cpp | 13 +++++++++++-- Source/Core/DiscIO/NANDContentLoader.h | 5 +---- Source/Core/DiscIO/Volume.h | 1 - Source/Core/DiscIO/VolumeCommon.cpp | 4 ++++ Source/Core/DiscIO/VolumeCreator.cpp | 7 +++++-- Source/Core/DiscIO/VolumeCreator.h | 8 +++++++- Source/Core/DiscIO/VolumeDirectory.cpp | 14 ++++++++++++-- Source/Core/DiscIO/VolumeDirectory.h | 5 ++++- Source/Core/DiscIO/VolumeGC.cpp | 7 +++++++ Source/Core/DiscIO/VolumeGC.h | 8 +++++++- Source/Core/DiscIO/VolumeWad.cpp | 7 ++++++- Source/Core/DiscIO/VolumeWad.h | 9 +++++++-- Source/Core/DiscIO/VolumeWiiCrypted.cpp | 9 ++++++++- Source/Core/DiscIO/VolumeWiiCrypted.h | 7 ++++++- Source/Core/DiscIO/WbfsBlob.cpp | 7 +++++++ Source/Core/DiscIO/WbfsBlob.h | 5 +++-- Source/Core/DiscIO/WiiWad.cpp | 7 ++++--- Source/Core/DiscIO/WiiWad.h | 6 ++---- Source/Core/DolphinWX/FrameTools.cpp | 1 + 45 files changed, 219 insertions(+), 50 deletions(-) diff --git a/Source/Core/Core/Boot/Boot_WiiWAD.cpp b/Source/Core/Core/Boot/Boot_WiiWAD.cpp index 99235c8e36..68eb39691f 100644 --- a/Source/Core/Core/Boot/Boot_WiiWAD.cpp +++ b/Source/Core/Core/Boot/Boot_WiiWAD.cpp @@ -6,6 +6,7 @@ #include "Common/CommonPaths.h" #include "Common/FileUtil.h" +#include "Common/NandPaths.h" #include "Core/ConfigManager.h" #include "Core/PatchEngine.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp index 4bcccd8f03..a9e4fd6d1b 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp @@ -7,6 +7,7 @@ #include "Common/CommonPaths.h" #include "Common/FileUtil.h" +#include "Common/NandPaths.h" #include "Common/SettingsHandler.h" #include "Common/StringUtil.h" diff --git a/Source/Core/DiscIO/BannerLoader.cpp b/Source/Core/DiscIO/BannerLoader.cpp index d0c59c567d..49dfb4bb44 100644 --- a/Source/Core/DiscIO/BannerLoader.cpp +++ b/Source/Core/DiscIO/BannerLoader.cpp @@ -2,16 +2,20 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/FileUtil.h" +#include #include "DiscIO/BannerLoader.h" #include "DiscIO/BannerLoaderGC.h" #include "DiscIO/BannerLoaderWii.h" +#include "DiscIO/Filesystem.h" #include "DiscIO/VolumeCreator.h" namespace DiscIO { +class IBannerLoader; +class IVolume; + IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume *pVolume) { if (IsVolumeWiiDisc(pVolume) || IsVolumeWadFile(pVolume)) diff --git a/Source/Core/DiscIO/BannerLoader.h b/Source/Core/DiscIO/BannerLoader.h index d291f7fb6c..74ed934654 100644 --- a/Source/Core/DiscIO/BannerLoader.h +++ b/Source/Core/DiscIO/BannerLoader.h @@ -7,10 +7,14 @@ #include #include -#include "DiscIO/Filesystem.h" +#include "Common/CommonTypes.h" namespace DiscIO { + +class IFileSystem; +class IVolume; + class IBannerLoader { public: @@ -33,4 +37,5 @@ class IBannerLoader }; IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume *pVolume); -} // namespace + +} // namespace DiscIO diff --git a/Source/Core/DiscIO/BannerLoaderGC.cpp b/Source/Core/DiscIO/BannerLoaderGC.cpp index bc6ba3470b..0133e43ae6 100644 --- a/Source/Core/DiscIO/BannerLoaderGC.cpp +++ b/Source/Core/DiscIO/BannerLoaderGC.cpp @@ -2,9 +2,16 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include +#include +#include + #include "Common/ColorUtil.h" -#include "Common/CommonTypes.h" +#include "Common/Common.h" + #include "DiscIO/BannerLoaderGC.h" +#include "DiscIO/Filesystem.h" +#include "DiscIO/Volume.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/BannerLoaderGC.h b/Source/Core/DiscIO/BannerLoaderGC.h index d4d26d8974..a583b3c2d7 100644 --- a/Source/Core/DiscIO/BannerLoaderGC.h +++ b/Source/Core/DiscIO/BannerLoaderGC.h @@ -4,13 +4,21 @@ #pragma once -#include "Common/StringUtil.h" +#include +#include +#include + +#include "Common/CommonTypes.h" #include "DiscIO/BannerLoader.h" +#include "DiscIO/Volume.h" #include "DiscIO/VolumeGC.h" namespace DiscIO { + +class IFileSystem; + class CBannerLoaderGC : public IBannerLoader { diff --git a/Source/Core/DiscIO/BannerLoaderWii.cpp b/Source/Core/DiscIO/BannerLoaderWii.cpp index a037a830bd..3fa9113770 100644 --- a/Source/Core/DiscIO/BannerLoaderWii.cpp +++ b/Source/Core/DiscIO/BannerLoaderWii.cpp @@ -3,15 +3,19 @@ // Refer to the license.txt file included. #include +#include #include +#include +#include #include "Common/ColorUtil.h" +#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" +#include "Common/StringUtil.h" #include "DiscIO/BannerLoaderWii.h" -#include "DiscIO/FileHandlerARC.h" -#include "DiscIO/VolumeCreator.h" +#include "DiscIO/Volume.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/BannerLoaderWii.h b/Source/Core/DiscIO/BannerLoaderWii.h index 45cbb136ce..a43084ee37 100644 --- a/Source/Core/DiscIO/BannerLoaderWii.h +++ b/Source/Core/DiscIO/BannerLoaderWii.h @@ -4,10 +4,17 @@ #pragma once +#include +#include + +#include "Common/CommonTypes.h" #include "DiscIO/BannerLoader.h" namespace DiscIO { + +class IVolume; + class CBannerLoaderWii : public IBannerLoader { @@ -60,4 +67,5 @@ class CBannerLoaderWii bool GetStringFromComments(const CommentIndex index, std::string& s); }; + } // namespace diff --git a/Source/Core/DiscIO/Blob.cpp b/Source/Core/DiscIO/Blob.cpp index f8a831d95b..6e00b422ae 100644 --- a/Source/Core/DiscIO/Blob.cpp +++ b/Source/Core/DiscIO/Blob.cpp @@ -2,7 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include +#include +#include + #include "Common/CDUtils.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "DiscIO/Blob.h" diff --git a/Source/Core/DiscIO/CISOBlob.cpp b/Source/Core/DiscIO/CISOBlob.cpp index 4bf97aed2f..7c56cde277 100644 --- a/Source/Core/DiscIO/CISOBlob.cpp +++ b/Source/Core/DiscIO/CISOBlob.cpp @@ -3,9 +3,10 @@ // Refer to the license.txt file included. #include -#include +#include -#include "DiscIO/Blob.h" +#include "Common/CommonTypes.h" +#include "Common/FileUtil.h" #include "DiscIO/CISOBlob.h" namespace DiscIO diff --git a/Source/Core/DiscIO/CISOBlob.h b/Source/Core/DiscIO/CISOBlob.h index 26f2a84ffd..dd95092b7e 100644 --- a/Source/Core/DiscIO/CISOBlob.h +++ b/Source/Core/DiscIO/CISOBlob.h @@ -4,6 +4,9 @@ #pragma once +#include + +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "DiscIO/Blob.h" diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index f3dd250b78..94d56b3172 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -5,15 +5,19 @@ #ifdef _WIN32 #include #include -#else -#include #endif +#include #include +#include +#include +#include #include +#include "Common/Common.h" #include "Common/FileUtil.h" #include "Common/Hash.h" +#include "DiscIO/Blob.h" #include "DiscIO/CompressedBlob.h" #include "DiscIO/DiscScrubber.h" diff --git a/Source/Core/DiscIO/CompressedBlob.h b/Source/Core/DiscIO/CompressedBlob.h index a170239e4b..990deb474a 100644 --- a/Source/Core/DiscIO/CompressedBlob.h +++ b/Source/Core/DiscIO/CompressedBlob.h @@ -16,6 +16,7 @@ #include +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "DiscIO/Blob.h" diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp index b1274987cc..8c64dcd1b0 100644 --- a/Source/Core/DiscIO/DiscScrubber.cpp +++ b/Source/Core/DiscIO/DiscScrubber.cpp @@ -2,11 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include #include +#include +#include +#include +#include +#include "Common/Common.h" #include "Common/FileUtil.h" #include "DiscIO/DiscScrubber.h" #include "DiscIO/Filesystem.h" +#include "DiscIO/Volume.h" #include "DiscIO/VolumeCreator.h" namespace DiscIO diff --git a/Source/Core/DiscIO/DiscScrubber.h b/Source/Core/DiscIO/DiscScrubber.h index 5b29fda9b7..4a759113aa 100644 --- a/Source/Core/DiscIO/DiscScrubber.h +++ b/Source/Core/DiscIO/DiscScrubber.h @@ -14,8 +14,8 @@ #pragma once #include "Common/CommonTypes.h" -#include "DiscIO/Blob.h" +namespace File { class IOFile; } namespace DiscIO { diff --git a/Source/Core/DiscIO/DriveBlob.cpp b/Source/Core/DiscIO/DriveBlob.cpp index ad0a72a194..819a37971c 100644 --- a/Source/Core/DiscIO/DriveBlob.cpp +++ b/Source/Core/DiscIO/DriveBlob.cpp @@ -2,9 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/StringUtil.h" +#include +#include + +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "DiscIO/Blob.h" #include "DiscIO/DriveBlob.h" +#ifdef _WIN32 +#include "Common/StringUtil.h" +#endif + namespace DiscIO { diff --git a/Source/Core/DiscIO/DriveBlob.h b/Source/Core/DiscIO/DriveBlob.h index 1e70859702..8baedaff79 100644 --- a/Source/Core/DiscIO/DriveBlob.h +++ b/Source/Core/DiscIO/DriveBlob.h @@ -4,6 +4,7 @@ #pragma once +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "DiscIO/Blob.h" diff --git a/Source/Core/DiscIO/FileBlob.h b/Source/Core/DiscIO/FileBlob.h index cafa07412e..170cda379d 100644 --- a/Source/Core/DiscIO/FileBlob.h +++ b/Source/Core/DiscIO/FileBlob.h @@ -4,6 +4,9 @@ #pragma once +#include + +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "DiscIO/Blob.h" diff --git a/Source/Core/DiscIO/FileHandlerARC.cpp b/Source/Core/DiscIO/FileHandlerARC.cpp index 8e820e65b2..770d3aac8b 100644 --- a/Source/Core/DiscIO/FileHandlerARC.cpp +++ b/Source/Core/DiscIO/FileHandlerARC.cpp @@ -2,10 +2,16 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include +#include +#include +#include + +#include "Common/Common.h" #include "Common/FileUtil.h" -#include "Common/StringUtil.h" #include "DiscIO/Blob.h" #include "DiscIO/FileHandlerARC.h" +#include "DiscIO/Filesystem.h" #define ARC_ID 0x55aa382d diff --git a/Source/Core/DiscIO/FileHandlerARC.h b/Source/Core/DiscIO/FileHandlerARC.h index 23ff978b35..1fccd5f894 100644 --- a/Source/Core/DiscIO/FileHandlerARC.h +++ b/Source/Core/DiscIO/FileHandlerARC.h @@ -4,6 +4,7 @@ #pragma once +#include #include #include diff --git a/Source/Core/DiscIO/FileMonitor.cpp b/Source/Core/DiscIO/FileMonitor.cpp index bae2f49964..94d0189668 100644 --- a/Source/Core/DiscIO/FileMonitor.cpp +++ b/Source/Core/DiscIO/FileMonitor.cpp @@ -3,18 +3,21 @@ // Refer to the license.txt file included. #include -#include +#include +#include #include #include #include "Common/Common.h" -#include "Common/IniFile.h" #include "Common/LogManager.h" +#include "Common/StringUtil.h" #include "Core/ConfigManager.h" #include "Core/Core.h" +#include "Core/Boot/Boot.h" -#include "DiscIO/FileSystemGCWii.h" +#include "DiscIO/Filesystem.h" +#include "DiscIO/Volume.h" #include "DiscIO/VolumeCreator.h" namespace FileMon diff --git a/Source/Core/DiscIO/FileMonitor.h b/Source/Core/DiscIO/FileMonitor.h index 2ce4af3a53..f5e92f021b 100644 --- a/Source/Core/DiscIO/FileMonitor.h +++ b/Source/Core/DiscIO/FileMonitor.h @@ -4,10 +4,9 @@ #pragma once -#include // System: For std - -#include "Common/Common.h" // Common: For u64 +#include +#include "Common/CommonTypes.h" namespace FileMon { diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index 078fb554cc..6b15454256 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -4,6 +4,8 @@ #include #include +#include +#include #include #include @@ -11,7 +13,9 @@ #include "Common/FileUtil.h" #include "Common/StringUtil.h" +#include "DiscIO/Filesystem.h" #include "DiscIO/FileSystemGCWii.h" +#include "DiscIO/Volume.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/FileSystemGCWii.h b/Source/Core/DiscIO/FileSystemGCWii.h index 7444711293..1fe934a256 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.h +++ b/Source/Core/DiscIO/FileSystemGCWii.h @@ -4,13 +4,18 @@ #pragma once +#include +#include #include +#include "Common/CommonTypes.h" #include "DiscIO/Filesystem.h" namespace DiscIO { +class IVolume; + class CFileSystemGCWii : public IFileSystem { public: diff --git a/Source/Core/DiscIO/Filesystem.cpp b/Source/Core/DiscIO/Filesystem.cpp index fc07bae1ac..7cbfa9c877 100644 --- a/Source/Core/DiscIO/Filesystem.cpp +++ b/Source/Core/DiscIO/Filesystem.cpp @@ -4,7 +4,6 @@ #include "DiscIO/Filesystem.h" #include "DiscIO/FileSystemGCWii.h" -#include "DiscIO/VolumeCreator.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/Filesystem.h b/Source/Core/DiscIO/Filesystem.h index b67f0d447e..af51c4cdaa 100644 --- a/Source/Core/DiscIO/Filesystem.h +++ b/Source/Core/DiscIO/Filesystem.h @@ -4,11 +4,17 @@ #pragma once -#include "DiscIO/Volume.h" +#include +#include +#include + +#include "Common/CommonTypes.h" namespace DiscIO { +class IVolume; + // file info of an FST entry struct SFileInfo { diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp index 35d51a56e1..1e3be46c70 100644 --- a/Source/Core/DiscIO/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/NANDContentLoader.cpp @@ -2,16 +2,25 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include "Common/Common.h" #include "Common/FileUtil.h" #include "Common/Log.h" #include "Common/MathUtil.h" +#include "Common/NandPaths.h" #include "Common/StringUtil.h" #include "DiscIO/NANDContentLoader.h" +#include "DiscIO/Volume.h" #include "DiscIO/WiiWad.h" namespace DiscIO diff --git a/Source/Core/DiscIO/NANDContentLoader.h b/Source/Core/DiscIO/NANDContentLoader.h index bff92974e5..456f592671 100644 --- a/Source/Core/DiscIO/NANDContentLoader.h +++ b/Source/Core/DiscIO/NANDContentLoader.h @@ -4,15 +4,12 @@ #pragma once +#include #include #include #include #include "Common/Common.h" -#include "Common/FileUtil.h" -#include "Common/NandPaths.h" - -#include "DiscIO/Blob.h" #include "DiscIO/Volume.h" namespace DiscIO diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h index 5343a9f1fd..648ffeac70 100644 --- a/Source/Core/DiscIO/Volume.h +++ b/Source/Core/DiscIO/Volume.h @@ -8,7 +8,6 @@ #include #include "Common/Common.h" -#include "Common/StringUtil.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/VolumeCommon.cpp b/Source/Core/DiscIO/VolumeCommon.cpp index af367c790f..7a19d9f7d6 100644 --- a/Source/Core/DiscIO/VolumeCommon.cpp +++ b/Source/Core/DiscIO/VolumeCommon.cpp @@ -2,6 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include +#include + +#include "Common/Common.h" #include "DiscIO/Volume.h" namespace DiscIO diff --git a/Source/Core/DiscIO/VolumeCreator.cpp b/Source/Core/DiscIO/VolumeCreator.cpp index 74d4a5d99a..1a36e6a66f 100644 --- a/Source/Core/DiscIO/VolumeCreator.cpp +++ b/Source/Core/DiscIO/VolumeCreator.cpp @@ -2,15 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include +#include +#include #include #include -#include "Common/Hash.h" +#include "Common/Common.h" #include "Common/StringUtil.h" +#include "DiscIO/Blob.h" #include "DiscIO/Volume.h" -#include "DiscIO/VolumeCreator.h" #include "DiscIO/VolumeDirectory.h" #include "DiscIO/VolumeGC.h" #include "DiscIO/VolumeWad.h" diff --git a/Source/Core/DiscIO/VolumeCreator.h b/Source/Core/DiscIO/VolumeCreator.h index a9f1e43da2..e37db0b07b 100644 --- a/Source/Core/DiscIO/VolumeCreator.h +++ b/Source/Core/DiscIO/VolumeCreator.h @@ -4,12 +4,18 @@ #pragma once -#include "DiscIO/Volume.h" +#include + +#include "Common/CommonTypes.h" namespace DiscIO { + +class IVolume; + IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionGroup = 0, u32 _VolumeNum = -1); IVolume* CreateVolumeFromDirectory(const std::string& _rDirectory, bool _bIsWii, const std::string& _rApploader = "", const std::string& _rDOL = ""); bool IsVolumeWiiDisc(const IVolume *_rVolume); bool IsVolumeWadFile(const IVolume *_rVolume); + } // namespace diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp index eeaa5fe366..50a380a278 100644 --- a/Source/Core/DiscIO/VolumeDirectory.cpp +++ b/Source/Core/DiscIO/VolumeDirectory.cpp @@ -2,10 +2,20 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/CommonPaths.h" -#include "Common/MathUtil.h" +#include +#include +#include +#include +#include +#include +#include +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/MathUtil.h" #include "DiscIO/FileBlob.h" +#include "DiscIO/Volume.h" #include "DiscIO/VolumeDirectory.h" namespace DiscIO diff --git a/Source/Core/DiscIO/VolumeDirectory.h b/Source/Core/DiscIO/VolumeDirectory.h index 4f9a47ff9c..ec1527cb02 100644 --- a/Source/Core/DiscIO/VolumeDirectory.h +++ b/Source/Core/DiscIO/VolumeDirectory.h @@ -6,10 +6,13 @@ #include #include +#include -#include "Common/FileUtil.h" +#include "Common/CommonTypes.h" #include "DiscIO/Volume.h" +namespace File { struct FSTEntry; } + // // --- this volume type is used for reading files directly from the hard drive --- // diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 8039d56922..4e057df78c 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -2,8 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include +#include +#include + +#include "Common/Common.h" #include "Common/StringUtil.h" +#include "DiscIO/Blob.h" #include "DiscIO/FileMonitor.h" +#include "DiscIO/Volume.h" #include "DiscIO/VolumeGC.h" namespace DiscIO diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h index 42b7524269..d48ccbcedf 100644 --- a/Source/Core/DiscIO/VolumeGC.h +++ b/Source/Core/DiscIO/VolumeGC.h @@ -4,13 +4,19 @@ #pragma once -#include "DiscIO/Blob.h" +#include +#include + +#include "Common/CommonTypes.h" #include "DiscIO/Volume.h" // --- this volume type is used for GC disc images --- namespace DiscIO { + +class IBlobReader; + class CVolumeGC : public IVolume { public: diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp index d436c9935a..0174f951f1 100644 --- a/Source/Core/DiscIO/VolumeWad.cpp +++ b/Source/Core/DiscIO/VolumeWad.cpp @@ -3,10 +3,15 @@ // Refer to the license.txt file included. #include -#include +#include +#include +#include +#include "Common/Common.h" #include "Common/MathUtil.h" #include "Common/StringUtil.h" +#include "DiscIO/Blob.h" +#include "DiscIO/Volume.h" #include "DiscIO/VolumeWad.h" #define ALIGN_40(x) ROUND_UP(Common::swap32(x), 0x40) diff --git a/Source/Core/DiscIO/VolumeWad.h b/Source/Core/DiscIO/VolumeWad.h index 7ae0068524..dcfb03fc06 100644 --- a/Source/Core/DiscIO/VolumeWad.h +++ b/Source/Core/DiscIO/VolumeWad.h @@ -4,8 +4,10 @@ #pragma once -#include "DiscIO/Blob.h" -#include "DiscIO/NANDContentLoader.h" +#include +#include + +#include "Common/CommonTypes.h" #include "DiscIO/Volume.h" // --- this volume type is used for Wad files --- @@ -14,6 +16,9 @@ namespace DiscIO { + +class IBlobReader; + class CVolumeWAD : public IVolume { public: diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index 69b78690e9..76d507d9ec 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -2,9 +2,16 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include +#include +#include +#include +#include #include -#include "Common/StringUtil.h" +#include "Common/Common.h" +#include "DiscIO/Blob.h" +#include "DiscIO/Volume.h" #include "DiscIO/VolumeGC.h" #include "DiscIO/VolumeWiiCrypted.h" diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.h b/Source/Core/DiscIO/VolumeWiiCrypted.h index 51033b1e5e..e364045b7a 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.h +++ b/Source/Core/DiscIO/VolumeWiiCrypted.h @@ -4,15 +4,20 @@ #pragma once +#include +#include #include -#include "DiscIO/Blob.h" +#include "Common/CommonTypes.h" #include "DiscIO/Volume.h" // --- this volume type is used for encrypted Wii images --- namespace DiscIO { + +class IBlobReader; + class CVolumeWiiCrypted : public IVolume { public: diff --git a/Source/Core/DiscIO/WbfsBlob.cpp b/Source/Core/DiscIO/WbfsBlob.cpp index a13e268123..b51c14ae9a 100644 --- a/Source/Core/DiscIO/WbfsBlob.cpp +++ b/Source/Core/DiscIO/WbfsBlob.cpp @@ -2,6 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include +#include +#include +#include +#include + +#include "Common/Common.h" #include "Common/FileUtil.h" #include "DiscIO/WbfsBlob.h" diff --git a/Source/Core/DiscIO/WbfsBlob.h b/Source/Core/DiscIO/WbfsBlob.h index 83ac436ddd..639843d360 100644 --- a/Source/Core/DiscIO/WbfsBlob.h +++ b/Source/Core/DiscIO/WbfsBlob.h @@ -4,14 +4,15 @@ #pragma once +#include + +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "DiscIO/Blob.h" namespace DiscIO { -struct wbfs_head_t; - class WbfsFileReader : public IBlobReader { WbfsFileReader(const char* filename); diff --git a/Source/Core/DiscIO/WiiWad.cpp b/Source/Core/DiscIO/WiiWad.cpp index 8c6cda77bd..4ca2944397 100644 --- a/Source/Core/DiscIO/WiiWad.cpp +++ b/Source/Core/DiscIO/WiiWad.cpp @@ -3,13 +3,14 @@ // Refer to the license.txt file included. -#include -#include +#include +#include +#include "Common/Common.h" #include "Common/FileUtil.h" #include "Common/Log.h" #include "Common/MathUtil.h" -#include "DiscIO/NANDContentLoader.h" +#include "DiscIO/Blob.h" #include "DiscIO/WiiWad.h" namespace DiscIO diff --git a/Source/Core/DiscIO/WiiWad.h b/Source/Core/DiscIO/WiiWad.h index b72f616149..a987bce742 100644 --- a/Source/Core/DiscIO/WiiWad.h +++ b/Source/Core/DiscIO/WiiWad.h @@ -4,17 +4,15 @@ #pragma once -#include #include -#include #include "Common/CommonTypes.h" -#include "DiscIO/Blob.h" -#include "DiscIO/Volume.h" namespace DiscIO { +class IBlobReader; + class WiiWAD { public: diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 27da521253..897da874d9 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -23,6 +23,7 @@ Core::GetWindowHandle(). #include "Common/Common.h" #include "Common/FileSearch.h" #include "Common/FileUtil.h" +#include "Common/NandPaths.h" #include "Common/Timer.h" #include "Core/BootManager.h"