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>

5 files changed, 12 insertions, 12 deletions

diff --git a/src/widgets/util/qcompleter.h b/src/widgets/util/qcompleter.h
index 5f6085de83..62c49ba8b4 100644
--- a/src/widgets/util/qcompleter.h
+++ b/src/widgets/util/qcompleter.h
@@ -83,10 +83,10 @@ public:
         CaseInsensitivelySortedModel
     };
 
-    QCompleter(QObject *parent = Q_NULLPTR);
-    QCompleter(QAbstractItemModel *model, QObject *parent = Q_NULLPTR);
+    QCompleter(QObject *parent = nullptr);
+    QCompleter(QAbstractItemModel *model, QObject *parent = nullptr);
 #ifndef QT_NO_STRINGLISTMODEL
-    QCompleter(const QStringList& completions, QObject *parent = Q_NULLPTR);
+    QCompleter(const QStringList& completions, QObject *parent = nullptr);
 #endif
     ~QCompleter();
 
diff --git a/src/widgets/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h
index b68cd63ddf..91b0c9d8ce 100644
--- a/src/widgets/util/qsystemtrayicon.h
+++ b/src/widgets/util/qsystemtrayicon.h
@@ -66,8 +66,8 @@ class Q_WIDGETS_EXPORT QSystemTrayIcon : public QObject
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible DESIGNABLE false)
 
 public:
-    QSystemTrayIcon(QObject *parent = Q_NULLPTR);
-    QSystemTrayIcon(const QIcon &icon, QObject *parent = Q_NULLPTR);
+    QSystemTrayIcon(QObject *parent = nullptr);
+    QSystemTrayIcon(const QIcon &icon, QObject *parent = nullptr);
     ~QSystemTrayIcon();
 
     enum ActivationReason {
diff --git a/src/widgets/util/qundogroup.h b/src/widgets/util/qundogroup.h
index dba79ea706..1845f7e057 100644
--- a/src/widgets/util/qundogroup.h
+++ b/src/widgets/util/qundogroup.h
@@ -58,7 +58,7 @@ class Q_WIDGETS_EXPORT QUndoGroup : public QObject
     Q_DECLARE_PRIVATE(QUndoGroup)
 
 public:
-    explicit QUndoGroup(QObject *parent = Q_NULLPTR);
+    explicit QUndoGroup(QObject *parent = nullptr);
     ~QUndoGroup();
 
     void addStack(QUndoStack *stack);
diff --git a/src/widgets/util/qundostack.h b/src/widgets/util/qundostack.h
index 7ab90b507a..4be24eadab 100644
--- a/src/widgets/util/qundostack.h
+++ b/src/widgets/util/qundostack.h
@@ -57,8 +57,8 @@ class Q_WIDGETS_EXPORT QUndoCommand
     QUndoCommandPrivate *d;
 
 public:
-    explicit QUndoCommand(QUndoCommand *parent = Q_NULLPTR);
-    explicit QUndoCommand(const QString &text, QUndoCommand *parent = Q_NULLPTR);
+    explicit QUndoCommand(QUndoCommand *parent = nullptr);
+    explicit QUndoCommand(const QString &text, QUndoCommand *parent = nullptr);
     virtual ~QUndoCommand();
 
     virtual void undo();
@@ -92,7 +92,7 @@ class Q_WIDGETS_EXPORT QUndoStack : public QObject
     Q_PROPERTY(int undoLimit READ undoLimit WRITE setUndoLimit)
 
 public:
-    explicit QUndoStack(QObject *parent = Q_NULLPTR);
+    explicit QUndoStack(QObject *parent = nullptr);
     ~QUndoStack();
     void clear();
 
diff --git a/src/widgets/util/qundoview.h b/src/widgets/util/qundoview.h
index 0bfcdd0c18..403f05d2e4 100644
--- a/src/widgets/util/qundoview.h
+++ b/src/widgets/util/qundoview.h
@@ -62,10 +62,10 @@ class Q_WIDGETS_EXPORT QUndoView : public QListView
     Q_PROPERTY(QIcon cleanIcon READ cleanIcon WRITE setCleanIcon)
 
 public:
-    explicit QUndoView(QWidget *parent = Q_NULLPTR);
-    explicit QUndoView(QUndoStack *stack, QWidget *parent = Q_NULLPTR);
+    explicit QUndoView(QWidget *parent = nullptr);
+    explicit QUndoView(QUndoStack *stack, QWidget *parent = nullptr);
 #if QT_CONFIG(undogroup)
-    explicit QUndoView(QUndoGroup *group, QWidget *parent = Q_NULLPTR);
+    explicit QUndoView(QUndoGroup *group, QWidget *parent = nullptr);
 #endif
     ~QUndoView();