From 89067e66f9c8c60f9bc045970fdcb088457f4903 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Fri, 15 Jul 2022 19:53:10 +0200 Subject: [PATCH] InputCommon: Get rid of static strings. --- .../InputCommon/ControllerInterface/DInput/DInputJoystick.cpp | 2 +- .../ControllerInterface/DInput/DInputKeyboardMouse.cpp | 4 ++-- .../ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index ac72d383be..abef48f157 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -293,7 +293,7 @@ std::string Joystick::Axis::GetName() const std::string Joystick::Hat::GetName() const { - static char tmpstr[] = "Hat . ."; + char tmpstr[] = "Hat . ."; tmpstr[4] = (char)('0' + m_index); tmpstr[6] = "NESW"[m_direction]; return tmpstr; diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp index 0d3ba01449..3fe850715c 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp @@ -275,7 +275,7 @@ std::string KeyboardMouse::Button::GetName() const std::string KeyboardMouse::Axis::GetName() const { - static char tmpstr[] = "Axis .."; + char tmpstr[] = "Axis .."; tmpstr[5] = (char)('X' + m_index); tmpstr[6] = (m_range < 0 ? '-' : '+'); return tmpstr; @@ -283,7 +283,7 @@ std::string KeyboardMouse::Axis::GetName() const std::string KeyboardMouse::Cursor::GetName() const { - static char tmpstr[] = "Cursor .."; + char tmpstr[] = "Cursor .."; tmpstr[7] = (char)('X' + m_index); tmpstr[8] = (m_positive ? '+' : '-'); return tmpstr; diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm index 7aae59bf95..6b1790149b 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm @@ -226,7 +226,7 @@ ControlState KeyboardAndMouse::Button::GetState() const std::string KeyboardAndMouse::Cursor::GetName() const { - static char tmpstr[] = "Cursor .."; + char tmpstr[] = "Cursor .."; tmpstr[7] = (char)('X' + m_index); tmpstr[8] = (m_positive ? '+' : '-'); return tmpstr;