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/qcocoamenubar.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/qcocoamenubar.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenubar.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.mm b/src/plugins/platforms/cocoa/qcocoamenubar.mm index 1b6b5a5de6..871cf10e8a 100644 --- a/src/plugins/platforms/cocoa/qcocoamenubar.mm +++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm @@ -79,7 +79,7 @@ QCocoaMenuBar::~QCocoaMenuBar() static_menubars.removeOne(this); if (!m_window.isNull() && m_window->menubar() == this) { - m_window->setMenubar(0); + m_window->setMenubar(nullptr); // Delete the children first so they do not cause // the native menu items to be hidden after @@ -229,7 +229,7 @@ void QCocoaMenuBar::handleReparent(QWindow *newParentWindow) if (!m_window.isNull()) m_window->setMenubar(nullptr); - if (newParentWindow == nullptr) { + if (!newParentWindow) { m_window.clear(); } else { newParentWindow->create(); @@ -264,7 +264,7 @@ void QCocoaMenuBar::updateMenuBarImmediately() QCocoaMenuBar *mb = findGlobalMenubar(); QCocoaWindow *cw = findWindowForMenubar(); - QWindow *win = cw ? cw->window() : 0; + QWindow *win = cw ? cw->window() : nullptr; if (win && (win->flags() & Qt::Popup) == Qt::Popup) { // context menus, comboboxes, etc. don't need to update the menubar, // but if an application has only Qt::Tool window(s) on start, |