Misc: Don't use deprecated fmt/core.h header

This commit is contained in:
TheLastRar 2025-01-15 21:26:10 +00:00 committed by lightningterror
parent c58f6f2f70
commit de9d08075e
44 changed files with 36 additions and 46 deletions

View File

@ -7,7 +7,6 @@
#include "Threading.h" #include "Threading.h"
#include <mutex> #include <mutex>
#include "fmt/core.h"
#ifdef _WIN32 #ifdef _WIN32
#include "RedtapeWindows.h" #include "RedtapeWindows.h"

View File

@ -5,7 +5,7 @@
#include "Pcsx2Defs.h" #include "Pcsx2Defs.h"
#include "fmt/core.h" #include "fmt/base.h"
#include <cstdarg> #include <cstdarg>
#include <string> #include <string>

View File

@ -5,7 +5,7 @@
#include "Pcsx2Defs.h" #include "Pcsx2Defs.h"
#include "fmt/core.h" #include "fmt/format.h"
#include <string> #include <string>

View File

@ -17,7 +17,7 @@
#include <ucontext.h> #include <ucontext.h>
#include <unistd.h> #include <unistd.h>
#include "fmt/core.h" #include "fmt/format.h"
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
#include "cpuinfo.h" #include "cpuinfo.h"

View File

@ -11,7 +11,7 @@
#include "common/Threading.h" #include "common/Threading.h"
#include "common/WindowInfo.h" #include "common/WindowInfo.h"
#include "fmt/core.h" #include "fmt/format.h"
#include <ctype.h> #include <ctype.h>
#include <time.h> #include <time.h>

View File

@ -5,7 +5,7 @@
#include "Pcsx2Defs.h" #include "Pcsx2Defs.h"
#include "fmt/core.h" #include "fmt/base.h"
#include <algorithm> #include <algorithm>
#include <cstdarg> #include <cstdarg>

View File

@ -10,7 +10,7 @@
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>
#include "fmt/core.h" #include "fmt/format.h"
#ifdef _WIN32 #ifdef _WIN32
#include "RedtapeWindows.h" #include "RedtapeWindows.h"

View File

@ -10,7 +10,6 @@
#include "common/RedtapeWindows.h" #include "common/RedtapeWindows.h"
#include "common/StringUtil.h" #include "common/StringUtil.h"
#include "fmt/core.h"
#include "fmt/format.h" #include "fmt/format.h"
#include <mutex> #include <mutex>

View File

@ -8,8 +8,6 @@
#include "common/Threading.h" #include "common/Threading.h"
#include "common/WindowInfo.h" #include "common/WindowInfo.h"
#include "fmt/core.h"
#include <mmsystem.h> #include <mmsystem.h>
#include <timeapi.h> #include <timeapi.h>
#include <VersionHelpers.h> #include <VersionHelpers.h>

View File

@ -13,7 +13,7 @@
#include "common/RedtapeWindows.h" #include "common/RedtapeWindows.h"
#endif #endif
#include "fmt/core.h" #include "fmt/format.h"
#include "common/Assertions.h" #include "common/Assertions.h"
#include "common/Console.h" #include "common/Console.h"

View File

@ -9,7 +9,6 @@
#include <QtCore/QFile> #include <QtCore/QFile>
#include "common/Console.h" #include "common/Console.h"
#include "fmt/core.h"
#include "VMManager.h" #include "VMManager.h"
#include "Models/BreakpointModel.h" #include "Models/BreakpointModel.h"

View File

@ -51,7 +51,7 @@
#include <QtGui/QClipboard> #include <QtGui/QClipboard>
#include <QtGui/QInputMethod> #include <QtGui/QInputMethod>
#include "fmt/core.h" #include "fmt/format.h"
#include <cmath> #include <cmath>
#include <csignal> #include <csignal>

View File

@ -23,7 +23,7 @@
#include <memory> #include <memory>
#include <time.h> #include <time.h>
#include "fmt/core.h" #include "fmt/format.h"
// TODO: FIXME! Should be platform specific. // TODO: FIXME! Should be platform specific.
#ifdef _WIN32 #ifdef _WIN32

View File

@ -9,7 +9,7 @@
#include "common/MD5Digest.h" #include "common/MD5Digest.h"
#include "common/StringUtil.h" #include "common/StringUtil.h"
#include "fmt/core.h" #include "fmt/format.h"
#include <algorithm> #include <algorithm>

View File

@ -8,7 +8,7 @@
#include "common/FileSystem.h" #include "common/FileSystem.h"
#include "common/StringUtil.h" #include "common/StringUtil.h"
#include "fmt/core.h" #include "fmt/format.h"
#include <errno.h> #include <errno.h>

View File

@ -5,7 +5,7 @@
#include "common/RedtapeWilCom.h" #include "common/RedtapeWilCom.h"
#include "common/StringUtil.h" #include "common/StringUtil.h"
#include "fmt/core.h" #include "fmt/format.h"
#include <stdio.h> #include <stdio.h>
#include <WinSock2.h> #include <WinSock2.h>

View File

@ -21,7 +21,7 @@
#include "common/StringUtil.h" #include "common/StringUtil.h"
#include "common/Timer.h" #include "common/Timer.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "IconsFontAwesome5.h" #include "IconsFontAwesome5.h"
#include <algorithm> #include <algorithm>

View File

@ -16,7 +16,7 @@
#include "imgui.h" #include "imgui.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "common/Error.h" #include "common/Error.h"
#include "common/FileSystem.h" #include "common/FileSystem.h"

View File

@ -18,7 +18,7 @@
#include <sstream> #include <sstream>
#include "ryml_std.hpp" #include "ryml_std.hpp"
#include "ryml.hpp" #include "ryml.hpp"
#include "fmt/core.h" #include "fmt/format.h"
#include "fmt/ranges.h" #include "fmt/ranges.h"
#include <fstream> #include <fstream>
#include <mutex> #include <mutex>

View File

@ -9,7 +9,7 @@
#include "common/WrappedMemCopy.h" #include "common/WrappedMemCopy.h"
#include "fmt/core.h" #include "fmt/format.h"
using namespace R5900; using namespace R5900;

View File

@ -47,7 +47,7 @@
#include "imgui_internal.h" #include "imgui_internal.h"
#include "fmt/chrono.h" #include "fmt/chrono.h"
#include "fmt/core.h" #include "fmt/format.h"
#include <array> #include <array>
#include <bitset> #include <bitset>

View File

@ -3,7 +3,7 @@
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#include "fmt/core.h" #include "fmt/format.h"
#include "Host.h" #include "Host.h"
#include "GS/Renderers/Common/GSDevice.h" #include "GS/Renderers/Common/GSDevice.h"
#include "GS/Renderers/Common/GSTexture.h" #include "GS/Renderers/Common/GSTexture.h"

View File

@ -23,7 +23,7 @@
#include "common/Path.h" #include "common/Path.h"
#include "common/Timer.h" #include "common/Timer.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "imgui.h" #include "imgui.h"
#include "imgui_internal.h" #include "imgui_internal.h"
#include "common/Image.h" #include "common/Image.h"

View File

@ -16,7 +16,7 @@
#include "IconsPromptFont.h" #include "IconsPromptFont.h"
#include "fmt/core.h" #include "fmt/format.h"
#include <array> #include <array>
#include <atomic> #include <atomic>

View File

@ -10,6 +10,8 @@
#include "IconsPromptFont.h" #include "IconsPromptFont.h"
#include "fmt/format.h"
#include <cmath> #include <cmath>
static const char* s_axis_names[XInputSource::NUM_AXES] = { static const char* s_axis_names[XInputSource::NUM_AXES] = {

View File

@ -43,5 +43,5 @@
// We use fmt a fair bit now. // We use fmt a fair bit now.
// fmt pch breaks GCC in debug builds: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114370 // fmt pch breaks GCC in debug builds: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114370
#if !defined(__GNUC__) || defined(__clang__) #if !defined(__GNUC__) || defined(__clang__)
#include "fmt/core.h" #include "fmt/format.h"
#endif #endif

View File

@ -7,7 +7,7 @@
#include "SIO/Pad/PadDualshock2.h" #include "SIO/Pad/PadDualshock2.h"
#include "SIO/Sio.h" #include "SIO/Sio.h"
#include <fmt/core.h> #include "fmt/format.h"
PadData::PadData(const int port, const int slot) PadData::PadData(const int port, const int slot)
{ {

View File

@ -10,7 +10,7 @@
#include "GS.h" #include "GS.h"
#include "Host.h" #include "Host.h"
#include <fmt/core.h> #include "fmt/format.h"
namespace InputRec namespace InputRec
{ {

View File

@ -20,7 +20,7 @@
#include "Host.h" #include "Host.h"
#include "IconsPromptFont.h" #include "IconsPromptFont.h"
#include "fmt/core.h" #include "fmt/format.h"
#include <map> #include <map>

View File

@ -17,7 +17,7 @@
#include "common/StringUtil.h" #include "common/StringUtil.h"
#include "common/Timer.h" #include "common/Timer.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "ryml_std.hpp" #include "ryml_std.hpp"
#include "ryml.hpp" #include "ryml.hpp"

View File

@ -10,8 +10,6 @@
#include "Config.h" #include "Config.h"
#include "fmt/core.h"
//#define DEBUG_WRITE_FOLDER_CARD_IN_MEMORY_TO_FILE_ON_CHANGE //#define DEBUG_WRITE_FOLDER_CARD_IN_MEMORY_TO_FILE_ON_CHANGE
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------

View File

@ -37,7 +37,7 @@
#include "common/StringUtil.h" #include "common/StringUtil.h"
#include "common/ZipHelpers.h" #include "common/ZipHelpers.h"
#include "fmt/core.h" #include "fmt/format.h"
#include <csetjmp> #include <csetjmp>
#include <png.h> #include <png.h>

View File

@ -13,7 +13,7 @@
#include "R3000A.h" #include "R3000A.h"
#include "R5900.h" #include "R5900.h"
#include "fmt/core.h" #include "fmt/format.h"
#include <cctype> #include <cctype>
#include <cstdarg> #include <cstdarg>

View File

@ -57,7 +57,7 @@
#include "IconsPromptFont.h" #include "IconsPromptFont.h"
#include "cpuinfo.h" #include "cpuinfo.h"
#include "discord_rpc.h" #include "discord_rpc.h"
#include "fmt/core.h" #include "fmt/format.h"
#include <atomic> #include <atomic>
#include <mutex> #include <mutex>

View File

@ -4,7 +4,6 @@
#pragma once #pragma once
#include <array> #include <array>
#include "fmt/core.h"
#include "common/AlignedMalloc.h" #include "common/AlignedMalloc.h"
// nVifBlock - Ordered for Hashing; the 'num' and 'upkType' fields are // nVifBlock - Ordered for Hashing; the 'num' and 'upkType' fields are

View File

@ -6,7 +6,7 @@
#include "Common.h" #include "Common.h"
#include "IopHw.h" #include "IopHw.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace IopMemory { namespace IopMemory {
namespace Internal { namespace Internal {

View File

@ -5,7 +5,7 @@
#include "R3000A.h" #include "R3000A.h"
#include "IopMem.h" #include "IopMem.h"
#include "fmt/core.h" #include "fmt/format.h"
static std::string psxout_buf; static std::string psxout_buf;

View File

@ -3,7 +3,7 @@
#pragma once #pragma once
#include "fmt/core.h" #include "fmt/format.h"
#define eeAddrInRange(name, addr) \ #define eeAddrInRange(name, addr) \
(addr >= EEMemoryMap::name##_Start && addr < EEMemoryMap::name##_End) (addr >= EEMemoryMap::name##_Start && addr < EEMemoryMap::name##_End)

View File

@ -27,7 +27,7 @@
#include "common/BitUtils.h" #include "common/BitUtils.h"
#include "common/Error.h" #include "common/Error.h"
#include "fmt/core.h" #include "fmt/format.h"
#include <bit> #include <bit>
#ifdef _M_X86 #ifdef _M_X86

View File

@ -5,7 +5,6 @@
#include "MTVU.h" #include "MTVU.h"
#include "common/Perf.h" #include "common/Perf.h"
#include "common/StringUtil.h" #include "common/StringUtil.h"
#include "fmt/core.h"
void dVifReset(int idx) void dVifReset(int idx)
{ {

View File

@ -3,7 +3,6 @@
#include "Vif_UnpackSSE.h" #include "Vif_UnpackSSE.h"
#include "common/Perf.h" #include "common/Perf.h"
#include "fmt/core.h"
#define xMOV8(regX, loc) xMOVSSZX(regX, loc) #define xMOV8(regX, loc) xMOVSSZX(regX, loc)
#define xMOV16(regX, loc) xMOVSSZX(regX, loc) #define xMOV16(regX, loc) xMOVSSZX(regX, loc)

View File

@ -26,8 +26,6 @@
#include "common/Perf.h" #include "common/Perf.h"
#include "DebugTools/Breakpoints.h" #include "DebugTools/Breakpoints.h"
#include "fmt/core.h"
// #define DUMP_BLOCKS 1 // #define DUMP_BLOCKS 1
// #define TRACE_BLOCKS 1 // #define TRACE_BLOCKS 1

View File

@ -8,7 +8,7 @@
#include "common/FileSystem.h" #include "common/FileSystem.h"
#include "common/Path.h" #include "common/Path.h"
#include "fmt/core.h" #include "fmt/format.h"
// writes text directly to mVU.logFile, no newlines appended. // writes text directly to mVU.logFile, no newlines appended.
_mVUt void __mVULog(const char* fmt, ...) _mVUt void __mVULog(const char* fmt, ...)

View File

@ -7,7 +7,7 @@
#include "common/ScopedGuard.h" #include "common/ScopedGuard.h"
#include "common/StringUtil.h" #include "common/StringUtil.h"
#include "fmt/core.h" #include "fmt/format.h"
#if defined(_WIN32) #if defined(_WIN32)
#include "7z.h" #include "7z.h"