diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2018-04-17 18:20:41 -0700 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2018-04-19 22:20:12 +0000 |
| commit | 7ee44dcb9c5c4ffaba0043d7d58e0d43ccc06195 (patch) | |
| tree | 5a0e04dd7cd7b808f4885ede50339418863f169b /src/plugins/platforms/cocoa/qcocoamenuitem.mm | |
| parent | 48defe41e1f6fb38800675922289dd7364fad8af (diff) | |
Cocoa QPA: Clean up 0 as pointer
We use nil for Objective-C null pointers and nullptr everywhere
else, including CoreFoundation and similar opaque types.
Change-Id: Id75c59413dec54bf4d8e83cf7ed0ff7f3d8bb480
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoamenuitem.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenuitem.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.mm b/src/plugins/platforms/cocoa/qcocoamenuitem.mm index ee70e059a1..30fde17abf 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuitem.mm +++ b/src/plugins/platforms/cocoa/qcocoamenuitem.mm @@ -113,7 +113,7 @@ QCocoaMenuItem::~QCocoaMenuItem() QMacAutoReleasePool pool; if (m_menu && m_menu->menuParent() == this) - m_menu->setMenuParent(0); + m_menu->setMenuParent(nullptr); if (m_merged) { [m_native setHidden:YES]; } else { @@ -141,7 +141,7 @@ void QCocoaMenuItem::setMenu(QPlatformMenu *menu) return; if (m_menu && m_menu->menuParent() == this) { - m_menu->setMenuParent(0); + m_menu->setMenuParent(nullptr); // Free the menu from its parent's influence m_menu->propagateEnabledState(true); if (m_native && m_menu->attachedItem() == m_native) |