summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@qt.io>2018-04-19 10:32:43 -0700
committerGabriel de Dietrich <gabriel.dedietrich@qt.io>2018-04-25 17:07:46 +0000
commit446916c927674f11d32dfae6fdc457f902385061 (patch)
tree594f828f017957b5bcd867a482972c53abb67a6d /src/plugins/platforms
parent388c4ef9f78c8e6ae134c279aa2afae67c75be9c (diff)
QCocoaNSMenuItem: Add default initializer
Just tidying code a bit. Change-Id: I492535094533ee307d757bfbbcb41376291f8878 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/cocoa/qcocoamenuloader.mm9
-rw-r--r--src/plugins/platforms/cocoa/qcocoansmenu.h1
-rw-r--r--src/plugins/platforms/cocoa/qcocoansmenu.mm5
3 files changed, 10 insertions, 5 deletions
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()];
diff --git a/src/plugins/platforms/cocoa/qcocoansmenu.h b/src/plugins/platforms/cocoa/qcocoansmenu.h
index a4af56fa02..7806a5f921 100644
--- a/src/plugins/platforms/cocoa/qcocoansmenu.h
+++ b/src/plugins/platforms/cocoa/qcocoansmenu.h
@@ -82,6 +82,7 @@ QT_FORWARD_DECLARE_CLASS(QCocoaMenuItem);
+ (instancetype)separatorItemWithPlatformMenuItem:(QCocoaMenuItem *)menuItem;
- (instancetype)initWithPlatformMenuItem:(QCocoaMenuItem *)menuItem;
+- (instancetype)init;
@end
diff --git a/src/plugins/platforms/cocoa/qcocoansmenu.mm b/src/plugins/platforms/cocoa/qcocoansmenu.mm
index c082158313..6202d0c86e 100644
--- a/src/plugins/platforms/cocoa/qcocoansmenu.mm
+++ b/src/plugins/platforms/cocoa/qcocoansmenu.mm
@@ -119,6 +119,11 @@ static NSString *qt_mac_removePrivateUnicode(NSString* string)
return self;
}
+- (instancetype)init
+{
+ return [self initWithPlatformMenuItem:nullptr];
+}
+
- (QCocoaMenuItem *)platformMenuItem
{
return _platformMenuItem.data();