From 17a15a20f28ed95e0e69d403687416c023c77e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Mon, 24 Dec 2018 23:41:29 +0100 Subject: [PATCH] Cocoa: Move to modern Objective-C literals --- src/cocoa_window.m | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 043a5f0d..0a0da8c0 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -657,7 +657,7 @@ static const NSRange kEmptyRange = { NSNotFound, 0 }; _glfwInputKey(window, key, [event keyCode], GLFW_PRESS, mods); - [self interpretKeyEvents:[NSArray arrayWithObject:event]]; + [self interpretKeyEvents:@[event]]; } - (void)flagsChanged:(NSEvent *)event @@ -1005,10 +1005,7 @@ static GLFWbool initializeAppKit(void) [NSApp run]; // Press and Hold prevents some keys from emitting repeated characters - NSDictionary* defaults = - [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:NO], - @"ApplePressAndHoldEnabled", - nil]; + NSDictionary* defaults = @{@"ApplePressAndHoldEnabled":@NO}; [[NSUserDefaults standardUserDefaults] registerDefaults:defaults]; return GLFW_TRUE; @@ -1731,10 +1728,8 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor) void _glfwPlatformSetClipboardString(const char* string) { - NSArray* types = [NSArray arrayWithObjects:NSPasteboardTypeString, nil]; - NSPasteboard* pasteboard = [NSPasteboard generalPasteboard]; - [pasteboard declareTypes:types owner:nil]; + [pasteboard declareTypes:@[NSPasteboardTypeString] owner:nil]; [pasteboard setString:[NSString stringWithUTF8String:string] forType:NSPasteboardTypeString]; }