Merge pull request #14738 from tygyh/Replace-concatination-with-stdformat

Replace string concatination with `fmt::format`

3 files changed, 10 insertions, 7 deletions

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 <SDL3/SDL_gamepad.h>
 #include <SDL3/SDL_haptic.h>
+#include <fmt/format.h>
 
 #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 <sys/eventfd.h>
 #include <unistd.h>
 
+#include <fmt/format.h>
+
 #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:
diff --git a/Source/Core/InputCommon/InputProfile.cpp b/Source/Core/InputCommon/InputProfile.cpp
index f483e8a9c3..e1db4e8a46 100644
--- a/Source/Core/InputCommon/InputProfile.cpp
+++ b/Source/Core/InputCommon/InputProfile.cpp
@@ -133,7 +133,7 @@ void ProfileCycler::CycleProfile(CycleDirection cycle_direction, InputConfig* de
   }
   else
   {
-    Core::DisplayMessage("No controller found for index: " + std::to_string(controller_index),
+    Core::DisplayMessage(fmt::format("No controller found for index: {}", controller_index),
                          display_message_ms);
   }
 }
@@ -172,7 +172,7 @@ void ProfileCycler::CycleProfileForGame(CycleDirection cycle_direction,
   }
   else
   {
-    Core::DisplayMessage("No controller found for index: " + std::to_string(controller_index),
+    Core::DisplayMessage(fmt::format("No controller found for index: {}", controller_index),
                          display_message_ms);
   }
 }