Merge pull request #3120 from lioncash/osx

InputCommon: Use NSNumber numeric literals in Obj-C code
dolphin-emu · Oct 2, 2015 · 37825c5 · 37825c5
2 parents fb35371 + a306818
commit 37825c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
@@ -23,8 +23,8 @@
 {
 	// Buttons
 	NSDictionary *buttonDict = @{
-		@kIOHIDElementTypeKey      : [NSNumber numberWithInteger: kIOHIDElementTypeInput_Button],
-		@kIOHIDElementUsagePageKey : [NSNumber numberWithInteger: kHIDPage_Button]
+		@kIOHIDElementTypeKey      : @(kIOHIDElementTypeInput_Button),
+		@kIOHIDElementUsagePageKey : @(kHIDPage_Button)
 	};
 
 	CFArrayRef buttons = IOHIDDeviceCopyMatchingElements(m_device,
@@ -45,7 +45,7 @@
 
 	// Axes
 	NSDictionary *axisDict = @{
-		@kIOHIDElementTypeKey : [NSNumber numberWithInteger: kIOHIDElementTypeInput_Misc]
+		@kIOHIDElementTypeKey : @(kIOHIDElementTypeInput_Misc)
 	};
 
 	CFArrayRef axes = IOHIDDeviceCopyMatchingElements(m_device,

diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
@@ -23,9 +23,9 @@
 	// This class should only recieve Keyboard or Keypad devices
 	// Now, filter on just the buttons we can handle sanely
 	NSDictionary *matchingElements = @{
-		@kIOHIDElementTypeKey : [NSNumber numberWithInteger: kIOHIDElementTypeInput_Button],
-		@kIOHIDElementMinKey  : [NSNumber numberWithInteger: 0],
-		@kIOHIDElementMaxKey  : [NSNumber numberWithInteger: 1]
+		@kIOHIDElementTypeKey : @(kIOHIDElementTypeInput_Button),
+		@kIOHIDElementMinKey  : @0,
+		@kIOHIDElementMaxKey  : @1
 	};
 
 	CFArrayRef elements = IOHIDDeviceCopyMatchingElements(m_device,