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, 9 insertions, 9 deletions

diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp
index 9baf94726d..8480c15fb7 100644
--- a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp
+++ b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp
@@ -102,17 +102,17 @@ static int instanceCount = 0;
 */
 
 QDBusTrayIcon::QDBusTrayIcon()
-    : m_dbusConnection(Q_NULLPTR)
+    : m_dbusConnection(nullptr)
     , m_adaptor(new QStatusNotifierItemAdaptor(this))
-    , m_menuAdaptor(Q_NULLPTR)
-    , m_menu(Q_NULLPTR)
-    , m_notifier(Q_NULLPTR)
+    , m_menuAdaptor(nullptr)
+    , m_menu(nullptr)
+    , m_notifier(nullptr)
     , m_instanceId(KDEItemFormat.arg(QCoreApplication::applicationPid()).arg(++instanceCount))
     , m_category(QStringLiteral("ApplicationStatus"))
     , m_defaultStatus(QStringLiteral("Active")) // be visible all the time.  QSystemTrayIcon has no API to control this.
     , m_status(m_defaultStatus)
-    , m_tempIcon(Q_NULLPTR)
-    , m_tempAttentionIcon(Q_NULLPTR)
+    , m_tempIcon(nullptr)
+    , m_tempAttentionIcon(nullptr)
     , m_registered(false)
 {
     qCDebug(qLcTray);
@@ -149,9 +149,9 @@ void QDBusTrayIcon::cleanup()
     if (m_registered)
         dBusConnection()->unregisterTrayIcon(this);
     delete m_dbusConnection;
-    m_dbusConnection = Q_NULLPTR;
+    m_dbusConnection = nullptr;
     delete m_notifier;
-    m_notifier = Q_NULLPTR;
+    m_notifier = nullptr;
     m_registered = false;
 }
 
@@ -203,7 +203,7 @@ QTemporaryFile *QDBusTrayIcon::tempIcon(const QIcon &icon)
         necessity_checked = true;
     }
     if (!necessary)
-        return Q_NULLPTR;
+        return nullptr;
     qreal dpr = qGuiApp->devicePixelRatio();
     QTemporaryFile *ret = new QTemporaryFile(TempFileTemplate, this);
     ret->open();