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>

6 files changed, 15 insertions, 15 deletions

diff --git a/examples/network/fortuneclient/client.cpp b/examples/network/fortuneclient/client.cpp
index c0043e246f..3156a9d62c 100644
--- a/examples/network/fortuneclient/client.cpp
+++ b/examples/network/fortuneclient/client.cpp
@@ -60,7 +60,7 @@ Client::Client(QWidget *parent)
     , portLineEdit(new QLineEdit)
     , getFortuneButton(new QPushButton(tr("Get Fortune")))
     , tcpSocket(new QTcpSocket(this))
-    , networkSession(Q_NULLPTR)
+    , networkSession(nullptr)
 {
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 //! [0]
@@ -127,7 +127,7 @@ Client::Client(QWidget *parent)
             this, &Client::displayError);
 //! [4]
 
-    QGridLayout *mainLayout = Q_NULLPTR;
+    QGridLayout *mainLayout = nullptr;
     if (QGuiApplication::styleHints()->showIsFullScreen() || QGuiApplication::styleHints()->showIsMaximized()) {
         QVBoxLayout *outerVerticalLayout = new QVBoxLayout(this);
         outerVerticalLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding));
diff --git a/examples/network/fortuneclient/client.h b/examples/network/fortuneclient/client.h
index 8037e9b047..3ba15173a4 100644
--- a/examples/network/fortuneclient/client.h
+++ b/examples/network/fortuneclient/client.h
@@ -70,7 +70,7 @@ class Client : public QDialog
     Q_OBJECT
 
 public:
-    explicit Client(QWidget *parent = Q_NULLPTR);
+    explicit Client(QWidget *parent = nullptr);
 
 private slots:
     void requestNewFortune();
diff --git a/examples/network/fortuneserver/server.cpp b/examples/network/fortuneserver/server.cpp
index f027d68dd9..aac95ad820 100644
--- a/examples/network/fortuneserver/server.cpp
+++ b/examples/network/fortuneserver/server.cpp
@@ -58,7 +58,7 @@
 Server::Server(QWidget *parent)
     : QDialog(parent)
     , statusLabel(new QLabel)
-    , tcpServer(Q_NULLPTR)
+    , tcpServer(nullptr)
     , networkSession(0)
 {
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
@@ -109,7 +109,7 @@ Server::Server(QWidget *parent)
         buttonLayout->addWidget(quitButton);
         buttonLayout->addStretch(1);
 
-        QVBoxLayout *mainLayout = Q_NULLPTR;
+        QVBoxLayout *mainLayout = nullptr;
         if (QGuiApplication::styleHints()->showIsFullScreen() || QGuiApplication::styleHints()->showIsMaximized()) {
             QVBoxLayout *outerVerticalLayout = new QVBoxLayout(this);
             outerVerticalLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding));
diff --git a/examples/network/fortuneserver/server.h b/examples/network/fortuneserver/server.h
index ea5ed78292..87cdea9c8c 100644
--- a/examples/network/fortuneserver/server.h
+++ b/examples/network/fortuneserver/server.h
@@ -66,7 +66,7 @@ class Server : public QDialog
     Q_OBJECT
 
 public:
-    explicit Server(QWidget *parent = Q_NULLPTR);
+    explicit Server(QWidget *parent = nullptr);
 
 private slots:
     void sessionOpened();
diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp
index fddd2c809a..9640907673 100644
--- a/examples/network/http/httpwindow.cpp
+++ b/examples/network/http/httpwindow.cpp
@@ -87,8 +87,8 @@ HttpWindow::HttpWindow(QWidget *parent)
     , launchCheckBox(new QCheckBox("Launch file"))
     , defaultFileLineEdit(new QLineEdit(defaultFileName))
     , downloadDirectoryLineEdit(new QLineEdit)
-    , reply(Q_NULLPTR)
-    , file(Q_NULLPTR)
+    , reply(nullptr)
+    , file(nullptr)
     , httpRequestAborted(false)
 {
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
@@ -204,7 +204,7 @@ QFile *HttpWindow::openFileForWrite(const QString &fileName)
                                  tr("Unable to save the file %1: %2.")
                                  .arg(QDir::toNativeSeparators(fileName),
                                       file->errorString()));
-        return Q_NULLPTR;
+        return nullptr;
     }
     return file.take();
 }
@@ -224,12 +224,12 @@ void HttpWindow::httpFinished()
         fi.setFile(file->fileName());
         file->close();
         delete file;
-        file = Q_NULLPTR;
+        file = nullptr;
     }
 
     if (httpRequestAborted) {
         reply->deleteLater();
-        reply = Q_NULLPTR;
+        reply = nullptr;
         return;
     }
 
@@ -238,14 +238,14 @@ void HttpWindow::httpFinished()
         statusLabel->setText(tr("Download failed:\n%1.").arg(reply->errorString()));
         downloadButton->setEnabled(true);
         reply->deleteLater();
-        reply = Q_NULLPTR;
+        reply = nullptr;
         return;
     }
 
     const QVariant redirectionTarget = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
 
     reply->deleteLater();
-    reply = Q_NULLPTR;
+    reply = nullptr;
 
     if (!redirectionTarget.isNull()) {
         const QUrl redirectedUrl = url.resolved(redirectionTarget.toUrl());
diff --git a/examples/network/http/httpwindow.h b/examples/network/http/httpwindow.h
index 3bb43dbf89..f942c33952 100644
--- a/examples/network/http/httpwindow.h
+++ b/examples/network/http/httpwindow.h
@@ -71,7 +71,7 @@ class ProgressDialog : public QProgressDialog {
     Q_OBJECT
 
 public:
-    explicit ProgressDialog(const QUrl &url, QWidget *parent = Q_NULLPTR);
+    explicit ProgressDialog(const QUrl &url, QWidget *parent = nullptr);
 
 public slots:
    void networkReplyProgress(qint64 bytesRead, qint64 totalBytes);
@@ -82,7 +82,7 @@ class HttpWindow : public QDialog
     Q_OBJECT
 
 public:
-    explicit HttpWindow(QWidget *parent = Q_NULLPTR);
+    explicit HttpWindow(QWidget *parent = nullptr);
 
     void startRequest(const QUrl &requestedUrl);