Merge pull request #10270 from Pokechu22/header-order

Treewide: Adjust order of includes
dolphin-emu · Dec 12, 2021 · f4e2d36 · f4e2d36
2 parents bfddce4 + 2025763
commit f4e2d36
Show file tree

Hide file tree

Showing 220 changed files with 440 additions and 259 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -20,6 +20,7 @@ ebb48d019eec1c29a37a406e2db16d7565367faa
 4b5b9ad05c10d95c9af43502ecc6877d6e680c4d
 8fca9a8e8d547653581ecb4aac12a09a4311eba3
 a41c1b2d0a9fab51f8a75ccdb7dba0890f766820
+49cfded60bb5b444d1828190eacc52bbb49a9cb8
 
 # Trailing whitespace
 c579637eafb9e9eb7f83711569254bd8da6d09d2

diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp
@@ -1,9 +1,10 @@
 // Copyright 2009 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "AudioCommon/AlsaSoundStream.h"
+
 #include <mutex>
 
-#include "AudioCommon/AlsaSoundStream.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/Thread.h"

diff --git a/Source/Core/AudioCommon/AudioStretcher.cpp b/Source/Core/AudioCommon/AudioStretcher.cpp
@@ -1,11 +1,12 @@
 // Copyright 2017 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "AudioCommon/AudioStretcher.h"
+
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
 
-#include "AudioCommon/AudioStretcher.h"
 #include "Common/Logging/Log.h"
 #include "Core/Config/MainSettings.h"
 

diff --git a/Source/Core/AudioCommon/CubebStream.cpp b/Source/Core/AudioCommon/CubebStream.cpp
@@ -1,9 +1,10 @@
 // Copyright 2017 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "AudioCommon/CubebStream.h"
+
 #include <cubeb/cubeb.h>
 
-#include "AudioCommon/CubebStream.h"
 #include "AudioCommon/CubebUtils.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"

diff --git a/Source/Core/AudioCommon/CubebUtils.cpp b/Source/Core/AudioCommon/CubebUtils.cpp
@@ -1,11 +1,12 @@
 // Copyright 2017 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "AudioCommon/CubebUtils.h"
+
 #include <cstdarg>
 #include <cstddef>
 #include <cstring>
 
-#include "AudioCommon/CubebUtils.h"
 #include "Common/CommonPaths.h"
 #include "Common/Logging/Log.h"
 #include "Common/Logging/LogManager.h"

diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "AudioCommon/Mixer.h"
-#include "AudioCommon/Enums.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 
+#include "AudioCommon/Enums.h"
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"

diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp
@@ -3,12 +3,13 @@
 
 #ifdef _WIN32
 
+#include "AudioCommon/OpenALStream.h"
+
 #include <windows.h>
 #include <climits>
 #include <cstring>
 #include <thread>
 
-#include "AudioCommon/OpenALStream.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/Thread.h"

diff --git a/Source/Core/AudioCommon/SurroundDecoder.cpp b/Source/Core/AudioCommon/SurroundDecoder.cpp
@@ -1,11 +1,11 @@
 // Copyright 2017 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "AudioCommon/SurroundDecoder.h"
+
 #include <FreeSurround/FreeSurroundDecoder.h>
 #include <limits>
 
-#include "AudioCommon/SurroundDecoder.h"
-
 namespace AudioCommon
 {
 constexpr size_t STEREO_CHANNELS = 2;

diff --git a/Source/Core/Common/Analytics.cpp b/Source/Core/Common/Analytics.cpp
@@ -1,12 +1,13 @@
 // Copyright 2016 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Analytics.h"
+
 #include <cmath>
 #include <cstdio>
 #include <string>
 #include <type_traits>
 
-#include "Common/Analytics.h"
 #include "Common/CommonTypes.h"
 #include "Common/StringUtil.h"
 #include "Common/Thread.h"

diff --git a/Source/Core/Common/AndroidAnalytics.cpp b/Source/Core/Common/AndroidAnalytics.cpp
@@ -1,11 +1,11 @@
 // Copyright 2018 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/AndroidAnalytics.h"
+
 #include <functional>
 #include <string>
 
-#include "Common/AndroidAnalytics.h"
-
 namespace Common
 {
 std::function<void(std::string, std::string)> s_android_send_report;

diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp
@@ -1,6 +1,8 @@
 // Copyright 2015 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Arm64Emitter.h"
+
 #include <algorithm>
 #include <array>
 #include <cinttypes>
@@ -11,7 +13,6 @@
 #include <vector>
 
 #include "Common/Align.h"
-#include "Common/Arm64Emitter.h"
 #include "Common/Assert.h"
 #include "Common/BitUtils.h"
 #include "Common/CommonTypes.h"

diff --git a/Source/Core/Common/ArmCPUDetect.cpp b/Source/Core/Common/ArmCPUDetect.cpp
@@ -1,6 +1,8 @@
 // Copyright 2013 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/CPUDetect.h"
+
 #include <cstring>
 #include <fstream>
 #include <sstream>
@@ -17,7 +19,6 @@
 
 #include <fmt/format.h>
 
-#include "Common/CPUDetect.h"
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 

diff --git a/Source/Core/Common/ArmFPURoundMode.cpp b/Source/Core/Common/ArmFPURoundMode.cpp
@@ -1,15 +1,16 @@
 // Copyright 2021 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "Common/CPUDetect.h"
-#include "Common/CommonTypes.h"
 #include "Common/FPURoundMode.h"
-#include "Common/Logging/Log.h"
 
 #ifdef _MSC_VER
 #include <intrin.h>
 #endif
 
+#include "Common/CPUDetect.h"
+#include "Common/CommonTypes.h"
+#include "Common/Logging/Log.h"
+
 static u64 GetFPCR()
 {
 #ifdef _MSC_VER

diff --git a/Source/Core/Common/CDUtils.cpp b/Source/Core/Common/CDUtils.cpp
@@ -3,18 +3,15 @@
 
 // Most of the code in this file was shamelessly ripped from libcdio With minor adjustments
 
+#include "Common/CDUtils.h"
+
 #include <algorithm>
 #include <cstdlib>
 #include <string>
 #include <vector>
 
 #include <fmt/format.h>
 
-#include "Common/CDUtils.h"
-#include "Common/Common.h"
-#include "Common/CommonTypes.h"
-#include "Common/StringUtil.h"
-
 #ifdef _WIN32
 #include <windows.h>
 #elif __APPLE__
@@ -36,6 +33,10 @@
 #include <linux/cdrom.h>
 #endif
 
+#include "Common/Common.h"
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+
 namespace Common
 {
 #ifdef _WIN32

diff --git a/Source/Core/Common/CRC32.cpp b/Source/Core/Common/CRC32.cpp
@@ -1,10 +1,10 @@
 // Copyright 2021 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <zlib.h>
-
 #include "Common/CRC32.h"
 
+#include <zlib.h>
+
 namespace Common
 {
 u32 ComputeCRC32(std::string_view data)

diff --git a/Source/Core/Common/CommonFuncs.cpp b/Source/Core/Common/CommonFuncs.cpp
@@ -1,13 +1,13 @@
 // Copyright 2009 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/CommonFuncs.h"
+
 #include <cstddef>
 #include <cstring>
 #include <errno.h>
 #include <type_traits>
 
-#include "Common/CommonFuncs.h"
-
 #ifdef _WIN32
 #include <windows.h>
 #define strerror_r(err, buf, len) strerror_s(buf, len, err)

diff --git a/Source/Core/Common/Config/Config.cpp b/Source/Core/Common/Config/Config.cpp
@@ -1,15 +1,15 @@
 // Copyright 2016 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Config/Config.h"
+
 #include <algorithm>
 #include <atomic>
 #include <list>
 #include <map>
 #include <mutex>
 #include <shared_mutex>
 
-#include "Common/Config/Config.h"
-
 namespace Config
 {
 using Layers = std::map<LayerType, std::shared_ptr<Layer>>;

diff --git a/Source/Core/Common/Config/ConfigInfo.cpp b/Source/Core/Common/Config/ConfigInfo.cpp
@@ -1,10 +1,11 @@
 // Copyright 2016 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Config/ConfigInfo.h"
+
 #include <cstring>
 
 #include "Common/CommonFuncs.h"
-#include "Common/Config/ConfigInfo.h"
 
 namespace Config
 {

diff --git a/Source/Core/Common/Config/Layer.cpp b/Source/Core/Common/Config/Layer.cpp
@@ -1,12 +1,13 @@
 // Copyright 2016 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Config/Layer.h"
+
 #include <algorithm>
 #include <cstring>
 #include <map>
 
 #include "Common/Config/Config.h"
-#include "Common/Config/Layer.h"
 
 namespace Config
 {

diff --git a/Source/Core/Common/Crypto/AES.cpp b/Source/Core/Common/Crypto/AES.cpp
@@ -1,10 +1,10 @@
 // Copyright 2017 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <mbedtls/aes.h>
-
 #include "Common/Crypto/AES.h"
 
+#include <mbedtls/aes.h>
+
 namespace Common::AES
 {
 std::vector<u8> DecryptEncrypt(const u8* key, u8* iv, const u8* src, size_t size, Mode mode)

diff --git a/Source/Core/Common/Crypto/bn.cpp b/Source/Core/Common/Crypto/bn.cpp
@@ -1,11 +1,12 @@
 // Copyright 2007,2008  Segher Boessenkool  <segher@kernel.crashing.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Crypto/bn.h"
+
 #include <cstdio>
 #include <cstring>
 
 #include "Common/CommonTypes.h"
-#include "Common/Crypto/bn.h"
 
 static void bn_zero(u8* d, int n)
 {

diff --git a/Source/Core/Common/Crypto/ec.cpp b/Source/Core/Common/Crypto/ec.cpp
@@ -2,11 +2,12 @@
 // Copyright 2007,2008  Segher Boessenkool  <segher@kernel.crashing.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Crypto/ec.h"
+
 #include <algorithm>
 #include <cstring>
 
 #include "Common/Crypto/bn.h"
-#include "Common/Crypto/ec.h"
 #include "Common/Inline.h"
 #include "Common/Random.h"
 #include "Common/StringUtil.h"

diff --git a/Source/Core/Common/ENetUtil.cpp b/Source/Core/Common/ENetUtil.cpp
@@ -1,7 +1,7 @@
 // Copyright 2015 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "ENetUtil.h"
+#include "Common/ENetUtil.h"
 
 #include "Common/CommonTypes.h"
 

diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp
@@ -1,12 +1,13 @@
 // Copyright 2008 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/FileSearch.h"
+
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
 #include "Common/CommonPaths.h"
-#include "Common/FileSearch.h"
 #include "Common/StringUtil.h"
 
 #ifdef _MSC_VER

diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
@@ -1,6 +1,8 @@
 // Copyright 2008 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/FileUtil.h"
+
 #include <algorithm>
 #include <chrono>
 #include <cstddef>
@@ -22,7 +24,6 @@
 #ifdef __APPLE__
 #include "Common/DynamicLibrary.h"
 #endif
-#include "Common/FileUtil.h"
 #include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
 

diff --git a/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp b/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp
@@ -1,11 +1,12 @@
 // Copyright 2013 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/GL/GLExtensions/GLExtensions.h"
+
 #include <sstream>
 #include <unordered_map>
 
 #include "Common/GL/GLContext.h"
-#include "Common/GL/GLExtensions/GLExtensions.h"
 #include "Common/Logging/Log.h"
 
 #if defined(__linux__) || defined(__APPLE__)