summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/OSX
diff options
context:
space:
mode:
authorShawn Hoffman <godisgovernment@gmail.com>2022-07-19 15:13:26 -0700
committerShawn Hoffman <godisgovernment@gmail.com>2022-07-25 18:40:12 -0700
commitf92541fbd9da5091636aac09fdabd1a5fd0191ce (patch)
tree51f4add6038f41c213f392559501a6121ee28ec3 /Source/Core/InputCommon/ControllerInterface/OSX
parente4ff49769c687e892219dab628ad5c7850efa49d (diff)
StripSpaces: only strip spaces
StripWhitespace maintains old behavior
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/OSX')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm4
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
index 10c30ffb21..2d0651b6bd 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
@@ -139,7 +139,7 @@ static std::string GetDeviceRefName(IOHIDDeviceRef inIOHIDDeviceRef)
{
const NSString* name = reinterpret_cast<const NSString*>(
IOHIDDeviceGetProperty(inIOHIDDeviceRef, CFSTR(kIOHIDProductKey)));
- return (name != nullptr) ? std::string(StripSpaces([name UTF8String])) : "Unknown device";
+ return (name != nullptr) ? std::string(StripWhitespace([name UTF8String])) : "Unknown device";
}
static void DeviceRemovalCallback(void* inContext, IOReturn inResult, void* inSender,
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
index f8ee6e5446..82ad68e205 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
@@ -164,7 +164,7 @@ std::string Joystick::Button::GetName() const
{
std::ostringstream s;
s << IOHIDElementGetUsage(m_element);
- return std::string("Button ").append(StripSpaces(s.str()));
+ return std::string("Button ").append(StripWhitespace(s.str()));
}
Joystick::Axis::Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction dir)
@@ -210,7 +210,7 @@ Joystick::Axis::Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction d
std::ostringstream s;
s << "CK-";
s << elementCookie;
- description = StripSpaces(s.str());
+ description = StripWhitespace(s.str());
break;
}
}