ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3120 from lioncash/osx 

InputCommon: Use NSNumber numeric literals in Obj-C code
This commit is contained in:
Lioncash 2015-10-02 13:38:41 -04:00
parent fb35371e86 a30681834c
commit 37825c59dd
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
View File

@ -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,

6
Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
View File

@ -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,