Convert all includes to relative paths.

2025-07-30 01:29:42 -06:00 · 2014-02-17 05:18:15 -05:00
parent 73691a8587
commit 2afe215271
893 changed files with 4628 additions and 4957 deletions
--- a/Source/Core/DiscIO/BannerLoader.cpp
+++ b/Source/Core/DiscIO/BannerLoader.cpp
@ -2,12 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "BannerLoader.h"
-#include "BannerLoaderWii.h"
-#include "BannerLoaderGC.h"
+#include "Common/FileUtil.h"

-#include "VolumeCreator.h"
-#include "FileUtil.h"
+#include "DiscIO/BannerLoader.h"
+#include "DiscIO/BannerLoaderGC.h"
+#include "DiscIO/BannerLoaderWii.h"
+#include "DiscIO/VolumeCreator.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/BannerLoader.h
+++ b/Source/Core/DiscIO/BannerLoader.h
@ -4,10 +4,10 @@

 #pragma once

-#include <vector>
 #include <string>
+#include <vector>

-#include "Filesystem.h"
+#include "DiscIO/Filesystem.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/BannerLoaderGC.cpp
+++ b/Source/Core/DiscIO/BannerLoaderGC.cpp
@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "CommonTypes.h"
-#include "ColorUtil.h"
-#include "BannerLoaderGC.h"
+#include "Common/CommonTypes.h"
+#include "Common/ColorUtil.h"
+#include "DiscIO/BannerLoaderGC.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/BannerLoaderGC.h
+++ b/Source/Core/DiscIO/BannerLoaderGC.h
@ -4,9 +4,10 @@

 #pragma once

-#include "BannerLoader.h"
-#include "VolumeGC.h"
-#include "StringUtil.h"
+#include "Common/StringUtil.h"
+
+#include "DiscIO/BannerLoader.h"
+#include "DiscIO/VolumeGC.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/BannerLoaderWii.cpp
+++ b/Source/Core/DiscIO/BannerLoaderWii.cpp
@ -2,15 +2,16 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include <stdio.h>
 #include <algorithm>
+#include <cstdio>

-#include "CommonTypes.h"
-#include "ColorUtil.h"
-#include "BannerLoaderWii.h"
-#include "VolumeCreator.h"
-#include "FileUtil.h"
-#include "FileHandlerARC.h"
+#include "Common/CommonTypes.h"
+#include "Common/ColorUtil.h"
+#include "Common/FileUtil.h"
+
+#include "DiscIO/BannerLoaderWii.h"
+#include "DiscIO/FileHandlerARC.h"
+#include "DiscIO/VolumeCreator.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/BannerLoaderWii.h
+++ b/Source/Core/DiscIO/BannerLoaderWii.h
@ -4,7 +4,7 @@

 #pragma once

-#include "BannerLoader.h"
+#include "DiscIO/BannerLoader.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/Blob.cpp
+++ b/Source/Core/DiscIO/Blob.cpp
@ -2,14 +2,15 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Blob.h"
-#include "CDUtils.h"
-#include "CISOBlob.h"
-#include "CompressedBlob.h"
-#include "DriveBlob.h"
-#include "FileBlob.h"
-#include "FileUtil.h"
-#include "WbfsBlob.h"
+#include "Common/CDUtils.h"
+#include "Common/FileUtil.h"
+
+#include "DiscIO/Blob.h"
+#include "DiscIO/CISOBlob.h"
+#include "DiscIO/CompressedBlob.h"
+#include "DiscIO/DriveBlob.h"
+#include "DiscIO/FileBlob.h"
+#include "DiscIO/WbfsBlob.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/Blob.h
+++ b/Source/Core/DiscIO/Blob.h
@ -14,7 +14,7 @@
 // detect whether the file is a compressed blob, or just a big hunk of data, or a drive, and
 // automatically do the right thing.

-#include "CommonTypes.h"
+#include "Common/CommonTypes.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/CISOBlob.cpp
+++ b/Source/Core/DiscIO/CISOBlob.cpp
@ -5,8 +5,8 @@
 #include <algorithm>
 #include <cmath>

-#include "Blob.h"
-#include "CISOBlob.h"
+#include "DiscIO/Blob.h"
+#include "DiscIO/CISOBlob.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/CISOBlob.h
+++ b/Source/Core/DiscIO/CISOBlob.h
@ -4,8 +4,8 @@

 #pragma once

-#include "Blob.h"
-#include "FileUtil.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/Blob.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/CompressedBlob.cpp
+++ b/Source/Core/DiscIO/CompressedBlob.cpp
@ -11,10 +11,10 @@

 #include <cinttypes>

-#include "CompressedBlob.h"
-#include "DiscScrubber.h"
-#include "FileUtil.h"
-#include "Hash.h"
+#include "Common/FileUtil.h"
+#include "Common/Hash.h"
+#include "DiscIO/CompressedBlob.h"
+#include "DiscIO/DiscScrubber.h"

 #include "zlib.h"

--- a/Source/Core/DiscIO/CompressedBlob.h
+++ b/Source/Core/DiscIO/CompressedBlob.h
@ -16,8 +16,8 @@

 #include <string>

-#include "Blob.h"
-#include "FileUtil.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/Blob.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/DiscScrubber.cpp
+++ b/Source/Core/DiscIO/DiscScrubber.cpp
@ -2,13 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Filesystem.h"
-#include "VolumeCreator.h"
-#include "FileUtil.h"
-#include "DiscScrubber.h"
-
 #include <cinttypes>

+#include "Common/FileUtil.h"
+#include "DiscIO/DiscScrubber.h"
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/VolumeCreator.h"
+
 namespace DiscIO
 {

--- a/Source/Core/DiscIO/DiscScrubber.h
+++ b/Source/Core/DiscIO/DiscScrubber.h
@ -13,8 +13,8 @@

 #pragma once

-#include "CommonTypes.h"
-#include "Blob.h"
+#include "Common/CommonTypes.h"
+#include "DiscIO/Blob.h"


 namespace DiscIO
--- a/Source/Core/DiscIO/DriveBlob.cpp
+++ b/Source/Core/DiscIO/DriveBlob.cpp
@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "DriveBlob.h"
-#include "StringUtil.h"
+#include "Common/StringUtil.h"
+#include "DiscIO/DriveBlob.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/DriveBlob.h
+++ b/Source/Core/DiscIO/DriveBlob.h
@ -4,8 +4,8 @@

 #pragma once

-#include "Blob.h"
-#include "FileUtil.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/Blob.h"

 #ifdef _WIN32
 #include <windows.h>
--- a/Source/Core/DiscIO/FileBlob.cpp
+++ b/Source/Core/DiscIO/FileBlob.cpp
@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "FileBlob.h"
+#include "DiscIO/FileBlob.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/FileBlob.h
+++ b/Source/Core/DiscIO/FileBlob.h
@ -4,8 +4,8 @@

 #pragma once

-#include "Blob.h"
-#include "FileUtil.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/Blob.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/FileHandlerARC.cpp
+++ b/Source/Core/DiscIO/FileHandlerARC.cpp
@ -2,10 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "FileHandlerARC.h"
-#include "StringUtil.h"
-#include "Blob.h"
-#include "FileUtil.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+#include "DiscIO/Blob.h"
+#include "DiscIO/FileHandlerARC.h"

 #define ARC_ID 0x55aa382d

--- a/Source/Core/DiscIO/FileHandlerARC.h
+++ b/Source/Core/DiscIO/FileHandlerARC.h
@ -7,8 +7,8 @@
 #include <string>
 #include <vector>

-#include "CommonTypes.h"
-#include "Filesystem.h"
+#include "Common/CommonTypes.h"
+#include "DiscIO/Filesystem.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/FileMonitor.cpp
+++ b/Source/Core/DiscIO/FileMonitor.cpp
@ -2,20 +2,20 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include <iostream>
-#include <vector>
-#include <string>
 #include <algorithm>
+#include <iostream>
+#include <string>
+#include <vector>

+#include "Common/Common.h"
+#include "Common/IniFile.h"
+#include "Common/LogManager.h"

-#include "Common.h"
-#include "IniFile.h"
-#include "LogManager.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"

-#include "../Core/Core.h"
-#include "../Core/ConfigManager.h"
-#include "FileSystemGCWii.h"
-#include "VolumeCreator.h"
+#include "DiscIO/FileSystemGCWii.h"
+#include "DiscIO/VolumeCreator.h"

 namespace FileMon
 {
--- a/Source/Core/DiscIO/FileMonitor.h
+++ b/Source/Core/DiscIO/FileMonitor.h
@ -6,7 +6,7 @@

 #include <iostream> // System: For std

-#include "Common.h" // Common: For u64
+#include "Common/Common.h" // Common: For u64


 namespace FileMon
--- a/Source/Core/DiscIO/FileSystemGCWii.cpp
+++ b/Source/Core/DiscIO/FileSystemGCWii.cpp
@ -2,16 +2,16 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Common.h"
-#include "FileUtil.h"
-
-#include <string>
-#include <vector>
 #include <algorithm>
 #include <cinttypes>
+#include <string>
+#include <vector>

-#include "FileSystemGCWii.h"
-#include "StringUtil.h"
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+
+#include "DiscIO/FileSystemGCWii.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/FileSystemGCWii.h
+++ b/Source/Core/DiscIO/FileSystemGCWii.h
@ -6,7 +6,7 @@

 #include <vector>

-#include "Filesystem.h"
+#include "DiscIO/Filesystem.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/Filesystem.cpp
+++ b/Source/Core/DiscIO/Filesystem.cpp
@ -2,10 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Filesystem.h"
-
-#include "VolumeCreator.h"
-#include "FileSystemGCWii.h"
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/FileSystemGCWii.h"
+#include "DiscIO/VolumeCreator.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/Filesystem.h
+++ b/Source/Core/DiscIO/Filesystem.h
@ -4,7 +4,7 @@

 #pragma once

-#include "Volume.h"
+#include "DiscIO/Volume.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/NANDContentLoader.cpp
@ -2,16 +2,17 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "NANDContentLoader.h"
-
 #include <algorithm>
 #include <cctype>
 #include <polarssl/aes.h>
-#include "MathUtil.h"
-#include "FileUtil.h"
-#include "Log.h"
-#include "WiiWad.h"
-#include "StringUtil.h"
+
+#include "Common/FileUtil.h"
+#include "Common/MathUtil.h"
+#include "Common/Log.h"
+#include "Common/StringUtil.h"
+
+#include "DiscIO/NANDContentLoader.h"
+#include "DiscIO/WiiWad.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/NANDContentLoader.h
+++ b/Source/Core/DiscIO/NANDContentLoader.h
@ -4,15 +4,16 @@

 #pragma once

+#include <map>
 #include <string>
 #include <vector>
-#include <map>

-#include "Common.h"
-#include "Blob.h"
-#include "Volume.h"
-#include "NandPaths.h"
-#include "FileUtil.h"
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
+
+#include "DiscIO/Blob.h"
+#include "DiscIO/Volume.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/Volume.h
+++ b/Source/Core/DiscIO/Volume.h
@ -7,8 +7,8 @@
 #include <string>
 #include <vector>

-#include "Common.h"
-#include "StringUtil.h"
+#include "Common/Common.h"
+#include "Common/StringUtil.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/VolumeCommon.cpp
+++ b/Source/Core/DiscIO/VolumeCommon.cpp
@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Volume.h"
+#include "DiscIO/Volume.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/VolumeCreator.cpp
+++ b/Source/Core/DiscIO/VolumeCreator.cpp
@ -6,16 +6,16 @@

 #include <polarssl/aes.h>

-#include "VolumeCreator.h"
+#include "Common/Hash.h"
+#include "Common/StringUtil.h"

-#include "Volume.h"
-#include "VolumeDirectory.h"
-#include "VolumeGC.h"
-#include "VolumeWiiCrypted.h"
-#include "VolumeWad.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
+#include "DiscIO/VolumeDirectory.h"
+#include "DiscIO/VolumeGC.h"
+#include "DiscIO/VolumeWad.h"
+#include "DiscIO/VolumeWiiCrypted.h"

-#include "Hash.h"
-#include "StringUtil.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/VolumeCreator.h
+++ b/Source/Core/DiscIO/VolumeCreator.h
@ -4,7 +4,7 @@

 #pragma once

-#include "Volume.h"
+#include "DiscIO/Volume.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/VolumeDirectory.cpp
+++ b/Source/Core/DiscIO/VolumeDirectory.cpp
@ -2,10 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "CommonPaths.h"
-#include "FileBlob.h"
-#include "MathUtil.h"
-#include "VolumeDirectory.h"
+#include "Common/CommonPaths.h"
+#include "Common/MathUtil.h"
+
+#include "DiscIO/FileBlob.h"
+#include "DiscIO/VolumeDirectory.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/VolumeDirectory.h
+++ b/Source/Core/DiscIO/VolumeDirectory.h
@ -7,8 +7,8 @@
 #include <map>
 #include <string>

-#include "FileUtil.h"
-#include "Volume.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/Volume.h"

 //
 // --- this volume type is used for reading files directly from the hard drive ---
--- a/Source/Core/DiscIO/VolumeGC.cpp
+++ b/Source/Core/DiscIO/VolumeGC.cpp
@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "VolumeGC.h"
-#include "StringUtil.h"
-#include "FileMonitor.h"
+#include "Common/StringUtil.h"
+#include "DiscIO/FileMonitor.h"
+#include "DiscIO/VolumeGC.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/VolumeGC.h
+++ b/Source/Core/DiscIO/VolumeGC.h
@ -4,8 +4,8 @@

 #pragma once

-#include "Volume.h"
-#include "Blob.h"
+#include "DiscIO/Blob.h"
+#include "DiscIO/Volume.h"

 // --- this volume type is used for GC disc images ---

--- a/Source/Core/DiscIO/VolumeWad.cpp
+++ b/Source/Core/DiscIO/VolumeWad.cpp
@ -3,11 +3,11 @@
 // Refer to the license.txt file included.

 #include <algorithm>
-#include <math.h>
+#include <cmath>

-#include "VolumeWad.h"
-#include "StringUtil.h"
-#include "MathUtil.h"
+#include "Common/MathUtil.h"
+#include "Common/StringUtil.h"
+#include "DiscIO/VolumeWad.h"

 #define ALIGN_40(x) ROUND_UP(Common::swap32(x), 0x40)

--- a/Source/Core/DiscIO/VolumeWad.h
+++ b/Source/Core/DiscIO/VolumeWad.h
@ -4,9 +4,9 @@

 #pragma once

-#include "Volume.h"
-#include "Blob.h"
-#include "NANDContentLoader.h"
+#include "DiscIO/Blob.h"
+#include "DiscIO/NANDContentLoader.h"
+#include "DiscIO/Volume.h"

 // --- this volume type is used for Wad files ---
 // Some of this code might look redundant with the CNANDContentLoader class, however,
--- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp
+++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp
@ -2,11 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "VolumeWiiCrypted.h"
-#include "VolumeGC.h"
-#include "StringUtil.h"
 #include <polarssl/sha1.h>

+#include "Common/StringUtil.h"
+#include "DiscIO/VolumeGC.h"
+#include "DiscIO/VolumeWiiCrypted.h"
+
 namespace DiscIO
 {

--- a/Source/Core/DiscIO/VolumeWiiCrypted.h
+++ b/Source/Core/DiscIO/VolumeWiiCrypted.h
@ -4,10 +4,11 @@

 #pragma once

-#include "Volume.h"
-#include "Blob.h"
 #include <polarssl/aes.h>

+#include "DiscIO/Blob.h"
+#include "DiscIO/Volume.h"
+
 // --- this volume type is used for encrypted Wii images ---

 namespace DiscIO
--- a/Source/Core/DiscIO/WbfsBlob.cpp
+++ b/Source/Core/DiscIO/WbfsBlob.cpp
@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "WbfsBlob.h"
-#include "FileUtil.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/WbfsBlob.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/WbfsBlob.h
+++ b/Source/Core/DiscIO/WbfsBlob.h
@ -4,8 +4,8 @@

 #pragma once

-#include "Blob.h"
-#include "FileUtil.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/Blob.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/WiiWad.cpp
+++ b/Source/Core/DiscIO/WiiWad.cpp
@ -6,10 +6,11 @@

 #include <algorithm>
 #include <cctype>
-#include "MathUtil.h"
-#include "FileUtil.h"
-#include "Log.h"
-#include "WiiWad.h"
+
+#include "Common/FileUtil.h"
+#include "Common/Log.h"
+#include "Common/MathUtil.h"
+#include "DiscIO/WiiWad.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/WiiWad.h
+++ b/Source/Core/DiscIO/WiiWad.h
@ -4,13 +4,13 @@

 #pragma once

+#include <map>
 #include <string>
 #include <vector>
-#include <map>

-#include "CommonTypes.h"
-#include "Blob.h"
-#include "Volume.h"
+#include "Common/CommonTypes.h"
+#include "DiscIO/Blob.h"
+#include "DiscIO/Volume.h"

 namespace DiscIO
 {
--- a/Source/Core/DiscIO/stdafx.cpp
+++ b/Source/Core/DiscIO/stdafx.cpp
@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "stdafx.h"
+#include "DiscIO/stdafx.h"

 // TODO: reference any additional headers you need in STDAFX.H
 // and not in this file