Replace Q_NULLPTR with nullptr where possible

Remaining uses of Q_NULLPTR are in:
src/corelib/global/qcompilerdetection.h
  (definition and documentation of Q_NULLPTR)
tests/manual/qcursor/qcursorhighdpi/main.cpp
  (a test executable compilable both under Qt4 and Qt5)

Change-Id: If6b074d91486e9b784138f4514f5c6d072acda9a
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp
index 51c690d43a..fc1b37f2f2 100644
--- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp
+++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp
@@ -68,7 +68,7 @@ QDBusPlatformMenuItem::~QDBusPlatformMenuItem()
 {
     menuItemsByID.remove(m_dbusID);
     if (m_subMenu)
-        static_cast<QDBusPlatformMenu *>(m_subMenu)->setContainingMenuItem(Q_NULLPTR);
+        static_cast<QDBusPlatformMenu *>(m_subMenu)->setContainingMenuItem(nullptr);
 }
 
 void QDBusPlatformMenuItem::setText(const QString &text)
@@ -88,7 +88,7 @@ void QDBusPlatformMenuItem::setIcon(const QIcon &icon)
 void QDBusPlatformMenuItem::setMenu(QPlatformMenu *menu)
 {
     if (m_subMenu)
-        static_cast<QDBusPlatformMenu *>(m_subMenu)->setContainingMenuItem(Q_NULLPTR);
+        static_cast<QDBusPlatformMenu *>(m_subMenu)->setContainingMenuItem(nullptr);
     m_subMenu = menu;
     if (menu)
         static_cast<QDBusPlatformMenu *>(menu)->setContainingMenuItem(this);
@@ -147,7 +147,7 @@ QDBusPlatformMenuItem *QDBusPlatformMenuItem::byId(int id)
     // a default-constructed nullptr value into menuItemsByID
     if (menuItemsByID.contains(id))
         return menuItemsByID[id];
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 QList<const QDBusPlatformMenuItem *> QDBusPlatformMenuItem::byIds(const QList<int> &ids)
@@ -165,14 +165,14 @@ QDBusPlatformMenu::QDBusPlatformMenu()
     : m_isEnabled(true)
     , m_isVisible(true)
     , m_revision(1)
-    , m_containingMenuItem(Q_NULLPTR)
+    , m_containingMenuItem(nullptr)
 {
 }
 
 QDBusPlatformMenu::~QDBusPlatformMenu()
 {
     if (m_containingMenuItem)
-        m_containingMenuItem->setMenu(Q_NULLPTR);
+        m_containingMenuItem->setMenu(nullptr);
 }
 
 void QDBusPlatformMenu::insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before)