From 446916c927674f11d32dfae6fdc457f902385061 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Thu, 19 Apr 2018 10:32:43 -0700 Subject: QCocoaNSMenuItem: Add default initializer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Just tidying code a bit. Change-Id: I492535094533ee307d757bfbbcb41376291f8878 Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/cocoa/qcocoamenuloader.mm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/plugins/platforms/cocoa/qcocoamenuloader.mm') diff --git a/src/plugins/platforms/cocoa/qcocoamenuloader.mm b/src/plugins/platforms/cocoa/qcocoamenuloader.mm index 4439587392..4b2a695bcf 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuloader.mm +++ b/src/plugins/platforms/cocoa/qcocoamenuloader.mm @@ -96,7 +96,7 @@ appItem.submenu = appMenu; // About Application - aboutItem = [[QCocoaNSMenuItem alloc] initWithPlatformMenuItem:nullptr]; + aboutItem = [[QCocoaNSMenuItem alloc] init]; aboutItem.title = [@"About " stringByAppendingString:appName]; // FIXME This seems useless since barely adding a QAction // with AboutRole role will reset the target/action @@ -108,7 +108,7 @@ [appMenu addItem:aboutItem]; // About Qt (shameless self-promotion) - aboutQtItem = [[QCocoaNSMenuItem alloc] initWithPlatformMenuItem:nullptr]; + aboutQtItem = [[QCocoaNSMenuItem alloc] init]; aboutQtItem.title = @"About Qt"; // Disable until a QAction is associated aboutQtItem.enabled = NO; @@ -118,7 +118,7 @@ [appMenu addItem:[NSMenuItem separatorItem]]; // Preferences - preferencesItem = [[QCocoaNSMenuItem alloc] initWithPlatformMenuItem:nullptr]; + preferencesItem = [[QCocoaNSMenuItem alloc] init]; preferencesItem.title = @"Preferences…"; preferencesItem.keyEquivalent = @","; // Disable until a QAction is associated @@ -168,7 +168,7 @@ [appMenu addItem:[NSMenuItem separatorItem]]; // Quit Application - quitItem = [[QCocoaNSMenuItem alloc] initWithPlatformMenuItem:nullptr]; + quitItem = [[QCocoaNSMenuItem alloc] init]; quitItem.title = [@"Quit " stringByAppendingString:appName]; quitItem.keyEquivalent = @"q"; // This will remain true until synced with a QCocoaMenuItem. @@ -319,7 +319,6 @@ - (void)qtTranslateApplicationMenu { - #ifndef QT_NO_TRANSLATION [servicesItem setTitle:qt_mac_applicationmenu_string(ServicesAppMenuItem).toNSString()]; [hideItem setTitle:qt_mac_applicationmenu_string(HideAppMenuItem).arg(qt_mac_applicationName()).toNSString()]; -- cgit v1.2.3