From e0839a94781db6d62fbe26b90243a035c376cd6e Mon Sep 17 00:00:00 2001
From: Scott Mansell <phiren@gmail.com>
Date: Fri, 1 Jul 2016 15:05:24 +1200
Subject: Strip whitespace from Evdev and OSX controller names.

---
 Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm         | 4 +++-
 Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'Source/Core/InputCommon/ControllerInterface/OSX')

diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
index 48580cf98b..25caec2c4f 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
@@ -6,6 +6,8 @@
 #include <Foundation/Foundation.h>
 #include <IOKit/hid/IOHIDLib.h>
 
+#include "Common/StringUtil.h"
+
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/ControllerInterface/OSX/OSX.h"
 #include "InputCommon/ControllerInterface/OSX/OSXJoystick.h"
@@ -137,7 +139,7 @@ static void DeviceMatching_callback(void* inContext, IOReturn inResult, void* in
                                     IOHIDDeviceRef inIOHIDDeviceRef)
 {
   NSString* pName = (NSString*)IOHIDDeviceGetProperty(inIOHIDDeviceRef, CFSTR(kIOHIDProductKey));
-  std::string name = (pName != nullptr) ? [pName UTF8String] : "Unknown device";
+  std::string name = (pName != nullptr) ? StripSpaces([pName UTF8String]) : "Unknown device";
 
   DeviceDebugPrint(inIOHIDDeviceRef);
 
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
index 7eb05a52ce..06c883ac4e 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
@@ -7,6 +7,7 @@
 #include <Foundation/Foundation.h>
 #include <IOKit/hid/IOHIDLib.h>
 
+#include "Common/StringUtil.h"
 #include "InputCommon/ControllerInterface/OSX/OSXJoystick.h"
 
 namespace ciface
@@ -110,7 +111,7 @@ std::string Joystick::Button::GetName() const
 {
   std::ostringstream s;
   s << IOHIDElementGetUsage(m_element);
-  return std::string("Button ") + s.str();
+  return std::string("Button ") + StripSpaces(s.str());
 }
 
 Joystick::Axis::Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction dir)
@@ -150,7 +151,7 @@ Joystick::Axis::Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction d
   {
     std::ostringstream s;
     s << usage;
-    description = s.str();
+    description = StripSpaces(s.str());
     break;
   }
   }
-- 
cgit v1.2.3