diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-10-02 13:23:46 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-10-02 13:23:46 -0400 |
| commit | a30681834c78fcf218fcdbbbe377032a2947a001 (patch) | |
| tree | dc9d563cc18828cf276290118eb927eeebb0a82a /Source/Core/InputCommon/ControllerInterface | |
| parent | fb35371e869dfc73176540f0209e53390f346725 (diff) | |
InputCommon: Use NSNumber numeric literals in Obj-C code
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm | 6 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm index 234625a40f..0c8a199d5d 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm @@ -23,8 +23,8 @@ Joystick::Joystick(IOHIDDeviceRef device, std::string name, int index) { // 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 @@ Joystick::Joystick(IOHIDDeviceRef device, std::string name, int index) // 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 index 9c5707bc5d..759e25b295 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm @@ -23,9 +23,9 @@ Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, int index, void *win // 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, |