Q_NULLPTR -> nullptr

Task-number: QTBUG-52736
Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp
index e9a332d65..34a9518d8 100644
--- a/src/core/qchangearbiter.cpp
+++ b/src/core/qchangearbiter.cpp
@@ -76,9 +76,9 @@ namespace Qt3DCore {
 QChangeArbiter::QChangeArbiter(QObject *parent)
     : QObject(parent)
     , m_mutex(QMutex::Recursive)
-    , m_jobManager(Q_NULLPTR)
-    , m_postman(Q_NULLPTR)
-    , m_scene(Q_NULLPTR)
+    , m_jobManager(nullptr)
+    , m_postman(nullptr)
+    , m_scene(nullptr)
 {
     // The QMutex has to be recursive to handle the case where :
     // 1) SyncChanges is called, mutex is locked
@@ -91,7 +91,7 @@ QChangeArbiter::QChangeArbiter(QObject *parent)
 
 QChangeArbiter::~QChangeArbiter()
 {
-    if (m_jobManager != Q_NULLPTR)
+    if (m_jobManager != nullptr)
         m_jobManager->waitForPerThreadFunction(QChangeArbiter::destroyThreadLocalChangeQueue, this);
     m_lockingChangeQueues.clear();
     m_changeQueues.clear();
@@ -226,7 +226,7 @@ void QChangeArbiter::unregisterObserver(QObserverInterface *observer, QNodeId no
 // Called from the QAspectThread context, no need to lock
 void QChangeArbiter::unregisterSceneObserver(QSceneObserverInterface *observer)
 {
-    if (observer != Q_NULLPTR)
+    if (observer != nullptr)
         m_sceneObservers.removeOne(observer);
 }
 
@@ -288,7 +288,7 @@ void QChangeArbiter::destroyUnmanagedThreadLocalChangeQueue(void *changeArbiter)
     if (arbiter->tlsChangeQueue()->hasLocalData()) {
         QChangeQueue *localChangeQueue = arbiter->tlsChangeQueue()->localData();
         arbiter->removeLockingChangeQueue(localChangeQueue);
-        arbiter->tlsChangeQueue()->setLocalData(Q_NULLPTR);
+        arbiter->tlsChangeQueue()->setLocalData(nullptr);
     }
 }
 
@@ -314,7 +314,7 @@ void QChangeArbiter::destroyThreadLocalChangeQueue(void *changeArbiter)
     if (arbiter->tlsChangeQueue()->hasLocalData()) {
         QChangeQueue *localChangeQueue = arbiter->tlsChangeQueue()->localData();
         arbiter->removeChangeQueue(localChangeQueue);
-        arbiter->tlsChangeQueue()->setLocalData(Q_NULLPTR);
+        arbiter->tlsChangeQueue()->setLocalData(nullptr);
     }
 }