Use 'nullptr' where it is possible

Change-Id: I729e6b53cbc0b9a16c72c2351cc95d6bd7a2a0aa
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

43 files changed, 77 insertions, 77 deletions

diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp
index 3c3458e..e4d3d36 100644
--- a/examples/serialbus/can/mainwindow.cpp
+++ b/examples/serialbus/can/mainwindow.cpp
@@ -52,7 +52,7 @@
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     m_ui(new Ui::MainWindow),
-    m_canDevice(Q_NULLPTR)
+    m_canDevice(nullptr)
 {
     m_ui->setupUi(this);
 
@@ -134,7 +134,7 @@ void MainWindow::connectDevice()
 
     if (!m_canDevice->connectDevice()) {
         delete m_canDevice;
-        m_canDevice = Q_NULLPTR;
+        m_canDevice = nullptr;
 
         showStatusMessage(tr("Connection error"));
     } else {
@@ -156,7 +156,7 @@ void MainWindow::disconnectDevice()
 
     m_canDevice->disconnectDevice();
     delete m_canDevice;
-    m_canDevice = Q_NULLPTR;
+    m_canDevice = nullptr;
 
     m_ui->actionConnect->setEnabled(true);
     m_ui->actionDisconnect->setEnabled(false);
diff --git a/examples/serialbus/can/mainwindow.h b/examples/serialbus/can/mainwindow.h
index 52f9788..8e1b142 100644
--- a/examples/serialbus/can/mainwindow.h
+++ b/examples/serialbus/can/mainwindow.h
@@ -63,7 +63,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    explicit MainWindow(QWidget *parent = 0);
+    explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
 private Q_SLOTS:
diff --git a/examples/serialbus/can/settingsdialog.h b/examples/serialbus/can/settingsdialog.h
index 7e187e6..2b51f09 100644
--- a/examples/serialbus/can/settingsdialog.h
+++ b/examples/serialbus/can/settingsdialog.h
@@ -69,7 +69,7 @@ public:
         bool useConfigurationEnabled;
     };
 
-    explicit SettingsDialog(QWidget *parent = 0);
+    explicit SettingsDialog(QWidget *parent = nullptr);
     ~SettingsDialog();
 
     Settings settings() const;
diff --git a/examples/serialbus/modbus/adueditor/mainwindow.cpp b/examples/serialbus/modbus/adueditor/mainwindow.cpp
index 3b54be8..e53e6c3 100644
--- a/examples/serialbus/modbus/adueditor/mainwindow.cpp
+++ b/examples/serialbus/modbus/adueditor/mainwindow.cpp
@@ -55,7 +55,7 @@
 
 QT_USE_NAMESPACE
 
-MainWindow* s_instance = Q_NULLPTR;
+MainWindow* s_instance = nullptr;
 
 static void HandlerFunction(QtMsgType, const QMessageLogContext &, const QString &msg)
 {
@@ -87,7 +87,7 @@ MainWindow::MainWindow(QWidget *parent)
 MainWindow::~MainWindow()
 {
     disconnectAndDelete();
-    s_instance = Q_NULLPTR;
+    s_instance = nullptr;
 }
 
 MainWindow* MainWindow::instance()
@@ -102,7 +102,7 @@ void MainWindow::on_sendButton_clicked()
     const QByteArray pduData = QByteArray::fromHex((isSerial ? pduSerialLine : pduTcpLine)->text()
         .toLatin1());
 
-    QModbusReply *reply = Q_NULLPTR;
+    QModbusReply *reply = nullptr;
     if (isCustom && pduData.isEmpty()) {
         qDebug() << "Error: Cannot send custom PDU without any data.";
         return;
@@ -228,5 +228,5 @@ void MainWindow::disconnectAndDelete()
     m_device->disconnectDevice();
     m_device->disconnect();
     delete m_device;
-    m_device = Q_NULLPTR;
+    m_device = nullptr;
 }
diff --git a/examples/serialbus/modbus/adueditor/mainwindow.h b/examples/serialbus/modbus/adueditor/mainwindow.h
index 4870a25..3ea1b8a 100644
--- a/examples/serialbus/modbus/adueditor/mainwindow.h
+++ b/examples/serialbus/modbus/adueditor/mainwindow.h
@@ -69,7 +69,7 @@ class MainWindow : public QMainWindow, private Ui::MainWindow
     friend class ModbusTcpClient;
 
 public:
-    explicit MainWindow(QWidget *parent = Q_NULLPTR);
+    explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
     static MainWindow* instance();
@@ -88,7 +88,7 @@ private:
 
 private:
     DebugHandler m_debugHandler;
-    QModbusClient *m_device = Q_NULLPTR;
+    QModbusClient *m_device = nullptr;
 };
 
 #endif // MAINWINDOW_H
diff --git a/examples/serialbus/modbus/adueditor/modbustcpclient.h b/examples/serialbus/modbus/adueditor/modbustcpclient.h
index 8fea20c..9f0b516 100644
--- a/examples/serialbus/modbus/adueditor/modbustcpclient.h
+++ b/examples/serialbus/modbus/adueditor/modbustcpclient.h
@@ -53,13 +53,13 @@ class ModbusTcpClient : public QModbusTcpClient
     Q_DECLARE_PRIVATE(ModbusTcpClient)
 
 public:
-    ModbusTcpClient(QObject *parent = Q_NULLPTR);
+    ModbusTcpClient(QObject *parent = nullptr);
 
 public slots:
     void valueChanged(int value);
 
 private:
-    ModbusTcpClient(ModbusTcpClientPrivate &dd, QObject *parent = Q_NULLPTR);
+    ModbusTcpClient(ModbusTcpClientPrivate &dd, QObject *parent = nullptr);
 };
 
 #endif // MODBUSTCPCLIENT_H
diff --git a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
index 891a740..fa9fa6d 100644
--- a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
+++ b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
@@ -77,7 +77,7 @@ public:
         };
 
         if (!writeToSocket(request))
-            return Q_NULLPTR;
+            return nullptr;
 
         Q_Q(ModbusTcpClient);
         QModbusReply *const reply = new QModbusReply(type, m_uId, q);
diff --git a/examples/serialbus/modbus/adueditor/plaintextedit.h b/examples/serialbus/modbus/adueditor/plaintextedit.h
index ed24d92..1a0d8e3 100644
--- a/examples/serialbus/modbus/adueditor/plaintextedit.h
+++ b/examples/serialbus/modbus/adueditor/plaintextedit.h
@@ -50,7 +50,7 @@ class PlainTextEdit : public QPlainTextEdit
     Q_DISABLE_COPY(PlainTextEdit)
 
 public:
-    explicit PlainTextEdit(QWidget *parent = Q_NULLPTR)
+    explicit PlainTextEdit(QWidget *parent = nullptr)
         : QPlainTextEdit(parent)
     {}
 
diff --git a/examples/serialbus/modbus/master/mainwindow.cpp b/examples/serialbus/modbus/master/mainwindow.cpp
index b1eb9e1..efa0e90 100644
--- a/examples/serialbus/modbus/master/mainwindow.cpp
+++ b/examples/serialbus/modbus/master/mainwindow.cpp
@@ -57,8 +57,8 @@ enum ModbusConnection {
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::MainWindow)
-    , lastRequest(Q_NULLPTR)
-    , modbusDevice(Q_NULLPTR)
+    , lastRequest(nullptr)
+    , modbusDevice(nullptr)
 {
     ui->setupUi(this);
 
@@ -139,7 +139,7 @@ void MainWindow::on_connectType_currentIndexChanged(int index)
     if (modbusDevice) {
         modbusDevice->disconnectDevice();
         delete modbusDevice;
-        modbusDevice = Q_NULLPTR;
+        modbusDevice = nullptr;
     }
 
     ModbusConnection type = static_cast<ModbusConnection> (index);
diff --git a/examples/serialbus/modbus/master/mainwindow.h b/examples/serialbus/modbus/master/mainwindow.h
index 8cf1499..251c16f 100644
--- a/examples/serialbus/modbus/master/mainwindow.h
+++ b/examples/serialbus/modbus/master/mainwindow.h
@@ -64,7 +64,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    explicit MainWindow(QWidget *parent = 0);
+    explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
 private:
diff --git a/examples/serialbus/modbus/master/settingsdialog.h b/examples/serialbus/modbus/master/settingsdialog.h
index ecefbba..d221e0d 100644
--- a/examples/serialbus/modbus/master/settingsdialog.h
+++ b/examples/serialbus/modbus/master/settingsdialog.h
@@ -66,7 +66,7 @@ public:
         int numberOfRetries = 3;
     };
 
-    explicit SettingsDialog(QWidget *parent = 0);
+    explicit SettingsDialog(QWidget *parent = nullptr);
     ~SettingsDialog();
 
     Settings settings() const;
diff --git a/examples/serialbus/modbus/master/writeregistermodel.h b/examples/serialbus/modbus/master/writeregistermodel.h
index c4bc4d2..79ebf29 100644
--- a/examples/serialbus/modbus/master/writeregistermodel.h
+++ b/examples/serialbus/modbus/master/writeregistermodel.h
@@ -50,7 +50,7 @@ class WriteRegisterModel : public QAbstractTableModel
     Q_OBJECT
 
 public:
-    WriteRegisterModel(QObject* parent = 0);
+    WriteRegisterModel(QObject* parent = nullptr);
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
     int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
diff --git a/examples/serialbus/modbus/slave/mainwindow.cpp b/examples/serialbus/modbus/slave/mainwindow.cpp
index f568291..537a6ad 100644
--- a/examples/serialbus/modbus/slave/mainwindow.cpp
+++ b/examples/serialbus/modbus/slave/mainwindow.cpp
@@ -56,7 +56,7 @@ enum ModbusConnection {
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::MainWindow)
-    , modbusDevice(Q_NULLPTR)
+    , modbusDevice(nullptr)
 {
     ui->setupUi(this);
     setupWidgetContainers();
@@ -98,7 +98,7 @@ void MainWindow::on_connectType_currentIndexChanged(int index)
     if (modbusDevice) {
         modbusDevice->disconnect();
         delete modbusDevice;
-        modbusDevice = Q_NULLPTR;
+        modbusDevice = nullptr;
     }
 
     ModbusConnection type = static_cast<ModbusConnection> (index);
diff --git a/examples/serialbus/modbus/slave/mainwindow.h b/examples/serialbus/modbus/slave/mainwindow.h
index 178d294..5c0382d 100644
--- a/examples/serialbus/modbus/slave/mainwindow.h
+++ b/examples/serialbus/modbus/slave/mainwindow.h
@@ -63,7 +63,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    explicit MainWindow(QWidget *parent = 0);
+    explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
 private Q_SLOTS:
diff --git a/examples/serialbus/modbus/slave/settingsdialog.h b/examples/serialbus/modbus/slave/settingsdialog.h
index 685ee3f..a96e30a 100644
--- a/examples/serialbus/modbus/slave/settingsdialog.h
+++ b/examples/serialbus/modbus/slave/settingsdialog.h
@@ -64,7 +64,7 @@ public:
         int stopBits = QSerialPort::OneStop;
     };
 
-    explicit SettingsDialog(QWidget *parent = 0);
+    explicit SettingsDialog(QWidget *parent = nullptr);
     ~SettingsDialog();
 
     Settings settings() const;
diff --git a/src/plugins/canbus/peakcan/main.cpp b/src/plugins/canbus/peakcan/main.cpp
index 4544690..0f2dd89 100644
--- a/src/plugins/canbus/peakcan/main.cpp
+++ b/src/plugins/canbus/peakcan/main.cpp
@@ -56,7 +56,7 @@ public:
         QString errorReason;
         if (!PeakCanBackend::canCreate(&errorReason)) {
             qWarning("%s", qPrintable(errorReason));
-            return Q_NULLPTR;
+            return nullptr;
         }
 
         QCanBusDevice *device = new PeakCanBackend(interfaceName);
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp
index ecaeb16..6e52d16 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.cpp
+++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp
@@ -148,8 +148,8 @@ PeakCanBackendPrivate::PeakCanBackendPrivate(PeakCanBackend *q)
     : q_ptr(q)
     , isOpen(false)
     , channelIndex(PCAN_NONEBUS)
-    , outgoingEventNotifier(Q_NULLPTR)
-    , incomingEventNotifier(Q_NULLPTR)
+    , outgoingEventNotifier(nullptr)
+    , incomingEventNotifier(nullptr)
 #if defined(Q_OS_WIN32)
     , incomingEventHandle(INVALID_HANDLE_VALUE)
 #else
@@ -229,7 +229,7 @@ void PeakCanBackendPrivate::close()
 
     if (outgoingEventNotifier) {
         delete outgoingEventNotifier;
-        outgoingEventNotifier = Q_NULLPTR;
+        outgoingEventNotifier = nullptr;
     }
 
     if (TPCANStatus st = ::CAN_Uninitialize(channelIndex) != PCAN_ERROR_OK)
@@ -367,7 +367,7 @@ bool PeakCanBackendPrivate::acquireReadNotification()
 
 #if defined(Q_OS_WIN32)
     if (incomingEventHandle == INVALID_HANDLE_VALUE) {
-        incomingEventHandle = ::CreateEvent(Q_NULLPTR, FALSE, FALSE, Q_NULLPTR);
+        incomingEventHandle = ::CreateEvent(nullptr, FALSE, FALSE, nullptr);
         if (!incomingEventHandle) {
             q->setError(qt_error_string(::GetLastError()), QCanBusDevice::ReadError);
             return false;
@@ -399,7 +399,7 @@ void PeakCanBackendPrivate::releaseReadNotification()
 
     if (incomingEventNotifier) {
         delete incomingEventNotifier;
-        incomingEventNotifier = Q_NULLPTR;
+        incomingEventNotifier = nullptr;
     }
 
 #if defined(Q_OS_WIN32)
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.h b/src/plugins/canbus/peakcan/peakcanbackend.h
index d5d531c..58c292e 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.h
+++ b/src/plugins/canbus/peakcan/peakcanbackend.h
@@ -55,7 +55,7 @@ class PeakCanBackend : public QCanBusDevice
     Q_DECLARE_PRIVATE(PeakCanBackend)
     Q_DISABLE_COPY(PeakCanBackend)
 public:
-    explicit PeakCanBackend(const QString &name, QObject *parent = 0);
+    explicit PeakCanBackend(const QString &name, QObject *parent = nullptr);
     ~PeakCanBackend();
 
     bool open() Q_DECL_OVERRIDE;
diff --git a/src/plugins/canbus/tinycan/main.cpp b/src/plugins/canbus/tinycan/main.cpp
index 6e1f959..020ee00 100644
--- a/src/plugins/canbus/tinycan/main.cpp
+++ b/src/plugins/canbus/tinycan/main.cpp
@@ -56,7 +56,7 @@ public:
         QString errorReason;
         if (!TinyCanBackend::canCreate(&errorReason)) {
             qWarning("%s", qPrintable(errorReason));
-            return Q_NULLPTR;
+            return nullptr;
         }
 
         QCanBusDevice *device = new TinyCanBackend(interfaceName);
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp
index 669c153..2f5b62b 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.cpp
+++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp
@@ -175,7 +175,7 @@ bool TinyCanBackendPrivate::open()
         return false;
     }
 
-    if (int ret = ::CanDeviceOpen(channelIndex, Q_NULLPTR) < 0) {
+    if (int ret = ::CanDeviceOpen(channelIndex, nullptr) < 0) {
         q->setError(systemErrorString(ret), QCanBusDevice::CanBusError::ConnectionError);
         return false;
     }
@@ -427,7 +427,7 @@ void TinyCanBackendPrivate::startupDriver()
     Q_Q(TinyCanBackend);
 
     if (driverRefCount == 0) {
-        if (int ret = ::CanInitDriver(Q_NULLPTR) < 0) {
+        if (int ret = ::CanInitDriver(nullptr) < 0) {
             q->setError(systemErrorString(ret), QCanBusDevice::CanBusError::ConnectionError);
             return;
         }
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.h b/src/plugins/canbus/tinycan/tinycanbackend.h
index c5f23c6..693dd83 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.h
+++ b/src/plugins/canbus/tinycan/tinycanbackend.h
@@ -56,7 +56,7 @@ class TinyCanBackend : public QCanBusDevice
     Q_DECLARE_PRIVATE(TinyCanBackend)
     Q_DISABLE_COPY(TinyCanBackend)
 public:
-    explicit TinyCanBackend(const QString &name, QObject *parent = 0);
+    explicit TinyCanBackend(const QString &name, QObject *parent = nullptr);
     ~TinyCanBackend();
 
     bool open() Q_DECL_OVERRIDE;
diff --git a/src/serialbus/doc/snippets/snippetmain.cpp b/src/serialbus/doc/snippets/snippetmain.cpp
index c26acfc..1852d47 100644
--- a/src/serialbus/doc/snippets/snippetmain.cpp
+++ b/src/serialbus/doc/snippets/snippetmain.cpp
@@ -43,7 +43,7 @@
 
 int main(int /*argc*/, char ** /*argv*/)
 {
-    QCanBusDevice * device = Q_NULLPTR;
+    QCanBusDevice * device = nullptr;
 
     //! [Filter Examples]
     QCanBusDevice::Filter filter;
diff --git a/src/serialbus/qcanbus.cpp b/src/serialbus/qcanbus.cpp
index bc81408..4fa7520 100644
--- a/src/serialbus/qcanbus.cpp
+++ b/src/serialbus/qcanbus.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 struct QCanBusPrivate
 {
 public:
-    QCanBusPrivate() : factory(Q_NULLPTR), index(-1) { }
+    QCanBusPrivate() : factory(nullptr), index(-1) { }
 
     QJsonObject meta;
     QCanBusFactory *factory;
@@ -67,7 +67,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, qFactoryLoader,
 typedef QMap<QByteArray, QCanBusPrivate> QCanBusPluginStore;
 Q_GLOBAL_STATIC(QCanBusPluginStore, qCanBusPlugins)
 
-static QCanBus *globalInstance = Q_NULLPTR;
+static QCanBus *globalInstance = nullptr;
 
 static void loadPlugins()
 {
@@ -126,19 +126,19 @@ QCanBusDevice *QCanBus::createDevice(const QByteArray &plugin,
                                      const QString &interfaceName) const
 {
     if (!qCanBusPlugins()->contains(plugin))
-        return Q_NULLPTR;
+        return nullptr;
 
     QCanBusPrivate d = qCanBusPlugins()->value(plugin);
     if (!d.factory) {
         d.factory
             = qobject_cast<QCanBusFactory *>(qFactoryLoader->instance(d.index));
         if (!d.factory)
-            return Q_NULLPTR;
+            return nullptr;
 
         qCanBusPlugins()->insert(plugin, d);
     }
     if (!d.factory)
-        return Q_NULLPTR;
+        return nullptr;
 
     return d.factory->createDevice(interfaceName);
 }
diff --git a/src/serialbus/qcanbus.h b/src/serialbus/qcanbus.h
index 980a0ac..97bf35e 100644
--- a/src/serialbus/qcanbus.h
+++ b/src/serialbus/qcanbus.h
@@ -57,7 +57,7 @@ public:
                                 const QString &interfaceName) const;
 
 private:
-    QCanBus(QObject *parent = Q_NULLPTR);
+    QCanBus(QObject *parent = nullptr);
 
     Q_DISABLE_COPY(QCanBus)
 };
diff --git a/src/serialbus/qcanbusdevice.h b/src/serialbus/qcanbusdevice.h
index 8c9436c..df89016 100644
--- a/src/serialbus/qcanbusdevice.h
+++ b/src/serialbus/qcanbusdevice.h
@@ -95,7 +95,7 @@ public:
         FormatFilter format = MatchBaseAndExtendedFormat;
     };
 
-    explicit QCanBusDevice(QObject *parent = Q_NULLPTR);
+    explicit QCanBusDevice(QObject *parent = nullptr);
 
     virtual void setConfigurationParameter(int key,
                                            const QVariant &value);
diff --git a/src/serialbus/qmodbusclient.cpp b/src/serialbus/qmodbusclient.cpp
index 4d61ee9..a54f739 100644
--- a/src/serialbus/qmodbusclient.cpp
+++ b/src/serialbus/qmodbusclient.cpp
@@ -87,7 +87,7 @@ QModbusClient::~QModbusClient()
 /*!
     Sends a request to read the contents of the data pointed by \a read.
     Returns a new valid \l QModbusReply object if no error occurred, otherwise
-    Q_NULLPTR. Modbus network may have multiple servers, each server has unique
+    nullptr. Modbus network may have multiple servers, each server has unique
     \a serverAddress.
 */
 QModbusReply *QModbusClient::sendReadRequest(const QModbusDataUnit &read, int serverAddress)
@@ -99,7 +99,7 @@ QModbusReply *QModbusClient::sendReadRequest(const QModbusDataUnit &read, int se
 /*!
     Sends a request to modify the contents of the data pointed by \a write.
     Returns a new valid \l QModbusReply object if no error occurred, otherwise
-    Q_NULLPTR. Modbus network may have multiple servers, each server has unique
+    nullptr. Modbus network may have multiple servers, each server has unique
     \a serverAddress.
 */
 QModbusReply *QModbusClient::sendWriteRequest(const QModbusDataUnit &write, int serverAddress)
@@ -113,7 +113,7 @@ QModbusReply *QModbusClient::sendWriteRequest(const QModbusDataUnit &write, int
     modify the contents of the data pointed by \a write using Modbus function
     code \l QModbusPdu::ReadWriteMultipleRegisters.
     Returns a new valid \l QModbusReply object if no error occurred, otherwise
-    Q_NULLPTR. Modbus network may have multiple servers, each server has unique
+    nullptr. Modbus network may have multiple servers, each server has unique
     \a serverAddress.
 
     \note: Sending this kind of request is only valid of both \a read and
@@ -131,14 +131,14 @@ QModbusReply *QModbusClient::sendReadWriteRequest(const QModbusDataUnit &read,
     fits inside the Modbus PDU data section and has a valid function code.
     The only check performed before sending is therefore the validity check,
     see \l QModbusPdu::isValid. If no error occurred the function returns a
-    a new valid \l QModbusReply; Q_NULLPTR otherwise. Modbus networks may have
+    a new valid \l QModbusReply; nullptr otherwise. Modbus networks may have
     multiple servers, each server has a unique \a serverAddress.
 
     \sa QModbusReply::rawResult()
 */
 QModbusReply *QModbusClient::sendRawRequest(const QModbusRequest &request, int serverAddress)
 {
-    return d_func()->sendRequest(request, serverAddress, Q_NULLPTR);
+    return d_func()->sendRequest(request, serverAddress, nullptr);
 }
 
 /*!
@@ -249,13 +249,13 @@ QModbusReply *QModbusClientPrivate::sendRequest(const QModbusRequest &request, i
     if (!isOpen() || q->state() != QModbusDevice::ConnectedState) {
         qCWarning(QT_MODBUS) << "(Client) Device is not connected";
         q->setError(QModbusClient::tr("Device not connected."), QModbusDevice::ConnectionError);
-        return Q_NULLPTR;
+        return nullptr;
     }
 
     if (!request.isValid()) {
         qCWarning(QT_MODBUS) << "(Client) Refuse to send invalid request.";
         q->setError(QModbusClient::tr("Invalid Modbus request."), QModbusDevice::ProtocolError);
-        return Q_NULLPTR;
+        return nullptr;
     }
 
     if (unit)
diff --git a/src/serialbus/qmodbusclient.h b/src/serialbus/qmodbusclient.h
index 1adbc66..1a22d3b 100644
--- a/src/serialbus/qmodbusclient.h
+++ b/src/serialbus/qmodbusclient.h
@@ -54,7 +54,7 @@ class Q_SERIALBUS_EXPORT QModbusClient : public QModbusDevice
     Q_PROPERTY(int timeout READ timeout WRITE setTimeout NOTIFY timeoutChanged)
 
 public:
-    explicit QModbusClient(QObject *parent = Q_NULLPTR);
+    explicit QModbusClient(QObject *parent = nullptr);
     ~QModbusClient();
 
     QModbusReply *sendReadRequest(const QModbusDataUnit &read, int serverAddress);
@@ -73,7 +73,7 @@ Q_SIGNALS:
     void timeoutChanged(int newTimeout);
 
 protected:
-    QModbusClient(QModbusClientPrivate &dd, QObject *parent = Q_NULLPTR);
+    QModbusClient(QModbusClientPrivate &dd, QObject *parent = nullptr);
 
     virtual bool processResponse(const QModbusResponse &response, QModbusDataUnit *data);
     virtual bool processPrivateResponse(const QModbusResponse &response, QModbusDataUnit *data);
diff --git a/src/serialbus/qmodbusclient_p.h b/src/serialbus/qmodbusclient_p.h
index f7f6a36..da01500 100644
--- a/src/serialbus/qmodbusclient_p.h
+++ b/src/serialbus/qmodbusclient_p.h
@@ -94,7 +94,7 @@ public:
 
     virtual QModbusReply *enqueueRequest(const QModbusRequest &, int, const QModbusDataUnit &,
                                          QModbusReply::ReplyType) {
-        return Q_NULLPTR;
+        return nullptr;
     }
     // TODO: Review once we have a transport layer in place.
     virtual bool isOpen() const { return false; }
diff --git a/src/serialbus/qmodbusdevice.h b/src/serialbus/qmodbusdevice.h
index deadb20..f65f42e 100644
--- a/src/serialbus/qmodbusdevice.h
+++ b/src/serialbus/qmodbusdevice.h
@@ -86,7 +86,7 @@ public:
     };
     Q_ENUM(ConnectionParameter)
 
-    explicit QModbusDevice(QObject *parent = Q_NULLPTR);
+    explicit QModbusDevice(QObject *parent = nullptr);
     ~QModbusDevice();
 
     QVariant connectionParameter(int parameter) const;
@@ -105,7 +105,7 @@ Q_SIGNALS:
     void stateChanged(QModbusDevice::State state);
 
 protected:
-    QModbusDevice(QModbusDevicePrivate &dd, QObject *parent = Q_NULLPTR);
+    QModbusDevice(QModbusDevicePrivate &dd, QObject *parent = nullptr);
 
     void setState(QModbusDevice::State newState);
     void setError(const QString &errorText, QModbusDevice::Error error);
diff --git a/src/serialbus/qmodbusreply.h b/src/serialbus/qmodbusreply.h
index 4a761a7..a41daa3 100644
--- a/src/serialbus/qmodbusreply.h
+++ b/src/serialbus/qmodbusreply.h
@@ -57,7 +57,7 @@ public:
     };
     Q_ENUM(ReplyType)
 
-    QModbusReply(ReplyType type, int serverAddress, QObject *parent = Q_NULLPTR);
+    QModbusReply(ReplyType type, int serverAddress, QObject *parent = nullptr);
 
     ReplyType type() const;
     int serverAddress() const;
diff --git a/src/serialbus/qmodbusrtuserialmaster.h b/src/serialbus/qmodbusrtuserialmaster.h
index 7f879f5..84b3379 100644
--- a/src/serialbus/qmodbusrtuserialmaster.h
+++ b/src/serialbus/qmodbusrtuserialmaster.h
@@ -49,11 +49,11 @@ class Q_SERIALBUS_EXPORT QModbusRtuSerialMaster : public QModbusClient
     Q_DECLARE_PRIVATE(QModbusRtuSerialMaster)
 
 public:
-    explicit QModbusRtuSerialMaster(QObject *parent = Q_NULLPTR);
+    explicit QModbusRtuSerialMaster(QObject *parent = nullptr);
     ~QModbusRtuSerialMaster();
 
 protected:
-    QModbusRtuSerialMaster(QModbusRtuSerialMasterPrivate &dd, QObject *parent = Q_NULLPTR);
+    QModbusRtuSerialMaster(QModbusRtuSerialMasterPrivate &dd, QObject *parent = nullptr);
 
     void close() Q_DECL_OVERRIDE;
     bool open() Q_DECL_OVERRIDE;
diff --git a/src/serialbus/qmodbusrtuserialmaster_p.h b/src/serialbus/qmodbusrtuserialmaster_p.h
index 022c902..4da7b61 100644
--- a/src/serialbus/qmodbusrtuserialmaster_p.h
+++ b/src/serialbus/qmodbusrtuserialmaster_p.h
@@ -381,7 +381,7 @@ public:
     QByteArray responseBuffer;
 
     QQueue<QueueElement> m_queue;
-    QSerialPort *m_serialPort = Q_NULLPTR;
+    QSerialPort *m_serialPort = nullptr;
 
     int m_timeoutThreeDotFiveMs = 2; // A approximated value of 1.750 msec.
 };
diff --git a/src/serialbus/qmodbusrtuserialslave.h b/src/serialbus/qmodbusrtuserialslave.h
index 9cbc5a0..f81ac88 100644
--- a/src/serialbus/qmodbusrtuserialslave.h
+++ b/src/serialbus/qmodbusrtuserialslave.h
@@ -49,13 +49,13 @@ class Q_SERIALBUS_EXPORT QModbusRtuSerialSlave : public QModbusServer
     Q_DECLARE_PRIVATE(QModbusRtuSerialSlave)
 
 public:
-    explicit QModbusRtuSerialSlave(QObject *parent = Q_NULLPTR);
+    explicit QModbusRtuSerialSlave(QObject *parent = nullptr);
     ~QModbusRtuSerialSlave();
 
     bool processesBroadcast() const Q_DECL_OVERRIDE;
 
 protected:
-    QModbusRtuSerialSlave(QModbusRtuSerialSlavePrivate &dd, QObject *parent = Q_NULLPTR);
+    QModbusRtuSerialSlave(QModbusRtuSerialSlavePrivate &dd, QObject *parent = nullptr);
 
     bool open() Q_DECL_OVERRIDE;
     void close() Q_DECL_OVERRIDE;
diff --git a/src/serialbus/qmodbusserver.h b/src/serialbus/qmodbusserver.h
index b2a501e..e7428f5 100644
--- a/src/serialbus/qmodbusserver.h
+++ b/src/serialbus/qmodbusserver.h
@@ -67,7 +67,7 @@ public:
     };
     Q_ENUM(Option)
 
-    explicit QModbusServer(QObject *parent = Q_NULLPTR);
+    explicit QModbusServer(QObject *parent = nullptr);
     ~QModbusServer();
 
     int serverAddress() const;
@@ -89,7 +89,7 @@ Q_SIGNALS:
     void dataWritten(QModbusDataUnit::RegisterType table, int address, int size);
 
 protected:
-    QModbusServer(QModbusServerPrivate &dd, QObject *parent = Q_NULLPTR);
+    QModbusServer(QModbusServerPrivate &dd, QObject *parent = nullptr);
 
     virtual bool writeData(const QModbusDataUnit &unit);
     virtual bool readData(QModbusDataUnit *newData) const;
diff --git a/src/serialbus/qmodbustcpclient.h b/src/serialbus/qmodbustcpclient.h
index 5301989..9f6921a 100644
--- a/src/serialbus/qmodbustcpclient.h
+++ b/src/serialbus/qmodbustcpclient.h
@@ -49,11 +49,11 @@ class Q_SERIALBUS_EXPORT QModbusTcpClient : public QModbusClient
     Q_DECLARE_PRIVATE(QModbusTcpClient)
 
 public:
-    explicit QModbusTcpClient(QObject *parent = Q_NULLPTR);
+    explicit QModbusTcpClient(QObject *parent = nullptr);
     ~QModbusTcpClient();
 
 protected:
-    QModbusTcpClient(QModbusTcpClientPrivate &dd, QObject *parent = Q_NULLPTR);
+    QModbusTcpClient(QModbusTcpClientPrivate &dd, QObject *parent = nullptr);
 
     bool open() Q_DECL_OVERRIDE;
     void close() Q_DECL_OVERRIDE;
diff --git a/src/serialbus/qmodbustcpclient_p.h b/src/serialbus/qmodbustcpclient_p.h
index d196bb5..e118e4d 100644
--- a/src/serialbus/qmodbustcpclient_p.h
+++ b/src/serialbus/qmodbustcpclient_p.h
@@ -176,7 +176,7 @@ public:
 
         const int tId = transactionId();
         if (!writeToSocket(tId, request, serverAddress))
-            return Q_NULLPTR;
+            return nullptr;
 
         Q_Q(QModbusTcpClient);
         QModbusReply *const reply = new QModbusReply(type, serverAddress, q);
@@ -254,7 +254,7 @@ public:
     inline void incrementTransactionId() { m_transactionId++; }
     inline int transactionId() const { return m_transactionId; }
 
-    QTcpSocket *m_socket = Q_NULLPTR;
+    QTcpSocket *m_socket = nullptr;
     QByteArray responseBuffer;
     QHash<quint16, QueueElement> m_transactionStore;
     int mbpaHeaderSize = 7;
diff --git a/src/serialbus/qmodbustcpserver.h b/src/serialbus/qmodbustcpserver.h
index f5dea01..179be58 100644
--- a/src/serialbus/qmodbustcpserver.h
+++ b/src/serialbus/qmodbustcpserver.h
@@ -50,11 +50,11 @@ class Q_SERIALBUS_EXPORT QModbusTcpServer : public QModbusServer
     Q_DECLARE_PRIVATE(QModbusTcpServer)
 
 public:
-    explicit QModbusTcpServer(QObject *parent = Q_NULLPTR);
+    explicit QModbusTcpServer(QObject *parent = nullptr);
     ~QModbusTcpServer();
 
 protected:
-    QModbusTcpServer(QModbusTcpServerPrivate &dd, QObject *parent = Q_NULLPTR);
+    QModbusTcpServer(QModbusTcpServerPrivate &dd, QObject *parent = nullptr);
 
     bool open() Q_DECL_OVERRIDE;
     void close() Q_DECL_OVERRIDE;
diff --git a/src/tools/canbusutil/canbusutil.h b/src/tools/canbusutil/canbusutil.h
index 5a62c73..6d755c7 100644
--- a/src/tools/canbusutil/canbusutil.h
+++ b/src/tools/canbusutil/canbusutil.h
@@ -47,7 +47,7 @@ class CanBusUtil : public QObject
 {
     Q_OBJECT
 public:
-    explicit CanBusUtil(QTextStream& output, QCoreApplication& app, QObject *parent = Q_NULLPTR);
+    explicit CanBusUtil(QTextStream& output, QCoreApplication& app, QObject *parent = nullptr);
 
     bool start(int argc, char *argv[]);
 
diff --git a/src/tools/canbusutil/readtask.cpp b/src/tools/canbusutil/readtask.cpp
index fc5a53e..768e462 100644
--- a/src/tools/canbusutil/readtask.cpp
+++ b/src/tools/canbusutil/readtask.cpp
@@ -44,7 +44,7 @@ ReadTask::ReadTask(QTextStream& output, QObject *parent)
 
 void ReadTask::checkMessages() {
     QCanBusDevice* canDevice = qobject_cast<QCanBusDevice*>(QObject::sender());
-    if (canDevice == Q_NULLPTR) {
+    if (canDevice == nullptr) {
         qWarning() << "ReadTask::checkMessages: Unknown sender";
         return;
     }
@@ -82,7 +82,7 @@ void ReadTask::checkMessages() {
 
 void ReadTask::receiveError(QCanBusDevice::CanBusError /*error*/) {
     QCanBusDevice* canDevice = qobject_cast<QCanBusDevice*>(QObject::sender());
-    if (canDevice == Q_NULLPTR) {
+    if (canDevice == nullptr) {
         qWarning() << "ReadTask::receiveError: Unknown sender";
         return;
     }
diff --git a/src/tools/canbusutil/readtask.h b/src/tools/canbusutil/readtask.h
index 4dfb2f0..b0a9366 100644
--- a/src/tools/canbusutil/readtask.h
+++ b/src/tools/canbusutil/readtask.h
@@ -45,7 +45,7 @@ class ReadTask : public QObject
 {
     Q_OBJECT
 public:
-    explicit ReadTask(QTextStream& output, QObject *parent = Q_NULLPTR);
+    explicit ReadTask(QTextStream& output, QObject *parent = nullptr);
 
 signals:
     void sigTermSignal();
diff --git a/src/tools/canbusutil/sigtermhandler.h b/src/tools/canbusutil/sigtermhandler.h
index 7cdde20..a767eba 100644
--- a/src/tools/canbusutil/sigtermhandler.h
+++ b/src/tools/canbusutil/sigtermhandler.h
@@ -52,7 +52,7 @@ signals:
     void sigTermSignal();
 
 private:
-    explicit SigTermHandler(QObject *parent = Q_NULLPTR);
+    explicit SigTermHandler(QObject *parent = nullptr);
 };
 
 #endif // SIGTERMHANDLER_H
diff --git a/tests/auto/qcanbus/tst_qcanbus.cpp b/tests/auto/qcanbus/tst_qcanbus.cpp
index 5148415..664f4e8 100644
--- a/tests/auto/qcanbus/tst_qcanbus.cpp
+++ b/tests/auto/qcanbus/tst_qcanbus.cpp
@@ -70,7 +70,7 @@ void tst_QCanBus::initTestCase()
                                      + QStringLiteral("/../../../../plugins"));
 #endif
     bus = QCanBus::instance();
-    QVERIFY(bus != 0);
+    QVERIFY(bus);
     QPointer<QCanBus> sameInstance;
     sameInstance = QCanBus::instance();
     QCOMPARE(bus, sameInstance);
diff --git a/tests/auto/qmodbusserver/tst_qmodbusserver.cpp b/tests/auto/qmodbusserver/tst_qmodbusserver.cpp
index 114063a..63667b7 100644
--- a/tests/auto/qmodbusserver/tst_qmodbusserver.cpp
+++ b/tests/auto/qmodbusserver/tst_qmodbusserver.cpp
@@ -1107,7 +1107,7 @@ private slots:
         }
         QCOMPARE(s_msg, QString("QModbusServer::data() call did end in the expected OVERRIDE."));
         {
-            s.data(QModbusDataUnit::Coils, 0u, Q_NULLPTR);
+            s.data(QModbusDataUnit::Coils, 0u, nullptr);
         }
         QCOMPARE(s_msg, QString("QModbusServer::data() call did end in the expected OVERRIDE."));
         {