From 08e183d322981c705ba9fc7f4f1476cc7e7e5f23 Mon Sep 17 00:00:00 2001 From: "Dr. Dystopia" Date: Sun, 19 Jul 2026 20:30:21 +0200 Subject: Replace string concatination with `fmt::format` --- Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.h | 7 ++++--- Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface') diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.h b/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.h index 0a431866e7..a997437f61 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.h +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.h @@ -7,6 +7,7 @@ #include #include +#include #include "Common/MathUtil.h" @@ -16,17 +17,17 @@ namespace { std::string GetLegacyButtonName(int index) { - return "Button " + std::to_string(index); + return fmt::format("Button {}", index); } std::string GetLegacyAxisName(int index, int range) { - return "Axis " + std::to_string(index) + (range < 0 ? '-' : '+'); + return fmt::format("Axis {}{}", index, range < 0 ? '-' : '+'); } std::string GetLegacyHatName(int index, int direction) { - return "Hat " + std::to_string(index) + ' ' + "NESW"[direction]; + return fmt::format("Hat {} {}", index, "NESW"[direction]); } constexpr int GetDirectionFromHatMask(int mask) diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp index bb51d0026e..0f6730720f 100644 --- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp +++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp @@ -14,6 +14,8 @@ #include #include +#include + #include "Common/Assert.h" #include "Common/Flag.h" #include "Common/Logging/Log.h" @@ -114,7 +116,7 @@ protected: } } - std::string GetIndexedName() const { return "Button " + std::to_string(m_index); } + std::string GetIndexedName() const { return fmt::format("Button {}", m_index); } const u8 m_index; }; @@ -184,7 +186,7 @@ public: protected: std::string GetIndexedName() const { - return "Axis " + std::to_string(m_index) + (m_range < 0 ? '-' : '+'); + return fmt::format("Axis {}{}", m_index, m_range < 0 ? '-' : '+'); } private: -- cgit v1.2.3