summaryrefslogtreecommitdiff
path: root/macosx/hotkeys.m
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-09-10 18:43:18 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-09-10 18:43:18 +0000
commit4b4f074b6659f33b4f9e1c9784861409d8debd97 (patch)
tree0fbd7f1ea28c9431cd8bafbaaac5d689d55d5dd6 /macosx/hotkeys.m
parenta3ac4842bd5c7058b1363f7d3307f61724fc7178 (diff)
downloadpcsxr-4b4f074b6659f33b4f9e1c9784861409d8debd97.tar.gz
Convert Objective-C code to modern syntax, mainly for the NSDictionaries.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87115 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/hotkeys.m')
-rwxr-xr-xmacosx/hotkeys.m16
1 files changed, 8 insertions, 8 deletions
diff --git a/macosx/hotkeys.m b/macosx/hotkeys.m
index 2a619422..16a5d50c 100755
--- a/macosx/hotkeys.m
+++ b/macosx/hotkeys.m
@@ -44,7 +44,7 @@ void prevState() {
BOOL handleHotkey(NSString* keyCode) {
if([EmuThread active]) { // Don't catch hotkeys if there is no emulation
- NSNumber *ident = [hotkeys objectForKey:keyCode];
+ NSNumber *ident = hotkeys[keyCode];
if(ident != nil) {
switch([ident intValue]) {
@@ -87,19 +87,19 @@ BOOL handleHotkey(NSString* keyCode) {
void setupHotkey(int hk, NSString *label, NSDictionary *binding) {
if(binding != nil)
- [hotkeys setObject:@(hk) forKey:[binding objectForKey:@"keyCode"]];
+ hotkeys[binding[@"keyCode"]] = @(hk);
}
void setupHotkeys() {
NSDictionary *bindings = [[NSUserDefaults standardUserDefaults] objectForKey:@"HotkeyBindings"];
hotkeys = [[NSMutableDictionary alloc] initWithCapacity:[bindings count]];
- setupHotkey(HK_FAST_FORWARD, @"FastForward", [bindings objectForKey:@"FastForward"]);
- setupHotkey(HK_SAVE_STATE, @"SaveState", [bindings objectForKey:@"SaveState"]);
- setupHotkey(HK_LOAD_STATE, @"LoadState", [bindings objectForKey:@"LoadState"]);
- setupHotkey(HK_NEXT_STATE, @"NextState", [bindings objectForKey:@"NextState"]);
- setupHotkey(HK_PREV_STATE, @"PrevState", [bindings objectForKey:@"PrevState"]);
- setupHotkey(HK_FRAME_LIMIT, @"FrameLimit", [bindings objectForKey:@"FrameLimit"]);
+ setupHotkey(HK_FAST_FORWARD, @"FastForward", bindings[@"FastForward"]);
+ setupHotkey(HK_SAVE_STATE, @"SaveState", bindings[@"SaveState"]);
+ setupHotkey(HK_LOAD_STATE, @"LoadState", bindings[@"LoadState"]);
+ setupHotkey(HK_NEXT_STATE, @"NextState", bindings[@"NextState"]);
+ setupHotkey(HK_PREV_STATE, @"PrevState", bindings[@"PrevState"]);
+ setupHotkey(HK_FRAME_LIMIT, @"FrameLimit", bindings[@"FrameLimit"]);
currentState = 0;
}