From de9d08075e845912f375ef9501969f430ea642f6 Mon Sep 17 00:00:00 2001 From: TheLastRar Date: Wed, 15 Jan 2025 21:26:10 +0000 Subject: [PATCH] Misc: Don't use deprecated fmt/core.h header --- common/Assertions.cpp | 1 - common/Console.h | 2 +- common/Error.h | 2 +- common/Linux/LnxHostSys.cpp | 2 +- common/Linux/LnxMisc.cpp | 2 +- common/SmallString.h | 2 +- common/StringUtil.cpp | 2 +- common/Windows/WinHostSys.cpp | 1 - common/Windows/WinMisc.cpp | 2 -- pcsx2-gsrunner/Main.cpp | 2 +- pcsx2-qt/Debugger/DebuggerSettingsManager.cpp | 1 - pcsx2-qt/QtHost.cpp | 2 +- pcsx2/CDVD/CDVDcommon.cpp | 2 +- pcsx2/CDVD/IsoHasher.cpp | 2 +- pcsx2/CDVD/OutputIsoFile.cpp | 2 +- pcsx2/DEV9/Win32/tap-win32.cpp | 2 +- pcsx2/GS/Renderers/Common/GSRenderer.cpp | 2 +- pcsx2/GSDumpReplayer.cpp | 2 +- pcsx2/GameDatabase.cpp | 2 +- pcsx2/Hw.cpp | 2 +- pcsx2/ImGui/FullscreenUI.cpp | 2 +- pcsx2/ImGui/ImGuiFullscreen.cpp | 2 +- pcsx2/ImGui/ImGuiManager.cpp | 2 +- pcsx2/Input/InputManager.cpp | 2 +- pcsx2/Input/XInputSource.cpp | 2 ++ pcsx2/PrecompiledHeader.h | 2 +- pcsx2/Recording/PadData.cpp | 2 +- pcsx2/Recording/Utilities/InputRecordingLogger.cpp | 2 +- pcsx2/SIO/Memcard/MemoryCardFile.cpp | 2 +- pcsx2/SIO/Memcard/MemoryCardFolder.cpp | 2 +- pcsx2/SIO/Memcard/MemoryCardFolder.h | 2 -- pcsx2/SaveState.cpp | 2 +- pcsx2/SourceLog.cpp | 2 +- pcsx2/VMManager.cpp | 2 +- pcsx2/Vif_HashBucket.h | 1 - pcsx2/ps2/Iop/IopHw_Internal.h | 2 +- pcsx2/ps2/Iop/PsxBios.cpp | 2 +- pcsx2/ps2/eeHwTraceLog.inl | 2 +- pcsx2/vtlb.cpp | 2 +- pcsx2/x86/Vif_Dynarec.cpp | 1 - pcsx2/x86/Vif_UnpackSSE.cpp | 1 - pcsx2/x86/iR3000A.cpp | 2 -- pcsx2/x86/microVU_Log.inl | 2 +- updater/UpdaterExtractor.h | 2 +- 44 files changed, 36 insertions(+), 46 deletions(-) diff --git a/common/Assertions.cpp b/common/Assertions.cpp index 754d481034..6cfe8508c2 100644 --- a/common/Assertions.cpp +++ b/common/Assertions.cpp @@ -7,7 +7,6 @@ #include "Threading.h" #include -#include "fmt/core.h" #ifdef _WIN32 #include "RedtapeWindows.h" diff --git a/common/Console.h b/common/Console.h index 45d6dcc776..f928a61d6d 100644 --- a/common/Console.h +++ b/common/Console.h @@ -5,7 +5,7 @@ #include "Pcsx2Defs.h" -#include "fmt/core.h" +#include "fmt/base.h" #include #include diff --git a/common/Error.h b/common/Error.h index c3c48c3c36..94955948df 100644 --- a/common/Error.h +++ b/common/Error.h @@ -5,7 +5,7 @@ #include "Pcsx2Defs.h" -#include "fmt/core.h" +#include "fmt/format.h" #include diff --git a/common/Linux/LnxHostSys.cpp b/common/Linux/LnxHostSys.cpp index 54a8e2f24a..104ceeab35 100644 --- a/common/Linux/LnxHostSys.cpp +++ b/common/Linux/LnxHostSys.cpp @@ -17,7 +17,7 @@ #include #include -#include "fmt/core.h" +#include "fmt/format.h" #if defined(__FreeBSD__) #include "cpuinfo.h" diff --git a/common/Linux/LnxMisc.cpp b/common/Linux/LnxMisc.cpp index b564adaf49..2c36c9bab7 100644 --- a/common/Linux/LnxMisc.cpp +++ b/common/Linux/LnxMisc.cpp @@ -11,7 +11,7 @@ #include "common/Threading.h" #include "common/WindowInfo.h" -#include "fmt/core.h" +#include "fmt/format.h" #include #include diff --git a/common/SmallString.h b/common/SmallString.h index 00bfa76b3c..ee0e777740 100644 --- a/common/SmallString.h +++ b/common/SmallString.h @@ -5,7 +5,7 @@ #include "Pcsx2Defs.h" -#include "fmt/core.h" +#include "fmt/base.h" #include #include diff --git a/common/StringUtil.cpp b/common/StringUtil.cpp index f520d97ce8..14cc9de6a2 100644 --- a/common/StringUtil.cpp +++ b/common/StringUtil.cpp @@ -10,7 +10,7 @@ #include #include -#include "fmt/core.h" +#include "fmt/format.h" #ifdef _WIN32 #include "RedtapeWindows.h" diff --git a/common/Windows/WinHostSys.cpp b/common/Windows/WinHostSys.cpp index 54e76fa6cc..1e13bd7e99 100644 --- a/common/Windows/WinHostSys.cpp +++ b/common/Windows/WinHostSys.cpp @@ -10,7 +10,6 @@ #include "common/RedtapeWindows.h" #include "common/StringUtil.h" -#include "fmt/core.h" #include "fmt/format.h" #include diff --git a/common/Windows/WinMisc.cpp b/common/Windows/WinMisc.cpp index cc9b2929d8..5de77b51f7 100644 --- a/common/Windows/WinMisc.cpp +++ b/common/Windows/WinMisc.cpp @@ -8,8 +8,6 @@ #include "common/Threading.h" #include "common/WindowInfo.h" -#include "fmt/core.h" - #include #include #include diff --git a/pcsx2-gsrunner/Main.cpp b/pcsx2-gsrunner/Main.cpp index d3ad1e8182..fe27b2922f 100644 --- a/pcsx2-gsrunner/Main.cpp +++ b/pcsx2-gsrunner/Main.cpp @@ -13,7 +13,7 @@ #include "common/RedtapeWindows.h" #endif -#include "fmt/core.h" +#include "fmt/format.h" #include "common/Assertions.h" #include "common/Console.h" diff --git a/pcsx2-qt/Debugger/DebuggerSettingsManager.cpp b/pcsx2-qt/Debugger/DebuggerSettingsManager.cpp index aa5193c2ac..4096acd196 100644 --- a/pcsx2-qt/Debugger/DebuggerSettingsManager.cpp +++ b/pcsx2-qt/Debugger/DebuggerSettingsManager.cpp @@ -9,7 +9,6 @@ #include #include "common/Console.h" -#include "fmt/core.h" #include "VMManager.h" #include "Models/BreakpointModel.h" diff --git a/pcsx2-qt/QtHost.cpp b/pcsx2-qt/QtHost.cpp index fcc976d44a..186e2078a5 100644 --- a/pcsx2-qt/QtHost.cpp +++ b/pcsx2-qt/QtHost.cpp @@ -51,7 +51,7 @@ #include #include -#include "fmt/core.h" +#include "fmt/format.h" #include #include diff --git a/pcsx2/CDVD/CDVDcommon.cpp b/pcsx2/CDVD/CDVDcommon.cpp index 5162b85440..8218655566 100644 --- a/pcsx2/CDVD/CDVDcommon.cpp +++ b/pcsx2/CDVD/CDVDcommon.cpp @@ -23,7 +23,7 @@ #include #include -#include "fmt/core.h" +#include "fmt/format.h" // TODO: FIXME! Should be platform specific. #ifdef _WIN32 diff --git a/pcsx2/CDVD/IsoHasher.cpp b/pcsx2/CDVD/IsoHasher.cpp index af05d0f6d6..4efc1d5829 100644 --- a/pcsx2/CDVD/IsoHasher.cpp +++ b/pcsx2/CDVD/IsoHasher.cpp @@ -9,7 +9,7 @@ #include "common/MD5Digest.h" #include "common/StringUtil.h" -#include "fmt/core.h" +#include "fmt/format.h" #include diff --git a/pcsx2/CDVD/OutputIsoFile.cpp b/pcsx2/CDVD/OutputIsoFile.cpp index 9e072e54fe..f1f531a875 100644 --- a/pcsx2/CDVD/OutputIsoFile.cpp +++ b/pcsx2/CDVD/OutputIsoFile.cpp @@ -8,7 +8,7 @@ #include "common/FileSystem.h" #include "common/StringUtil.h" -#include "fmt/core.h" +#include "fmt/format.h" #include diff --git a/pcsx2/DEV9/Win32/tap-win32.cpp b/pcsx2/DEV9/Win32/tap-win32.cpp index d52ba6a400..6cf35f2289 100644 --- a/pcsx2/DEV9/Win32/tap-win32.cpp +++ b/pcsx2/DEV9/Win32/tap-win32.cpp @@ -5,7 +5,7 @@ #include "common/RedtapeWilCom.h" #include "common/StringUtil.h" -#include "fmt/core.h" +#include "fmt/format.h" #include #include diff --git a/pcsx2/GS/Renderers/Common/GSRenderer.cpp b/pcsx2/GS/Renderers/Common/GSRenderer.cpp index e564e0e6d2..95fa243e7d 100644 --- a/pcsx2/GS/Renderers/Common/GSRenderer.cpp +++ b/pcsx2/GS/Renderers/Common/GSRenderer.cpp @@ -21,7 +21,7 @@ #include "common/StringUtil.h" #include "common/Timer.h" -#include "fmt/core.h" +#include "fmt/format.h" #include "IconsFontAwesome5.h" #include diff --git a/pcsx2/GSDumpReplayer.cpp b/pcsx2/GSDumpReplayer.cpp index 46e20cf7fb..6e8dbe5c02 100644 --- a/pcsx2/GSDumpReplayer.cpp +++ b/pcsx2/GSDumpReplayer.cpp @@ -16,7 +16,7 @@ #include "imgui.h" -#include "fmt/core.h" +#include "fmt/format.h" #include "common/Error.h" #include "common/FileSystem.h" diff --git a/pcsx2/GameDatabase.cpp b/pcsx2/GameDatabase.cpp index 6d6a814d63..165af8c840 100644 --- a/pcsx2/GameDatabase.cpp +++ b/pcsx2/GameDatabase.cpp @@ -18,7 +18,7 @@ #include #include "ryml_std.hpp" #include "ryml.hpp" -#include "fmt/core.h" +#include "fmt/format.h" #include "fmt/ranges.h" #include #include diff --git a/pcsx2/Hw.cpp b/pcsx2/Hw.cpp index 64f3d1df1b..f2ccdb559b 100644 --- a/pcsx2/Hw.cpp +++ b/pcsx2/Hw.cpp @@ -9,7 +9,7 @@ #include "common/WrappedMemCopy.h" -#include "fmt/core.h" +#include "fmt/format.h" using namespace R5900; diff --git a/pcsx2/ImGui/FullscreenUI.cpp b/pcsx2/ImGui/FullscreenUI.cpp index 44afb555a5..71eeff42ef 100644 --- a/pcsx2/ImGui/FullscreenUI.cpp +++ b/pcsx2/ImGui/FullscreenUI.cpp @@ -47,7 +47,7 @@ #include "imgui_internal.h" #include "fmt/chrono.h" -#include "fmt/core.h" +#include "fmt/format.h" #include #include diff --git a/pcsx2/ImGui/ImGuiFullscreen.cpp b/pcsx2/ImGui/ImGuiFullscreen.cpp index 8d9a8a07e0..c7a9b999eb 100644 --- a/pcsx2/ImGui/ImGuiFullscreen.cpp +++ b/pcsx2/ImGui/ImGuiFullscreen.cpp @@ -3,7 +3,7 @@ #define IMGUI_DEFINE_MATH_OPERATORS -#include "fmt/core.h" +#include "fmt/format.h" #include "Host.h" #include "GS/Renderers/Common/GSDevice.h" #include "GS/Renderers/Common/GSTexture.h" diff --git a/pcsx2/ImGui/ImGuiManager.cpp b/pcsx2/ImGui/ImGuiManager.cpp index 234565ce32..8dc4d9ca8a 100644 --- a/pcsx2/ImGui/ImGuiManager.cpp +++ b/pcsx2/ImGui/ImGuiManager.cpp @@ -23,7 +23,7 @@ #include "common/Path.h" #include "common/Timer.h" -#include "fmt/core.h" +#include "fmt/format.h" #include "imgui.h" #include "imgui_internal.h" #include "common/Image.h" diff --git a/pcsx2/Input/InputManager.cpp b/pcsx2/Input/InputManager.cpp index 33dde367af..9b1e1c929c 100644 --- a/pcsx2/Input/InputManager.cpp +++ b/pcsx2/Input/InputManager.cpp @@ -16,7 +16,7 @@ #include "IconsPromptFont.h" -#include "fmt/core.h" +#include "fmt/format.h" #include #include diff --git a/pcsx2/Input/XInputSource.cpp b/pcsx2/Input/XInputSource.cpp index 215f8e55d7..b60c0cf794 100644 --- a/pcsx2/Input/XInputSource.cpp +++ b/pcsx2/Input/XInputSource.cpp @@ -10,6 +10,8 @@ #include "IconsPromptFont.h" +#include "fmt/format.h" + #include static const char* s_axis_names[XInputSource::NUM_AXES] = { diff --git a/pcsx2/PrecompiledHeader.h b/pcsx2/PrecompiledHeader.h index c558b6c223..8a8c28abc5 100644 --- a/pcsx2/PrecompiledHeader.h +++ b/pcsx2/PrecompiledHeader.h @@ -43,5 +43,5 @@ // We use fmt a fair bit now. // fmt pch breaks GCC in debug builds: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114370 #if !defined(__GNUC__) || defined(__clang__) -#include "fmt/core.h" +#include "fmt/format.h" #endif diff --git a/pcsx2/Recording/PadData.cpp b/pcsx2/Recording/PadData.cpp index c07233618c..e384ff2338 100644 --- a/pcsx2/Recording/PadData.cpp +++ b/pcsx2/Recording/PadData.cpp @@ -7,7 +7,7 @@ #include "SIO/Pad/PadDualshock2.h" #include "SIO/Sio.h" -#include +#include "fmt/format.h" PadData::PadData(const int port, const int slot) { diff --git a/pcsx2/Recording/Utilities/InputRecordingLogger.cpp b/pcsx2/Recording/Utilities/InputRecordingLogger.cpp index 434acf6a99..5a7f32d42c 100644 --- a/pcsx2/Recording/Utilities/InputRecordingLogger.cpp +++ b/pcsx2/Recording/Utilities/InputRecordingLogger.cpp @@ -10,7 +10,7 @@ #include "GS.h" #include "Host.h" -#include +#include "fmt/format.h" namespace InputRec { diff --git a/pcsx2/SIO/Memcard/MemoryCardFile.cpp b/pcsx2/SIO/Memcard/MemoryCardFile.cpp index 032cef212a..08afa1a26e 100644 --- a/pcsx2/SIO/Memcard/MemoryCardFile.cpp +++ b/pcsx2/SIO/Memcard/MemoryCardFile.cpp @@ -20,7 +20,7 @@ #include "Host.h" #include "IconsPromptFont.h" -#include "fmt/core.h" +#include "fmt/format.h" #include diff --git a/pcsx2/SIO/Memcard/MemoryCardFolder.cpp b/pcsx2/SIO/Memcard/MemoryCardFolder.cpp index 2d857dae61..be6b889529 100644 --- a/pcsx2/SIO/Memcard/MemoryCardFolder.cpp +++ b/pcsx2/SIO/Memcard/MemoryCardFolder.cpp @@ -17,7 +17,7 @@ #include "common/StringUtil.h" #include "common/Timer.h" -#include "fmt/core.h" +#include "fmt/format.h" #include "ryml_std.hpp" #include "ryml.hpp" diff --git a/pcsx2/SIO/Memcard/MemoryCardFolder.h b/pcsx2/SIO/Memcard/MemoryCardFolder.h index 7f5dc6d424..1fce0d9aba 100644 --- a/pcsx2/SIO/Memcard/MemoryCardFolder.h +++ b/pcsx2/SIO/Memcard/MemoryCardFolder.h @@ -10,8 +10,6 @@ #include "Config.h" -#include "fmt/core.h" - //#define DEBUG_WRITE_FOLDER_CARD_IN_MEMORY_TO_FILE_ON_CHANGE // -------------------------------------------------------------------------------------- diff --git a/pcsx2/SaveState.cpp b/pcsx2/SaveState.cpp index e7719814cf..fbc990dd44 100644 --- a/pcsx2/SaveState.cpp +++ b/pcsx2/SaveState.cpp @@ -37,7 +37,7 @@ #include "common/StringUtil.h" #include "common/ZipHelpers.h" -#include "fmt/core.h" +#include "fmt/format.h" #include #include diff --git a/pcsx2/SourceLog.cpp b/pcsx2/SourceLog.cpp index 582a70cd14..73448d5f51 100644 --- a/pcsx2/SourceLog.cpp +++ b/pcsx2/SourceLog.cpp @@ -13,7 +13,7 @@ #include "R3000A.h" #include "R5900.h" -#include "fmt/core.h" +#include "fmt/format.h" #include #include diff --git a/pcsx2/VMManager.cpp b/pcsx2/VMManager.cpp index ba11e44ed8..1b4ab39180 100644 --- a/pcsx2/VMManager.cpp +++ b/pcsx2/VMManager.cpp @@ -57,7 +57,7 @@ #include "IconsPromptFont.h" #include "cpuinfo.h" #include "discord_rpc.h" -#include "fmt/core.h" +#include "fmt/format.h" #include #include diff --git a/pcsx2/Vif_HashBucket.h b/pcsx2/Vif_HashBucket.h index 6e650d0458..ad04cf6264 100644 --- a/pcsx2/Vif_HashBucket.h +++ b/pcsx2/Vif_HashBucket.h @@ -4,7 +4,6 @@ #pragma once #include -#include "fmt/core.h" #include "common/AlignedMalloc.h" // nVifBlock - Ordered for Hashing; the 'num' and 'upkType' fields are diff --git a/pcsx2/ps2/Iop/IopHw_Internal.h b/pcsx2/ps2/Iop/IopHw_Internal.h index 66baa54191..eb3dfb551e 100644 --- a/pcsx2/ps2/Iop/IopHw_Internal.h +++ b/pcsx2/ps2/Iop/IopHw_Internal.h @@ -6,7 +6,7 @@ #include "Common.h" #include "IopHw.h" -#include "fmt/core.h" +#include "fmt/format.h" namespace IopMemory { namespace Internal { diff --git a/pcsx2/ps2/Iop/PsxBios.cpp b/pcsx2/ps2/Iop/PsxBios.cpp index 3810bf462e..acf6e54adf 100644 --- a/pcsx2/ps2/Iop/PsxBios.cpp +++ b/pcsx2/ps2/Iop/PsxBios.cpp @@ -5,7 +5,7 @@ #include "R3000A.h" #include "IopMem.h" -#include "fmt/core.h" +#include "fmt/format.h" static std::string psxout_buf; diff --git a/pcsx2/ps2/eeHwTraceLog.inl b/pcsx2/ps2/eeHwTraceLog.inl index ebd3fd94c3..f44345dda9 100644 --- a/pcsx2/ps2/eeHwTraceLog.inl +++ b/pcsx2/ps2/eeHwTraceLog.inl @@ -3,7 +3,7 @@ #pragma once -#include "fmt/core.h" +#include "fmt/format.h" #define eeAddrInRange(name, addr) \ (addr >= EEMemoryMap::name##_Start && addr < EEMemoryMap::name##_End) diff --git a/pcsx2/vtlb.cpp b/pcsx2/vtlb.cpp index c0d5919f39..d1026a3e8b 100644 --- a/pcsx2/vtlb.cpp +++ b/pcsx2/vtlb.cpp @@ -27,7 +27,7 @@ #include "common/BitUtils.h" #include "common/Error.h" -#include "fmt/core.h" +#include "fmt/format.h" #include #ifdef _M_X86 diff --git a/pcsx2/x86/Vif_Dynarec.cpp b/pcsx2/x86/Vif_Dynarec.cpp index 71bb58d1eb..d93abf7981 100644 --- a/pcsx2/x86/Vif_Dynarec.cpp +++ b/pcsx2/x86/Vif_Dynarec.cpp @@ -5,7 +5,6 @@ #include "MTVU.h" #include "common/Perf.h" #include "common/StringUtil.h" -#include "fmt/core.h" void dVifReset(int idx) { diff --git a/pcsx2/x86/Vif_UnpackSSE.cpp b/pcsx2/x86/Vif_UnpackSSE.cpp index 469409e484..8ea1900ad6 100644 --- a/pcsx2/x86/Vif_UnpackSSE.cpp +++ b/pcsx2/x86/Vif_UnpackSSE.cpp @@ -3,7 +3,6 @@ #include "Vif_UnpackSSE.h" #include "common/Perf.h" -#include "fmt/core.h" #define xMOV8(regX, loc) xMOVSSZX(regX, loc) #define xMOV16(regX, loc) xMOVSSZX(regX, loc) diff --git a/pcsx2/x86/iR3000A.cpp b/pcsx2/x86/iR3000A.cpp index 4a6bfc777f..36807b78ed 100644 --- a/pcsx2/x86/iR3000A.cpp +++ b/pcsx2/x86/iR3000A.cpp @@ -26,8 +26,6 @@ #include "common/Perf.h" #include "DebugTools/Breakpoints.h" -#include "fmt/core.h" - // #define DUMP_BLOCKS 1 // #define TRACE_BLOCKS 1 diff --git a/pcsx2/x86/microVU_Log.inl b/pcsx2/x86/microVU_Log.inl index 31d146e133..1b77f300c5 100644 --- a/pcsx2/x86/microVU_Log.inl +++ b/pcsx2/x86/microVU_Log.inl @@ -8,7 +8,7 @@ #include "common/FileSystem.h" #include "common/Path.h" -#include "fmt/core.h" +#include "fmt/format.h" // writes text directly to mVU.logFile, no newlines appended. _mVUt void __mVULog(const char* fmt, ...) diff --git a/updater/UpdaterExtractor.h b/updater/UpdaterExtractor.h index 7069c3f251..dfcdcaad02 100644 --- a/updater/UpdaterExtractor.h +++ b/updater/UpdaterExtractor.h @@ -7,7 +7,7 @@ #include "common/ScopedGuard.h" #include "common/StringUtil.h" -#include "fmt/core.h" +#include "fmt/format.h" #if defined(_WIN32) #include "7z.h"