diff options
| author | Kevin Funk <kfunk@kde.org> | 2017-09-24 23:55:01 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-26 17:14:41 +0000 |
| commit | a530bf57935406c5268abffb29b437cb63d04324 (patch) | |
| tree | fb93ea3be360f61f1877d856e0eec7f795fb1609 /src/controls | |
| parent | 8370c0b6b0855db53eb41e037268cd87adf154d2 (diff) | |
| download | qtquickcontrols-a530bf57935406c5268abffb29b437cb63d04324.tar.gz | |
Replace Q_NULLPTR with nullptr
Change-Id: I43296a94e6242a9e77039a0369e3a2292891fec7
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/Private/qquicktreemodeladaptor.cpp | 2 | ||||
| -rw-r--r-- | src/controls/qquickmenupopupwindow.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Private/qquicktreemodeladaptor.cpp b/src/controls/Private/qquicktreemodeladaptor.cpp index 26db62a3..495abc9c 100644 --- a/src/controls/Private/qquicktreemodeladaptor.cpp +++ b/src/controls/Private/qquicktreemodeladaptor.cpp @@ -529,7 +529,7 @@ void QQuickTreeModelAdaptor1::modelHasBeenDestroyed() { // The model has been deleted. This should behave as if no model was set clearModelData(); - emit modelChanged(Q_NULLPTR); + emit modelChanged(nullptr); } void QQuickTreeModelAdaptor1::modelHasBeenReset() diff --git a/src/controls/qquickmenupopupwindow.cpp b/src/controls/qquickmenupopupwindow.cpp index 937a5ea5..fb231510 100644 --- a/src/controls/qquickmenupopupwindow.cpp +++ b/src/controls/qquickmenupopupwindow.cpp @@ -182,7 +182,7 @@ bool QQuickMenuPopupWindow1::shouldForwardEventAfterDismiss(QMouseEvent *e) cons { // If the event falls inside this item the event should not be forwarded. // For example for comboboxes or top menus of the menubar - QQuickMenuBar1 *mb = m_menu ? m_menu->menuBar() : Q_NULLPTR; + QQuickMenuBar1 *mb = m_menu ? m_menu->menuBar() : nullptr; QQuickItem *item = mb && !mb->isNative() ? mb->contentItem() : menu()->visualItem(); QWindow *window = transientParent(); if (item && window && item->window() == window) { |