From cdbe2f13ca91c0e1b2675e91e019f736d3b0d9eb Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Thu, 25 Jul 2019 16:14:56 -0500
Subject: [PATCH] Cocoa: Move slightly towards modern Objective-C

Inspired by https://github.com/glfw/glfw/commit/9a9568212c2dfd17fe46845eaa68ec0731de6173.
---
 glfw/cocoa_window.m  |  4 ++--
 kitty/cocoa_window.m | 10 +++++-----
 kitty/core_text.m    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/glfw/cocoa_window.m b/glfw/cocoa_window.m
index 52c21b97a..663be7543 100644
--- a/glfw/cocoa_window.m
+++ b/glfw/cocoa_window.m
@@ -59,7 +59,7 @@ static NSUInteger getStyleMask(_GLFWwindow* window)
 CGDirectDisplayID displayIDForWindow(_GLFWwindow *w) {
     NSWindow *nw = w->ns.object;
     NSDictionary *dict = [nw.screen deviceDescription];
-    NSNumber *displayIDns = [dict objectForKey:@"NSScreenNumber"];
+    NSNumber *displayIDns = dict[@"NSScreenNumber"];
     if (displayIDns) return [displayIDns unsignedIntValue];
     return (CGDirectDisplayID)-1;
 }
@@ -1275,7 +1275,7 @@ static void createMenuBar(void)
 
     for (i = 0;  i < sizeof(nameKeys) / sizeof(nameKeys[0]);  i++)
     {
-        id name = [bundleInfo objectForKey:nameKeys[i]];
+        id name = bundleInfo[nameKeys[i]];
         if (name &&
             [name isKindOfClass:[NSString class]] &&
             ![name isEqualToString:@""])
diff --git a/kitty/cocoa_window.m b/kitty/cocoa_window.m
index 948c74fb4..cccee1ade 100644
--- a/kitty/cocoa_window.m
+++ b/kitty/cocoa_window.m
@@ -49,7 +49,7 @@ find_app_name(void) {
 
     for (i = 0;  i < sizeof(name_keys) / sizeof(name_keys[0]);  i++)
     {
-        id name = [infoDictionary objectForKey:name_keys[i]];
+        id name = infoDictionary[name_keys[i]];
         if (name &&
             [name isKindOfClass:[NSString class]] &&
             ![name isEqualToString:@""])
@@ -60,7 +60,7 @@ find_app_name(void) {
 
     char** progname = _NSGetProgname();
     if (progname && *progname)
-        return [NSString stringWithUTF8String:*progname];
+        return @(*progname);
 
     // Really shouldn't get here
     return @"kitty";
@@ -171,7 +171,7 @@ cocoa_send_notification(PyObject *self UNUSED, PyObject *args) {
     NSUserNotification *n = [NSUserNotification new];
     NSImage *img = nil;
     if (path_to_image) {
-        NSString *p = [NSString stringWithUTF8String:path_to_image];
+        NSString *p = @(path_to_image);
         NSURL *url = [NSURL fileURLWithPath:p];
         img = [[NSImage alloc] initWithContentsOfURL:url];
         [url release]; [p release];
@@ -183,14 +183,14 @@ cocoa_send_notification(PyObject *self UNUSED, PyObject *args) {
     }
 #define SET(x) { \
     if (x) { \
-        NSString *t = [NSString stringWithUTF8String:x]; \
+        NSString *t = @(x); \
         n.x = t; \
         [t release]; \
     }}
     SET(title); SET(subtitle); SET(informativeText);
 #undef SET
     if (identifier) {
-        n.userInfo = @{@"user_id": [NSString stringWithUTF8String:identifier]};
+        n.userInfo = @{@"user_id": @(identifier)};
     }
     [center deliverNotification:n];
     Py_RETURN_NONE;
diff --git a/kitty/core_text.m b/kitty/core_text.m
index be244c69b..637e034d2 100644
--- a/kitty/core_text.m
+++ b/kitty/core_text.m
@@ -135,7 +135,7 @@ font_descriptor_from_python(PyObject *src) {
 
 #define SET(x, attr) \
     t = PyDict_GetItemString(src, #x); \
-    if (t) attrs[(id)attr] = [NSString stringWithUTF8String:PyUnicode_AsUTF8(t)];
+    if (t) attrs[(id)attr] = @(PyUnicode_AsUTF8(t));
 
     SET(family, kCTFontFamilyNameAttribute);
     SET(style, kCTFontStyleNameAttribute);