Replace Q_NULLPTR -> nullptr

Skip the moc/ directory intentionally, since it contains
third-party code

Change-Id: I97105e475c109231e001dc4525b3096a06601868
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>

37 files changed, 68 insertions, 68 deletions

diff --git a/examples/remoteobjects/cppclient/main.cpp b/examples/remoteobjects/cppclient/main.cpp
index 516eba4..b7c11d1 100644
--- a/examples/remoteobjects/cppclient/main.cpp
+++ b/examples/remoteobjects/cppclient/main.cpp
@@ -39,7 +39,7 @@ class tester : public QObject
 {
     Q_OBJECT
 public:
-    tester() : QObject(Q_NULLPTR)
+    tester() : QObject(nullptr)
     {
         QRemoteObjectNode m_client(QUrl(QStringLiteral("local:registry")));
         ptr1.reset(m_client.acquire< MinuteTimerReplica >());
diff --git a/examples/remoteobjects/plugins/plugin.cpp b/examples/remoteobjects/plugins/plugin.cpp
index a6f8c3b..5d4e7a9 100644
--- a/examples/remoteobjects/plugins/plugin.cpp
+++ b/examples/remoteobjects/plugins/plugin.cpp
@@ -56,7 +56,7 @@ class TimeModel : public QObject
     Q_PROPERTY(bool isValid READ isValid NOTIFY isValidChanged)
 
 public:
-    TimeModel(QObject *parent=0) : QObject(parent), d_ptr(Q_NULLPTR)
+    TimeModel(QObject *parent = nullptr) : QObject(parent), d_ptr(nullptr)
     {
         d_ptr.reset(m_client.acquire< MinuteTimerReplica >());
         connect(d_ptr.data(), SIGNAL(hourChanged()), this, SIGNAL(timeChanged()));
diff --git a/examples/remoteobjects/server/timemodel.h b/examples/remoteobjects/server/timemodel.h
index dcfd9d3..181261d 100644
--- a/examples/remoteobjects/server/timemodel.h
+++ b/examples/remoteobjects/server/timemodel.h
@@ -38,7 +38,7 @@ class MinuteTimer : public MinuteTimerSimpleSource
 {
     Q_OBJECT
 public:
-    MinuteTimer(QObject *parent=Q_NULLPTR);
+    MinuteTimer(QObject *parent = nullptr);
     virtual ~MinuteTimer();
 
 public slots:
diff --git a/examples/remoteobjects/simpleswitch/directconnectclient/client.cpp b/examples/remoteobjects/simpleswitch/directconnectclient/client.cpp
index d528f05..e1b76d0 100644
--- a/examples/remoteobjects/simpleswitch/directconnectclient/client.cpp
+++ b/examples/remoteobjects/simpleswitch/directconnectclient/client.cpp
@@ -35,7 +35,7 @@
 
 // constructor
 Client::Client(QSharedPointer<SimpleSwitchReplica> ptr) :
-    QObject(Q_NULLPTR), reptr(ptr)
+    QObject(nullptr), reptr(ptr)
 {
     //connect signal for replica initialized with initialization slot
     initConnections();
diff --git a/examples/remoteobjects/simpleswitch/directconnectdynamicclient/dynamicclient.cpp b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/dynamicclient.cpp
index 629e7e4..8094f8a 100644
--- a/examples/remoteobjects/simpleswitch/directconnectdynamicclient/dynamicclient.cpp
+++ b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/dynamicclient.cpp
@@ -36,7 +36,7 @@
 
 // constructor
 DynamicClient::DynamicClient(QSharedPointer<QRemoteObjectDynamicReplica> ptr) :
-    QObject(Q_NULLPTR), reptr(ptr)
+    QObject(nullptr), reptr(ptr)
 {
     //connect signal for replica valid changed with signal slot initialization
     QObject::connect(reptr.data(), SIGNAL(initialized()), this, SLOT(initConnection_slot()));
diff --git a/examples/remoteobjects/simpleswitch/directconnectserver/simpleswitch.h b/examples/remoteobjects/simpleswitch/directconnectserver/simpleswitch.h
index 916a09d..173913a 100644
--- a/examples/remoteobjects/simpleswitch/directconnectserver/simpleswitch.h
+++ b/examples/remoteobjects/simpleswitch/directconnectserver/simpleswitch.h
@@ -40,7 +40,7 @@ class SimpleSwitch : public SimpleSwitchSimpleSource
 {
     Q_OBJECT
 public:
-    SimpleSwitch(QObject *parent=Q_NULLPTR);
+    SimpleSwitch(QObject *parent = nullptr);
     ~SimpleSwitch();
     virtual void server_slot(bool clientState);
 public Q_SLOTS:
diff --git a/examples/remoteobjects/simpleswitch/registryconnectedclient/dynamicclient.cpp b/examples/remoteobjects/simpleswitch/registryconnectedclient/dynamicclient.cpp
index 629e7e4..8094f8a 100644
--- a/examples/remoteobjects/simpleswitch/registryconnectedclient/dynamicclient.cpp
+++ b/examples/remoteobjects/simpleswitch/registryconnectedclient/dynamicclient.cpp
@@ -36,7 +36,7 @@
 
 // constructor
 DynamicClient::DynamicClient(QSharedPointer<QRemoteObjectDynamicReplica> ptr) :
-    QObject(Q_NULLPTR), reptr(ptr)
+    QObject(nullptr), reptr(ptr)
 {
     //connect signal for replica valid changed with signal slot initialization
     QObject::connect(reptr.data(), SIGNAL(initialized()), this, SLOT(initConnection_slot()));
diff --git a/examples/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.h b/examples/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.h
index 916a09d..173913a 100644
--- a/examples/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.h
+++ b/examples/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.h
@@ -40,7 +40,7 @@ class SimpleSwitch : public SimpleSwitchSimpleSource
 {
     Q_OBJECT
 public:
-    SimpleSwitch(QObject *parent=Q_NULLPTR);
+    SimpleSwitch(QObject *parent = nullptr);
     ~SimpleSwitch();
     virtual void server_slot(bool clientState);
 public Q_SLOTS:
diff --git a/src/remoteobjects/doc/snippets/doc_src_remoteobjects.h b/src/remoteobjects/doc/snippets/doc_src_remoteobjects.h
index 32d9914..d163116 100644
--- a/src/remoteobjects/doc/snippets/doc_src_remoteobjects.h
+++ b/src/remoteobjects/doc/snippets/doc_src_remoteobjects.h
@@ -42,7 +42,7 @@ class MinuteTimer : public MinuteTimerSource
 {
 Q_OBJECT
 public:
-    MinuteTimer(QObject *parent=Q_NULLPTR);
+    MinuteTimer(QObject *parent = nullptr);
     virtual ~MinuteTimer();
 
 public slots:
diff --git a/src/remoteobjects/doc/snippets/doc_src_simpleswitch.cpp b/src/remoteobjects/doc/snippets/doc_src_simpleswitch.cpp
index 6541b1f..53b23cf 100644
--- a/src/remoteobjects/doc/snippets/doc_src_simpleswitch.cpp
+++ b/src/remoteobjects/doc/snippets/doc_src_simpleswitch.cpp
@@ -57,7 +57,7 @@ class SimpleSwitch : public SimpleSwitchSimpleSource
 {
     Q_OBJECT
 public:
-    SimpleSwitch(QObject *parent=Q_NULLPTR);
+    SimpleSwitch(QObject *parent = nullptr);
     ~SimpleSwitch();
     virtual void server_slot(bool clientState);
 public Q_SLOTS:
@@ -182,7 +182,7 @@ private:
 
 // constructor
 Client::Client(QSharedPointer<SimpleSwitchReplica> ptr) :
-    QObject(Q_NULLPTR),reptr(ptr)
+    QObject(nullptr),reptr(ptr)
 {
     initConnections();
     //We can connect to SimpleSwitchReplica Signals/Slots
@@ -281,7 +281,7 @@ private:
 
 // constructor
 DynamicClient::DynamicClient(QSharedPointer<QRemoteObjectDynamicReplica> ptr) :
-    QObject(Q_NULLPTR), reptr(ptr)
+    QObject(nullptr), reptr(ptr)
 {
 
     //connect signal for replica valid changed with signal slot initialization
diff --git a/src/remoteobjects/qconnection_local_backend.cpp b/src/remoteobjects/qconnection_local_backend.cpp
index a4873dc..a0c48fe 100644
--- a/src/remoteobjects/qconnection_local_backend.cpp
+++ b/src/remoteobjects/qconnection_local_backend.cpp
@@ -140,7 +140,7 @@ LocalServerImpl::~LocalServerImpl()
 ServerIoDevice *LocalServerImpl::configureNewConnection()
 {
     if (!m_server.isListening())
-        return Q_NULLPTR;
+        return nullptr;
 
     return new LocalServerIo(m_server.nextPendingConnection(), this);
 }
diff --git a/src/remoteobjects/qconnection_local_backend_p.h b/src/remoteobjects/qconnection_local_backend_p.h
index 6382129..80ece38 100644
--- a/src/remoteobjects/qconnection_local_backend_p.h
+++ b/src/remoteobjects/qconnection_local_backend_p.h
@@ -57,7 +57,7 @@ class LocalClientIo : public ClientIoDevice
     Q_OBJECT
 
 public:
-    explicit LocalClientIo(QObject *parent = Q_NULLPTR);
+    explicit LocalClientIo(QObject *parent = nullptr);
     ~LocalClientIo();
 
     QIODevice *connection() Q_DECL_OVERRIDE;
@@ -78,7 +78,7 @@ class LocalServerIo : public ServerIoDevice
 {
     Q_OBJECT
 public:
-    explicit LocalServerIo(QLocalSocket *conn, QObject *parent = Q_NULLPTR);
+    explicit LocalServerIo(QLocalSocket *conn, QObject *parent = nullptr);
 
     QIODevice *connection() const Q_DECL_OVERRIDE;
 protected:
diff --git a/src/remoteobjects/qconnection_qnx_backend.cpp b/src/remoteobjects/qconnection_qnx_backend.cpp
index 5a72add..574b22d 100644
--- a/src/remoteobjects/qconnection_qnx_backend.cpp
+++ b/src/remoteobjects/qconnection_qnx_backend.cpp
@@ -142,7 +142,7 @@ QnxServerImpl::~QnxServerImpl()
 ServerIoDevice *QnxServerImpl::configureNewConnection()
 {
     if (!m_server.isListening())
-        return Q_NULLPTR;
+        return nullptr;
 
     return new QnxServerIo(m_server.nextPendingConnection(), this);
 }
diff --git a/src/remoteobjects/qconnection_qnx_backend_p.h b/src/remoteobjects/qconnection_qnx_backend_p.h
index 33cc873..cae0608 100644
--- a/src/remoteobjects/qconnection_qnx_backend_p.h
+++ b/src/remoteobjects/qconnection_qnx_backend_p.h
@@ -92,7 +92,7 @@ class QnxClientIo : public ClientIoDevice
     Q_OBJECT
 
 public:
-    explicit QnxClientIo(QObject *parent = Q_NULLPTR);
+    explicit QnxClientIo(QObject *parent = nullptr);
     ~QnxClientIo();
 
     QIODevice *connection() Q_DECL_OVERRIDE;
@@ -112,7 +112,7 @@ private:
 class QnxServerIo : public ServerIoDevice
 {
 public:
-    explicit QnxServerIo(QIOQnxSource *conn, QObject *parent = Q_NULLPTR);
+    explicit QnxServerIo(QIOQnxSource *conn, QObject *parent = nullptr);
 
     QIODevice *connection() const Q_DECL_OVERRIDE;
 protected:
diff --git a/src/remoteobjects/qconnection_qnx_qiodevices.h b/src/remoteobjects/qconnection_qnx_qiodevices.h
index 6be792a..7e8ba2d 100644
--- a/src/remoteobjects/qconnection_qnx_qiodevices.h
+++ b/src/remoteobjects/qconnection_qnx_qiodevices.h
@@ -64,7 +64,7 @@ class Q_REMOTEOBJECTS_EXPORT QQnxNativeIo : public QIODevice
     Q_DECLARE_PRIVATE(QQnxNativeIo)
 
 public:
-    explicit QQnxNativeIo(QObject *parent = Q_NULLPTR);
+    explicit QQnxNativeIo(QObject *parent = nullptr);
     ~QQnxNativeIo();
 
     bool connectToServer(OpenMode openMode = ReadWrite);
@@ -111,7 +111,7 @@ class Q_REMOTEOBJECTS_EXPORT QIOQnxSource : public QIODevice
     Q_DECLARE_PRIVATE(QIOQnxSource)
 
 public:
-    explicit QIOQnxSource(int rcvid, QObject *parent = Q_NULLPTR);
+    explicit QIOQnxSource(int rcvid, QObject *parent = nullptr);
     ~QIOQnxSource();
 
     bool isSequential() const Q_DECL_OVERRIDE;
diff --git a/src/remoteobjects/qconnection_qnx_server.cpp b/src/remoteobjects/qconnection_qnx_server.cpp
index 0726d63..dfcd947 100644
--- a/src/remoteobjects/qconnection_qnx_server.cpp
+++ b/src/remoteobjects/qconnection_qnx_server.cpp
@@ -380,14 +380,14 @@ void QQnxNativeServerPrivate::thread_func()
         io->d_func()->m_serverClosing.ref();
     mutex.unlock();
     name_detach(attachStruct, 0);
-    attachStruct = Q_NULLPTR;
+    attachStruct = nullptr;
     qCDebug(QT_REMOTEOBJECT) << "Server thread_func stopped";
 }
 
 bool QQnxNativeServerPrivate::listen(const QString &name)
 {
     attachStruct = name_attach(NULL, qPrintable(name), 0);
-    if (attachStruct == Q_NULLPTR) {
+    if (attachStruct == nullptr) {
         qCDebug(QT_REMOTEOBJECT, "name_attach call failed");
         return false;
     }
@@ -415,7 +415,7 @@ void QQnxNativeServerPrivate::cleanupIOSource(QIOQnxSource *conn)
 
 void QQnxNativeServerPrivate::teardownServer()
 {
-    if (attachStruct == Q_NULLPTR)
+    if (attachStruct == nullptr)
         return;
 
     running.deref();
diff --git a/src/remoteobjects/qconnection_qnx_server.h b/src/remoteobjects/qconnection_qnx_server.h
index ff64584..7892335 100644
--- a/src/remoteobjects/qconnection_qnx_server.h
+++ b/src/remoteobjects/qconnection_qnx_server.h
@@ -52,7 +52,7 @@ Q_SIGNALS:
     void newConnection();
 
 public:
-    explicit QQnxNativeServer(QObject *parent = Q_NULLPTR);
+    explicit QQnxNativeServer(QObject *parent = nullptr);
     ~QQnxNativeServer();
 
     void close();
@@ -61,7 +61,7 @@ public:
     bool listen(const QString &name);
     QIOQnxSource *nextPendingConnection();
     QString serverName() const;
-    bool waitForNewConnection(int msec = 0, bool *timedOut = Q_NULLPTR);
+    bool waitForNewConnection(int msec = 0, bool *timedOut = nullptr);
 
 private Q_SLOTS:
     void onSourceClosed();
diff --git a/src/remoteobjects/qconnection_tcpip_backend.cpp b/src/remoteobjects/qconnection_tcpip_backend.cpp
index 983b923..3c66ee0 100644
--- a/src/remoteobjects/qconnection_tcpip_backend.cpp
+++ b/src/remoteobjects/qconnection_tcpip_backend.cpp
@@ -149,7 +149,7 @@ TcpServerImpl::~TcpServerImpl()
 ServerIoDevice *TcpServerImpl::configureNewConnection()
 {
     if (!m_server.isListening())
-        return Q_NULLPTR;
+        return nullptr;
 
     return new TcpServerIo(m_server.nextPendingConnection());
 }
diff --git a/src/remoteobjects/qconnection_tcpip_backend_p.h b/src/remoteobjects/qconnection_tcpip_backend_p.h
index 6a6669f..25124a9 100644
--- a/src/remoteobjects/qconnection_tcpip_backend_p.h
+++ b/src/remoteobjects/qconnection_tcpip_backend_p.h
@@ -57,7 +57,7 @@ class TcpClientIo : public ClientIoDevice
     Q_OBJECT
 
 public:
-    explicit TcpClientIo(QObject *parent = Q_NULLPTR);
+    explicit TcpClientIo(QObject *parent = nullptr);
     ~TcpClientIo();
 
     QIODevice *connection() Q_DECL_OVERRIDE;
@@ -79,7 +79,7 @@ class TcpServerIo : public ServerIoDevice
 {
     Q_OBJECT
 public:
-    explicit TcpServerIo(QTcpSocket *conn, QObject *parent = Q_NULLPTR);
+    explicit TcpServerIo(QTcpSocket *conn, QObject *parent = nullptr);
 
     QIODevice *connection() const Q_DECL_OVERRIDE;
 protected:
diff --git a/src/remoteobjects/qconnectionfactories.h b/src/remoteobjects/qconnectionfactories.h
index 49a6c1d..cad7e10 100644
--- a/src/remoteobjects/qconnectionfactories.h
+++ b/src/remoteobjects/qconnectionfactories.h
@@ -49,7 +49,7 @@ class ServerIoDevice : public QObject
     Q_DISABLE_COPY(ServerIoDevice)
 
 public:
-    explicit ServerIoDevice(QObject *parent = Q_NULLPTR);
+    explicit ServerIoDevice(QObject *parent = nullptr);
     virtual ~ServerIoDevice();
 
     bool read(QtRemoteObjects::QRemoteObjectPacketTypeEnum &, QString &);
@@ -81,7 +81,7 @@ class QConnectionAbstractServer : public QObject
     Q_DISABLE_COPY(QConnectionAbstractServer)
 
 public:
-    explicit QConnectionAbstractServer(QObject *parent = Q_NULLPTR);
+    explicit QConnectionAbstractServer(QObject *parent = nullptr);
     virtual ~QConnectionAbstractServer();
 
     virtual bool hasPendingConnections() const = 0;
@@ -104,7 +104,7 @@ class ClientIoDevice : public QObject
     Q_DISABLE_COPY(ClientIoDevice)
 
 public:
-    explicit ClientIoDevice(QObject *parent = Q_NULLPTR);
+    explicit ClientIoDevice(QObject *parent = nullptr);
     virtual ~ClientIoDevice();
 
     bool read(QtRemoteObjects::QRemoteObjectPacketTypeEnum &, QString &);
@@ -151,7 +151,7 @@ public:
 
     static QtROServerFactory *instance();
 
-    QConnectionAbstractServer *create(const QUrl &url, QObject *parent = Q_NULLPTR)
+    QConnectionAbstractServer *create(const QUrl &url, QObject *parent = nullptr)
     {
         auto creatorFunc = m_creatorFuncs.value(url.scheme());
         return creatorFunc ? (*creatorFunc)(parent) : nullptr;
@@ -178,7 +178,7 @@ public:
     static QtROClientFactory *instance();
 
     /// creates an object from a string
-    ClientIoDevice *create(const QUrl &url, QObject *parent = Q_NULLPTR)
+    ClientIoDevice *create(const QUrl &url, QObject *parent = nullptr)
     {
         auto creatorFunc = m_creatorFuncs.value(url.scheme());
         if (!creatorFunc)
diff --git a/src/remoteobjects/qremoteobjectdynamicreplica.cpp b/src/remoteobjects/qremoteobjectdynamicreplica.cpp
index 0614e73..bf815f6 100644
--- a/src/remoteobjects/qremoteobjectdynamicreplica.cpp
+++ b/src/remoteobjects/qremoteobjectdynamicreplica.cpp
@@ -120,7 +120,7 @@ int QRemoteObjectDynamicReplica::qt_metacall(QMetaObject::Call call, int id, voi
 
     int saved_id = id;
     id = QRemoteObjectReplica::qt_metacall(call, id, argv);
-    if (id < 0 || d->m_metaObject == Q_NULLPTR)
+    if (id < 0 || d->m_metaObject == nullptr)
         return id;
 
     if (call == QMetaObject::ReadProperty || call == QMetaObject::WriteProperty) {
diff --git a/src/remoteobjects/qremoteobjectnode.cpp b/src/remoteobjects/qremoteobjectnode.cpp
index ccd605d..9e3e458 100644
--- a/src/remoteobjects/qremoteobjectnode.cpp
+++ b/src/remoteobjects/qremoteobjectnode.cpp
@@ -68,10 +68,10 @@ bool map_contains(const QMap<K,V> &map, const Query &key, typename QMap<K,V>::co
 
 QRemoteObjectNodePrivate::QRemoteObjectNodePrivate()
     : QObjectPrivate()
-    , registry(Q_NULLPTR)
+    , registry(nullptr)
     , retryInterval(250)
     , lastError(QRemoteObjectNode::NoError)
-    , persistedStore(Q_NULLPTR)
+    , persistedStore(nullptr)
     , persistedStoreOwnership(QRemoteObjectNode::DoNotPassOwnership)
 { }
 
@@ -125,7 +125,7 @@ void QRemoteObjectNode::initializeReplica(QRemoteObjectReplica *instance, const
 {
     Q_D(QRemoteObjectNode);
     if (instance->inherits("QRemoteObjectDynamicReplica")) {
-        d->setReplicaPrivate(Q_NULLPTR, instance, name);
+        d->setReplicaPrivate(nullptr, instance, name);
     } else {
         const QMetaObject *meta = instance->metaObject();
         d->setReplicaPrivate(meta, instance, name.isEmpty() ? ::name(meta) : name);
@@ -1340,7 +1340,7 @@ QAbstractItemModelReplica *QRemoteObjectNode::acquireModel(const QString &name)
 
 QRemoteObjectHostBasePrivate::QRemoteObjectHostBasePrivate()
     : QRemoteObjectNodePrivate()
-    , remoteObjectIo(Q_NULLPTR)
+    , remoteObjectIo(nullptr)
 { }
 
 QRemoteObjectHostPrivate::QRemoteObjectHostPrivate()
@@ -1349,7 +1349,7 @@ QRemoteObjectHostPrivate::QRemoteObjectHostPrivate()
 
 QRemoteObjectRegistryHostPrivate::QRemoteObjectRegistryHostPrivate()
     : QRemoteObjectHostBasePrivate()
-    , registrySource(Q_NULLPTR)
+    , registrySource(nullptr)
 { }
 
 QT_END_NAMESPACE
diff --git a/src/remoteobjects/qremoteobjectnode.h b/src/remoteobjects/qremoteobjectnode.h
index bb45bcf..b784568 100644
--- a/src/remoteobjects/qremoteobjectnode.h
+++ b/src/remoteobjects/qremoteobjectnode.h
@@ -85,8 +85,8 @@ public:
         PassOwnershipToNode
     };
 
-    QRemoteObjectNode(QObject *parent = Q_NULLPTR);
-    QRemoteObjectNode(const QUrl &registryAddress, QObject *parent = Q_NULLPTR);
+    QRemoteObjectNode(QObject *parent = nullptr);
+    QRemoteObjectNode(const QUrl &registryAddress, QObject *parent = nullptr);
     virtual ~QRemoteObjectNode();
 
     Q_INVOKABLE bool connectToNode(const QUrl &address);
@@ -157,7 +157,7 @@ public:
         return enableRemoting(object, api);
     }
     bool enableRemoting(QObject *object, const QString &name = QString());
-    bool enableRemoting(QAbstractItemModel *model, const QString &name, const QVector<int> roles, QItemSelectionModel *selectionModel = Q_NULLPTR);
+    bool enableRemoting(QAbstractItemModel *model, const QString &name, const QVector<int> roles, QItemSelectionModel *selectionModel = nullptr);
     bool disableRemoting(QObject *remoteObject);
 
 protected:
@@ -166,7 +166,7 @@ protected:
     QRemoteObjectHostBase(QRemoteObjectHostBasePrivate &, QObject *);
 
 private:
-    bool enableRemoting(QObject *object, const SourceApiMap *, QObject *adapter = Q_NULLPTR);
+    bool enableRemoting(QObject *object, const SourceApiMap *, QObject *adapter = nullptr);
     Q_DECLARE_PRIVATE(QRemoteObjectHostBase)
 };
 
@@ -174,8 +174,8 @@ class Q_REMOTEOBJECTS_EXPORT QRemoteObjectHost : public QRemoteObjectHostBase
 {
     Q_OBJECT
 public:
-    QRemoteObjectHost(QObject *parent = Q_NULLPTR);
-    QRemoteObjectHost(const QUrl &address, const QUrl &registryAddress = QUrl(), QObject *parent = Q_NULLPTR);
+    QRemoteObjectHost(QObject *parent = nullptr);
+    QRemoteObjectHost(const QUrl &address, const QUrl &registryAddress = QUrl(), QObject *parent = nullptr);
     QRemoteObjectHost(const QUrl &address, QObject *parent);
     virtual ~QRemoteObjectHost();
     QUrl hostUrl() const Q_DECL_OVERRIDE;
@@ -192,7 +192,7 @@ class Q_REMOTEOBJECTS_EXPORT QRemoteObjectRegistryHost : public QRemoteObjectHos
 {
     Q_OBJECT
 public:
-    QRemoteObjectRegistryHost(const QUrl &registryAddress = QUrl(), QObject *parent = Q_NULLPTR);
+    QRemoteObjectRegistryHost(const QUrl &registryAddress = QUrl(), QObject *parent = nullptr);
     virtual ~QRemoteObjectRegistryHost();
     bool setRegistryUrl(const QUrl &registryUrl) Q_DECL_OVERRIDE;
 
diff --git a/src/remoteobjects/qremoteobjectpendingcall.cpp b/src/remoteobjects/qremoteobjectpendingcall.cpp
index a45ff90..76da6b0 100644
--- a/src/remoteobjects/qremoteobjectpendingcall.cpp
+++ b/src/remoteobjects/qremoteobjectpendingcall.cpp
@@ -46,7 +46,7 @@ QRemoteObjectPendingCallData::QRemoteObjectPendingCallData(int serialId, QRemote
     : replica(replica)
     , serialId(serialId)
     , error(QRemoteObjectPendingCall::InvalidMessage)
-    , watcherHelper(Q_NULLPTR)
+    , watcherHelper(nullptr)
 {
 }
 
diff --git a/src/remoteobjects/qremoteobjectpendingcall.h b/src/remoteobjects/qremoteobjectpendingcall.h
index 25646c5..01a73d2 100644
--- a/src/remoteobjects/qremoteobjectpendingcall.h
+++ b/src/remoteobjects/qremoteobjectpendingcall.h
@@ -85,7 +85,7 @@ class Q_REMOTEOBJECTS_EXPORT QRemoteObjectPendingCallWatcher: public QObject, pu
     Q_OBJECT
 
 public:
-    QRemoteObjectPendingCallWatcher(const QRemoteObjectPendingCall &call, QObject *parent = Q_NULLPTR);
+    QRemoteObjectPendingCallWatcher(const QRemoteObjectPendingCall &call, QObject *parent = nullptr);
     ~QRemoteObjectPendingCallWatcher();
 
     bool isFinished() const;
diff --git a/src/remoteobjects/qremoteobjectpendingcall_p.h b/src/remoteobjects/qremoteobjectpendingcall_p.h
index 545d4b5..623a0bb 100644
--- a/src/remoteobjects/qremoteobjectpendingcall_p.h
+++ b/src/remoteobjects/qremoteobjectpendingcall_p.h
@@ -59,7 +59,7 @@ class QRemoteObjectPendingCallData : public QSharedData
 public:
     typedef QExplicitlySharedDataPointer<QRemoteObjectPendingCallData> Ptr;
 
-    explicit QRemoteObjectPendingCallData(int serialId = -1, QRemoteObjectReplicaPrivate *replica = Q_NULLPTR);
+    explicit QRemoteObjectPendingCallData(int serialId = -1, QRemoteObjectReplicaPrivate *replica = nullptr);
     ~QRemoteObjectPendingCallData();
 
     QRemoteObjectReplicaPrivate *replica;
diff --git a/src/remoteobjects/qremoteobjectregistrysource_p.h b/src/remoteobjects/qremoteobjectregistrysource_p.h
index 5c72eef..9464fdd 100644
--- a/src/remoteobjects/qremoteobjectregistrysource_p.h
+++ b/src/remoteobjects/qremoteobjectregistrysource_p.h
@@ -57,7 +57,7 @@ class QRegistrySource : public QObject
     Q_PROPERTY(QRemoteObjectSourceLocations sourceLocations READ sourceLocations)
 
 public:
-    explicit QRegistrySource(QObject *parent = Q_NULLPTR);
+    explicit QRegistrySource(QObject *parent = nullptr);
     ~QRegistrySource();
 
     QRemoteObjectSourceLocations sourceLocations() const;
diff --git a/src/remoteobjects/qremoteobjectreplica.cpp b/src/remoteobjects/qremoteobjectreplica.cpp
index a2ae2ee..05eb71c 100644
--- a/src/remoteobjects/qremoteobjectreplica.cpp
+++ b/src/remoteobjects/qremoteobjectreplica.cpp
@@ -64,7 +64,7 @@ Q_STATIC_ASSERT_X(&QRemoteObjectReplica::staticMetaObject == &QRemoteObjectDynam
 // in the future.  See FIX #1, #2, #3 in this file.
 
 QRemoteObjectReplicaPrivate::QRemoteObjectReplicaPrivate(const QString &name, const QMetaObject *meta, QRemoteObjectNode *_node)
-    : QObject(Q_NULLPTR), m_objectName(name), m_metaObject(meta), m_numSignals(0), m_methodOffset(0)
+    : QObject(nullptr), m_objectName(name), m_metaObject(meta), m_numSignals(0), m_methodOffset(0)
     // Uncomment the following two lines if QRemoteObjectDynamicReplica gets a unique staticMetaObject (FIX #1, #2)
     //, m_signalOffset(meta ? QRemoteObjectReplica::staticMetaObject.methodCount() : QRemoteObjectDynamicReplica::staticMetaObject.methodCount())
     //, m_propertyOffset(meta ? QRemoteObjectReplica::staticMetaObject.propertyCount() : QRemoteObjectDynamicReplica::staticMetaObject.propertyCount())
@@ -83,7 +83,7 @@ QRemoteObjectReplicaPrivate::~QRemoteObjectReplicaPrivate()
 }
 
 QConnectedReplicaPrivate::QConnectedReplicaPrivate(const QString &name, const QMetaObject *meta, QRemoteObjectNode *node)
-    : QRemoteObjectReplicaPrivate(name, meta, node), connectionToSource(Q_NULLPTR), m_curSerialId(0)
+    : QRemoteObjectReplicaPrivate(name, meta, node), connectionToSource(nullptr), m_curSerialId(0)
 {
 }
 
@@ -98,7 +98,7 @@ QConnectedReplicaPrivate::~QConnectedReplicaPrivate()
 
 bool QRemoteObjectReplicaPrivate::needsDynamicInitialization() const
 {
-    return m_metaObject == Q_NULLPTR;
+    return m_metaObject == nullptr;
 }
 
 void QRemoteObjectReplicaPrivate::setState(QRemoteObjectReplica::State state)
@@ -154,7 +154,7 @@ void QConnectedReplicaPrivate::initialize(const QVariantList &values)
     Q_ASSERT(m_state < QRemoteObjectReplica::Valid);
     setState(QRemoteObjectReplica::Valid);
 
-    void *args[] = {Q_NULLPTR, Q_NULLPTR};
+    void *args[] = {nullptr, nullptr};
     for (int i = 0; i < nParam; ++i) {
         if (changedProperties[i] < 0)
             continue;
@@ -220,7 +220,7 @@ void QConnectedReplicaPrivate::initializeMetaObject(const QMetaObjectBuilder &bu
     Q_ASSERT(m_state < QRemoteObjectReplica::Valid);
     setState(QRemoteObjectReplica::Valid);
 
-    void *args[] = {Q_NULLPTR, Q_NULLPTR};
+    void *args[] = {nullptr, nullptr};
     for (int index = m_metaObject->propertyOffset(); index < m_metaObject->propertyCount(); ++index) {
         const QMetaProperty mp = m_metaObject->property(index);
         if (mp.hasNotifySignal()) {
@@ -521,7 +521,7 @@ void QConnectedReplicaPrivate::configurePrivate(QRemoteObjectReplica *rep)
     replica objects from QML.
 */
 QRemoteObjectReplica::QRemoteObjectReplica(ConstructorType t)
-    : QObject(Q_NULLPTR)
+    : QObject(nullptr)
     , d_ptr(t == DefaultConstructor ? new QStubReplicaPrivate : 0)
 {
     qRegisterMetaType<State>("State");
@@ -709,7 +709,7 @@ QRemoteObjectPendingCall QInProcessReplicaPrivate::_q_sendWithReply(QMetaObject:
     int typeId = QMetaType::type(connectionToSource->m_api->typeName(ReplicaIndex).constData());
     if (!QMetaType(typeId).sizeOf())
         typeId = QVariant::Invalid;
-    QVariant returnValue(typeId, Q_NULLPTR);
+    QVariant returnValue(typeId, nullptr);
 
     const int resolvedIndex = connectionToSource->m_api->sourceMethodIndex(ReplicaIndex);
     if (resolvedIndex < 0) {
diff --git a/src/remoteobjects/qremoteobjectreplica_p.h b/src/remoteobjects/qremoteobjectreplica_p.h
index 1e44459..899c159 100644
--- a/src/remoteobjects/qremoteobjectreplica_p.h
+++ b/src/remoteobjects/qremoteobjectreplica_p.h
@@ -97,7 +97,7 @@ public:
     bool isInitialized() const Q_DECL_OVERRIDE { return false; }
     QRemoteObjectReplica::State state() const Q_DECL_OVERRIDE { return QRemoteObjectReplica::State::Uninitialized;}
     bool waitForSource(int) Q_DECL_OVERRIDE { return false; }
-    QRemoteObjectNode *node() const Q_DECL_OVERRIDE { return Q_NULLPTR; }
+    QRemoteObjectNode *node() const Q_DECL_OVERRIDE { return nullptr; }
 
     void _q_send(QMetaObject::Call call, int index, const QVariantList &args) Q_DECL_OVERRIDE;
     QRemoteObjectPendingCall _q_sendWithReply(QMetaObject::Call call, int index, const QVariantList &args) Q_DECL_OVERRIDE;
diff --git a/src/remoteobjects/qremoteobjectsource.cpp b/src/remoteobjects/qremoteobjectsource.cpp
index 1abdbef..31dc1e1 100644
--- a/src/remoteobjects/qremoteobjectsource.cpp
+++ b/src/remoteobjects/qremoteobjectsource.cpp
@@ -146,7 +146,7 @@ bool QRemoteObjectSource::invoke(QMetaObject::Call c, bool forAdapter, int index
         if (returnValue) {
             param[0] = returnValue->data();
         } else {
-            param[0] = Q_NULLPTR;
+            param[0] = nullptr;
         }
 
         for (int i = 0; i < args.size(); ++i) {
diff --git a/src/remoteobjects/qremoteobjectsource_p.h b/src/remoteobjects/qremoteobjectsource_p.h
index b9c0cab..94deccd 100644
--- a/src/remoteobjects/qremoteobjectsource_p.h
+++ b/src/remoteobjects/qremoteobjectsource_p.h
@@ -78,7 +78,7 @@ public:
     void handleMetaCall(int index, QMetaObject::Call call, void **a);
     void addListener(ServerIoDevice *io, bool dynamic = false);
     int removeListener(ServerIoDevice *io, bool shouldSendRemove = false);
-    bool invoke(QMetaObject::Call c, bool forAdapter, int index, const QVariantList& args, QVariant* returnValue = Q_NULLPTR);
+    bool invoke(QMetaObject::Call c, bool forAdapter, int index, const QVariantList& args, QVariant* returnValue = nullptr);
     QByteArray m_objectChecksum;
     static const int qobjectPropertyOffset;
     static const int qobjectMethodOffset;
diff --git a/src/remoteobjects/qremoteobjectsourceio.cpp b/src/remoteobjects/qremoteobjectsourceio.cpp
index 32bb8ba..f059fb7 100644
--- a/src/remoteobjects/qremoteobjectsourceio.cpp
+++ b/src/remoteobjects/qremoteobjectsourceio.cpp
@@ -209,7 +209,7 @@ void QRemoteObjectSourceIo::onServerRead(QObject *conn)
                     int typeId = QMetaType::type(pp->m_api->typeName(index).constData());
                     if (!QMetaType(typeId).sizeOf())
                         typeId = QVariant::Invalid;
-                    QVariant returnValue(typeId, Q_NULLPTR);
+                    QVariant returnValue(typeId, nullptr);
                     pp->invoke(QMetaObject::InvokeMetaMethod, pp->m_api->isAdapterMethod(index), resolvedIndex, m_rxArgs, &returnValue);
                     // send reply if wanted
                     if (serialId >= 0) {
diff --git a/src/remoteobjects/qremoteobjectsourceio_p.h b/src/remoteobjects/qremoteobjectsourceio_p.h
index 63d320c..52d0939 100644
--- a/src/remoteobjects/qremoteobjectsourceio_p.h
+++ b/src/remoteobjects/qremoteobjectsourceio_p.h
@@ -62,18 +62,18 @@ class QRemoteObjectSourceIo : public QObject
 {
     Q_OBJECT
 public:
-    explicit QRemoteObjectSourceIo(const QUrl &address, QObject *parent = Q_NULLPTR);
+    explicit QRemoteObjectSourceIo(const QUrl &address, QObject *parent = nullptr);
     ~QRemoteObjectSourceIo();
 
     bool enableRemoting(QObject *object, const QMetaObject *meta, const QString &name, const QString &typeName);
-    bool enableRemoting(QObject *object, const SourceApiMap *api, QObject *adapter = Q_NULLPTR);
+    bool enableRemoting(QObject *object, const SourceApiMap *api, QObject *adapter = nullptr);
     bool disableRemoting(QObject *object);
 
     QUrl serverAddress() const;
 
 public Q_SLOTS:
     void handleConnection();
-    void onServerDisconnect(QObject *obj = Q_NULLPTR);
+    void onServerDisconnect(QObject *obj = nullptr);
     void onServerRead(QObject *obj);
 
 Q_SIGNALS:
diff --git a/tests/auto/integration/engine.h b/tests/auto/integration/engine.h
index 146b7ec..9e9d036 100644
--- a/tests/auto/integration/engine.h
+++ b/tests/auto/integration/engine.h
@@ -42,7 +42,7 @@ class Engine : public EngineSimpleSource
     Q_PROPERTY(bool purchasedPart READ purchasedPart WRITE setpurchasedPart)
 
 public:
-    Engine(QObject *parent=Q_NULLPTR);
+    Engine(QObject *parent = nullptr);
     virtual ~Engine();
 
     bool start() Q_DECL_OVERRIDE;
diff --git a/tests/auto/integration/speedometer.h b/tests/auto/integration/speedometer.h
index c20b489..e39d029 100644
--- a/tests/auto/integration/speedometer.h
+++ b/tests/auto/integration/speedometer.h
@@ -40,7 +40,7 @@ class Speedometer : public SpeedometerSimpleSource
 {
     Q_OBJECT
 public:
-    Speedometer(QObject *parent=Q_NULLPTR);
+    Speedometer(QObject *parent = nullptr);
     virtual ~Speedometer();
 
 private:
diff --git a/tests/auto/integration_multiprocess/server/mytestserver.h b/tests/auto/integration_multiprocess/server/mytestserver.h
index 69429bb..3082c32 100644
--- a/tests/auto/integration_multiprocess/server/mytestserver.h
+++ b/tests/auto/integration_multiprocess/server/mytestserver.h
@@ -46,7 +46,7 @@ class MyTestServer : public MyInterfaceSimpleSource
     Q_OBJECT
 
 public:
-    MyTestServer(QObject *parent = Q_NULLPTR);
+    MyTestServer(QObject *parent = nullptr);
     ~MyTestServer();
 
 public Q_SLOTS:
diff --git a/tools/repc/repcodegenerator.cpp b/tools/repc/repcodegenerator.cpp
index e0a8d7c..a521fe4 100644
--- a/tools/repc/repcodegenerator.cpp
+++ b/tools/repc/repcodegenerator.cpp
@@ -589,7 +589,7 @@ void RepCodeGenerator::generateClass(Mode mode, QTextStream &out, const ASTClass
         out << "" << endl;
         out << "    void initialize()" << endl;
     } else {
-        out << "    explicit " << className << "(QObject *parent = Q_NULLPTR) : QObject(parent)" << endl;
+        out << "    explicit " << className << "(QObject *parent = nullptr) : QObject(parent)" << endl;
 
         if (mode == SIMPLE_SOURCE) {
             Q_FOREACH (const ASTProperty &property, astClass.properties) {