diff --git a/3rdparty/include/IconsFontAwesome6.h b/3rdparty/include/IconsFontAwesome.h similarity index 100% rename from 3rdparty/include/IconsFontAwesome6.h rename to 3rdparty/include/IconsFontAwesome.h diff --git a/pcsx2/CDVD/CDVDcommon.cpp b/pcsx2/CDVD/CDVDcommon.cpp index a4a40e11bf..f28f8c2635 100644 --- a/pcsx2/CDVD/CDVDcommon.cpp +++ b/pcsx2/CDVD/CDVDcommon.cpp @@ -6,7 +6,7 @@ #include "CDVD/IsoFileFormats.h" #include "Config.h" #include "Host.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "common/Assertions.h" #include "common/Console.h" diff --git a/pcsx2/GS/GS.cpp b/pcsx2/GS/GS.cpp index 04a54603e2..2dd04d24a6 100644 --- a/pcsx2/GS/GS.cpp +++ b/pcsx2/GS/GS.cpp @@ -48,7 +48,7 @@ #include "common/SmallString.h" #include "common/StringUtil.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "fmt/format.h" diff --git a/pcsx2/GS/GSCapture.cpp b/pcsx2/GS/GSCapture.cpp index 25495c07f5..07f16c1b1f 100644 --- a/pcsx2/GS/GSCapture.cpp +++ b/pcsx2/GS/GSCapture.cpp @@ -10,7 +10,7 @@ #include "SPU2/spu2.h" #include "Host.h" #include "Host/AudioStream.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "common/Assertions.h" #include "common/Console.h" #include "common/BitUtils.h" diff --git a/pcsx2/GS/Renderers/Common/GSRenderer.cpp b/pcsx2/GS/Renderers/Common/GSRenderer.cpp index c7f8cf1d9d..21ee53fade 100644 --- a/pcsx2/GS/Renderers/Common/GSRenderer.cpp +++ b/pcsx2/GS/Renderers/Common/GSRenderer.cpp @@ -22,7 +22,7 @@ #include "common/Timer.h" #include "fmt/format.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include #include diff --git a/pcsx2/GS/Renderers/DX11/D3D.cpp b/pcsx2/GS/Renderers/DX11/D3D.cpp index a0c0635aa3..2a77d73f67 100644 --- a/pcsx2/GS/Renderers/DX11/D3D.cpp +++ b/pcsx2/GS/Renderers/DX11/D3D.cpp @@ -15,7 +15,7 @@ #include "common/StringUtil.h" #include "common/Path.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include #include diff --git a/pcsx2/GS/Renderers/DX11/GSDevice11.cpp b/pcsx2/GS/Renderers/DX11/GSDevice11.cpp index 2376b2fd53..78fb987fe0 100644 --- a/pcsx2/GS/Renderers/DX11/GSDevice11.cpp +++ b/pcsx2/GS/Renderers/DX11/GSDevice11.cpp @@ -16,7 +16,7 @@ #include "common/StringUtil.h" #include "imgui.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include #include diff --git a/pcsx2/GS/Renderers/HW/GSTextureReplacements.cpp b/pcsx2/GS/Renderers/HW/GSTextureReplacements.cpp index eb373225eb..c430ae3970 100644 --- a/pcsx2/GS/Renderers/HW/GSTextureReplacements.cpp +++ b/pcsx2/GS/Renderers/HW/GSTextureReplacements.cpp @@ -12,7 +12,7 @@ #include "Config.h" #include "Host.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "GS/GSExtra.h" #include "GS/GSLocalMemory.h" #include "GS/Renderers/HW/GSTextureReplacements.h" diff --git a/pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp b/pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp index ab8a172a40..f5e35d57d0 100644 --- a/pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp +++ b/pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp @@ -15,7 +15,7 @@ #include "common/StringUtil.h" #include "imgui.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include #include diff --git a/pcsx2/GameDatabase.cpp b/pcsx2/GameDatabase.cpp index b90c4ad5ce..c215157788 100644 --- a/pcsx2/GameDatabase.cpp +++ b/pcsx2/GameDatabase.cpp @@ -4,7 +4,7 @@ #include "GameDatabase.h" #include "GS/GS.h" #include "Host.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "vtlb.h" #include "common/Console.h" diff --git a/pcsx2/Host/CubebAudioStream.cpp b/pcsx2/Host/CubebAudioStream.cpp index 78a96e413b..1b16971ede 100644 --- a/pcsx2/Host/CubebAudioStream.cpp +++ b/pcsx2/Host/CubebAudioStream.cpp @@ -13,7 +13,7 @@ #include "cubeb/cubeb.h" #include "fmt/format.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #ifdef _WIN32 #include "common/RedtapeWindows.h" diff --git a/pcsx2/Hotkeys.cpp b/pcsx2/Hotkeys.cpp index 6a7a7327bb..a16faef0f5 100644 --- a/pcsx2/Hotkeys.cpp +++ b/pcsx2/Hotkeys.cpp @@ -4,7 +4,7 @@ #include "Achievements.h" #include "GS.h" #include "Host.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "ImGui/FullscreenUI.h" #include "ImGui/ImGuiOverlays.h" #include "Input/InputManager.h" diff --git a/pcsx2/ImGui/FullscreenUI.cpp b/pcsx2/ImGui/FullscreenUI.cpp index 4391558708..4789284928 100644 --- a/pcsx2/ImGui/FullscreenUI.cpp +++ b/pcsx2/ImGui/FullscreenUI.cpp @@ -45,7 +45,7 @@ #include "SIO/Pad/Pad.h" #include "SIO/Sio.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "IconsPromptFont.h" #include "imgui.h" #include "imgui_internal.h" diff --git a/pcsx2/ImGui/ImGuiFullscreen.cpp b/pcsx2/ImGui/ImGuiFullscreen.cpp index d3bbd63caf..3bd6493b35 100644 --- a/pcsx2/ImGui/ImGuiFullscreen.cpp +++ b/pcsx2/ImGui/ImGuiFullscreen.cpp @@ -22,7 +22,7 @@ #include "common/Threading.h" #include "common/Timer.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "imgui_internal.h" #include "imgui_stdlib.h" diff --git a/pcsx2/ImGui/ImGuiFullscreen.h b/pcsx2/ImGui/ImGuiFullscreen.h index ea99d8871b..9e64149134 100644 --- a/pcsx2/ImGui/ImGuiFullscreen.h +++ b/pcsx2/ImGui/ImGuiFullscreen.h @@ -5,7 +5,7 @@ #include "common/Pcsx2Defs.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "imgui.h" #include "imgui_internal.h" diff --git a/pcsx2/ImGui/ImGuiManager.cpp b/pcsx2/ImGui/ImGuiManager.cpp index f287e52cd5..bdf297a419 100644 --- a/pcsx2/ImGui/ImGuiManager.cpp +++ b/pcsx2/ImGui/ImGuiManager.cpp @@ -6,7 +6,7 @@ #include "Counters.h" #include "GS/GS.h" #include "Host.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "ImGui/FullscreenUI.h" #include "ImGui/ImGuiFullscreen.h" #include "ImGui/ImGuiManager.h" diff --git a/pcsx2/ImGui/ImGuiOverlays.cpp b/pcsx2/ImGui/ImGuiOverlays.cpp index dd6121e75a..8cad18cdee 100644 --- a/pcsx2/ImGui/ImGuiOverlays.cpp +++ b/pcsx2/ImGui/ImGuiOverlays.cpp @@ -10,7 +10,7 @@ #include "GS/Renderers/Common/GSDevice.h" #include "GS/Renderers/HW/GSTextureReplacements.h" #include "Host.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "IconsPromptFont.h" #include "ImGui/FullscreenUI.h" #include "ImGui/ImGuiAnimated.h" diff --git a/pcsx2/MTGS.cpp b/pcsx2/MTGS.cpp index b75a8ac02a..eb20acf885 100644 --- a/pcsx2/MTGS.cpp +++ b/pcsx2/MTGS.cpp @@ -6,7 +6,7 @@ #include "MTGS.h" #include "MTVU.h" #include "Host.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "VMManager.h" #include "common/FPControl.h" diff --git a/pcsx2/Patch.cpp b/pcsx2/Patch.cpp index f5fc66dd1c..f475527096 100644 --- a/pcsx2/Patch.cpp +++ b/pcsx2/Patch.cpp @@ -20,7 +20,7 @@ #include "Patch.h" #include "R5900.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "fmt/format.h" #include diff --git a/pcsx2/Recording/Utilities/InputRecordingLogger.cpp b/pcsx2/Recording/Utilities/InputRecordingLogger.cpp index ec9de6b9cb..e51e7b6d39 100644 --- a/pcsx2/Recording/Utilities/InputRecordingLogger.cpp +++ b/pcsx2/Recording/Utilities/InputRecordingLogger.cpp @@ -6,7 +6,7 @@ #include "DebugTools/Debug.h" #include "common/Console.h" #include "IconsPromptFont.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "GS.h" #include "Host.h" diff --git a/pcsx2/SIO/Pad/Pad.cpp b/pcsx2/SIO/Pad/Pad.cpp index 92eea97ee2..a1950e04d8 100644 --- a/pcsx2/SIO/Pad/Pad.cpp +++ b/pcsx2/SIO/Pad/Pad.cpp @@ -14,7 +14,7 @@ #include "Input/SDLInputSource.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "VMManager.h" #include "common/Assertions.h" diff --git a/pcsx2/SaveState.cpp b/pcsx2/SaveState.cpp index 659f9d8062..7deafe6aa8 100644 --- a/pcsx2/SaveState.cpp +++ b/pcsx2/SaveState.cpp @@ -38,7 +38,7 @@ #include "common/StringUtil.h" #include "common/ZipHelpers.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "fmt/format.h" #include diff --git a/pcsx2/USB/usb-msd/usb-msd.cpp b/pcsx2/USB/usb-msd/usb-msd.cpp index 3e47b16cc2..00d59aac9b 100644 --- a/pcsx2/USB/usb-msd/usb-msd.cpp +++ b/pcsx2/USB/usb-msd/usb-msd.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team // SPDX-License-Identifier: GPL-3.0+ -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "USB/qemu-usb/qusb.h" #include "USB/qemu-usb/desc.h" #include "USB/qemu-usb/USBinternal.h" diff --git a/pcsx2/USB/usb-pad/usb-pad.cpp b/pcsx2/USB/usb-pad/usb-pad.cpp index 27a6c0b060..79c6088840 100644 --- a/pcsx2/USB/usb-pad/usb-pad.cpp +++ b/pcsx2/USB/usb-pad/usb-pad.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0+ #include "usb-pad.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "IconsPromptFont.h" #include "USB/qemu-usb/USBinternal.h" #include "USB/usb-pad/usb-pad-sdl-ff.h" diff --git a/pcsx2/USB/usb-pad/usb-train.cpp b/pcsx2/USB/usb-pad/usb-train.cpp index f2b89fd506..e76b00de51 100644 --- a/pcsx2/USB/usb-pad/usb-train.cpp +++ b/pcsx2/USB/usb-pad/usb-train.cpp @@ -5,7 +5,7 @@ #include "common/Console.h" #include "Host.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "IconsPromptFont.h" #include "Input/InputManager.h" #include "StateWrapper.h" diff --git a/pcsx2/USB/usb-pad/usb-turntable.cpp b/pcsx2/USB/usb-pad/usb-turntable.cpp index d13f8b6c2e..64b76685f4 100644 --- a/pcsx2/USB/usb-pad/usb-turntable.cpp +++ b/pcsx2/USB/usb-pad/usb-turntable.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0+ #include "Host.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "IconsPromptFont.h" #include "Input/InputManager.h" #include "StateWrapper.h" diff --git a/pcsx2/USB/usb-printer/usb-printer.cpp b/pcsx2/USB/usb-printer/usb-printer.cpp index bbd4bfe495..5523754ee3 100644 --- a/pcsx2/USB/usb-printer/usb-printer.cpp +++ b/pcsx2/USB/usb-printer/usb-printer.cpp @@ -14,7 +14,7 @@ #include "fmt/format.h" #include "StateWrapper.h" #include "Host.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" namespace usb_printer { diff --git a/pcsx2/VMManager.cpp b/pcsx2/VMManager.cpp index 872b0d8ef3..614ca42a04 100644 --- a/pcsx2/VMManager.cpp +++ b/pcsx2/VMManager.cpp @@ -55,7 +55,7 @@ #include "common/Timer.h" #include "common/emitter/x86emitter.h" -#include "IconsFontAwesome6.h" +#include "IconsFontAwesome.h" #include "IconsPromptFont.h" #include "cpuinfo.h" #include "discord_rpc.h" diff --git a/tools/generate_update_fa_glyph_ranges.py b/tools/generate_update_fa_glyph_ranges.py index a01b2ad7dd..88eb525ba5 100755 --- a/tools/generate_update_fa_glyph_ranges.py +++ b/tools/generate_update_fa_glyph_ranges.py @@ -23,7 +23,7 @@ import functools # pylint: disable=bare-except, disable=missing-function-docstring src_dirs = [os.path.join(os.path.dirname(__file__), "..", "pcsx2"), os.path.join(os.path.dirname(__file__), "..", "pcsx2-qt")] -fa_file = os.path.join(os.path.dirname(__file__), "..", "3rdparty", "include", "IconsFontAwesome6.h") +fa_file = os.path.join(os.path.dirname(__file__), "..", "3rdparty", "include", "IconsFontAwesome.h") pf_file = os.path.join(os.path.dirname(__file__), "..", "3rdparty", "include", "IconsPromptFont.h") dst_file = os.path.join(os.path.dirname(__file__), "..", "pcsx2", "ImGui", "ImGuiManager.cpp")