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

diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h
index 9f331101d1..1cbd690f24 100644
--- a/src/widgets/dialogs/qfiledialog.h
+++ b/src/widgets/dialogs/qfiledialog.h
@@ -98,7 +98,7 @@ public:
     Q_FLAG(Options)
 
     QFileDialog(QWidget *parent, Qt::WindowFlags f);
-    explicit QFileDialog(QWidget *parent = Q_NULLPTR,
+    explicit QFileDialog(QWidget *parent = nullptr,
                          const QString &caption = QString(),
                          const QString &directory = QString(),
                          const QString &filter = QString());
@@ -207,59 +207,59 @@ Q_SIGNALS:
 
 public:
 
-    static QString getOpenFileName(QWidget *parent = Q_NULLPTR,
+    static QString getOpenFileName(QWidget *parent = nullptr,
                                    const QString &caption = QString(),
                                    const QString &dir = QString(),
                                    const QString &filter = QString(),
-                                   QString *selectedFilter = Q_NULLPTR,
+                                   QString *selectedFilter = nullptr,
                                    Options options = Options());
 
-    static QUrl getOpenFileUrl(QWidget *parent = Q_NULLPTR,
+    static QUrl getOpenFileUrl(QWidget *parent = nullptr,
                                const QString &caption = QString(),
                                const QUrl &dir = QUrl(),
                                const QString &filter = QString(),
-                               QString *selectedFilter = Q_NULLPTR,
+                               QString *selectedFilter = nullptr,
                                Options options = Options(),
                                const QStringList &supportedSchemes = QStringList());
 
-    static QString getSaveFileName(QWidget *parent = Q_NULLPTR,
+    static QString getSaveFileName(QWidget *parent = nullptr,
                                    const QString &caption = QString(),
                                    const QString &dir = QString(),
                                    const QString &filter = QString(),
-                                   QString *selectedFilter = Q_NULLPTR,
+                                   QString *selectedFilter = nullptr,
                                    Options options = Options());
 
-    static QUrl getSaveFileUrl(QWidget *parent = Q_NULLPTR,
+    static QUrl getSaveFileUrl(QWidget *parent = nullptr,
                                const QString &caption = QString(),
                                const QUrl &dir = QUrl(),
                                const QString &filter = QString(),
-                               QString *selectedFilter = Q_NULLPTR,
+                               QString *selectedFilter = nullptr,
                                Options options = Options(),
                                const QStringList &supportedSchemes = QStringList());
 
-    static QString getExistingDirectory(QWidget *parent = Q_NULLPTR,
+    static QString getExistingDirectory(QWidget *parent = nullptr,
                                         const QString &caption = QString(),
                                         const QString &dir = QString(),
                                         Options options = ShowDirsOnly);
 
-    static QUrl getExistingDirectoryUrl(QWidget *parent = Q_NULLPTR,
+    static QUrl getExistingDirectoryUrl(QWidget *parent = nullptr,
                                         const QString &caption = QString(),
                                         const QUrl &dir = QUrl(),
                                         Options options = ShowDirsOnly,
                                         const QStringList &supportedSchemes = QStringList());
 
-    static QStringList getOpenFileNames(QWidget *parent = Q_NULLPTR,
+    static QStringList getOpenFileNames(QWidget *parent = nullptr,
                                         const QString &caption = QString(),
                                         const QString &dir = QString(),
                                         const QString &filter = QString(),
-                                        QString *selectedFilter = Q_NULLPTR,
+                                        QString *selectedFilter = nullptr,
                                         Options options = Options());
 
-    static QList<QUrl> getOpenFileUrls(QWidget *parent = Q_NULLPTR,
+    static QList<QUrl> getOpenFileUrls(QWidget *parent = nullptr,
                                        const QString &caption = QString(),
                                        const QUrl &dir = QUrl(),
                                        const QString &filter = QString(),
-                                       QString *selectedFilter = Q_NULLPTR,
+                                       QString *selectedFilter = nullptr,
                                        Options options = Options(),
                                        const QStringList &supportedSchemes = QStringList());