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

diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h
index 56b8e011b9..6b1b427ad4 100644
--- a/src/widgets/widgets/qmenu.h
+++ b/src/widgets/widgets/qmenu.h
@@ -72,8 +72,8 @@ private:
     Q_PROPERTY(bool toolTipsVisible READ toolTipsVisible WRITE setToolTipsVisible)
 
 public:
-    explicit QMenu(QWidget *parent = Q_NULLPTR);
-    explicit QMenu(const QString &title, QWidget *parent = Q_NULLPTR);
+    explicit QMenu(QWidget *parent = nullptr);
+    explicit QMenu(const QString &title, QWidget *parent = nullptr);
     ~QMenu();
 
     using QWidget::addAction;
@@ -185,14 +185,14 @@ public:
     void setActiveAction(QAction *act);
     QAction *activeAction() const;
 
-    void popup(const QPoint &pos, QAction *at = Q_NULLPTR);
+    void popup(const QPoint &pos, QAction *at = nullptr);
     QAction *exec();
-    QAction *exec(const QPoint &pos, QAction *at = Q_NULLPTR);
+    QAction *exec(const QPoint &pos, QAction *at = nullptr);
 
 #if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
-    static QAction *exec(const QList<QAction *> &actions, const QPoint &pos, QAction *at = Q_NULLPTR, QWidget *parent = Q_NULLPTR);
+    static QAction *exec(const QList<QAction *> &actions, const QPoint &pos, QAction *at = nullptr, QWidget *parent = nullptr);
 #else
-    static QAction *exec(QList<QAction*> actions, const QPoint &pos, QAction *at = Q_NULLPTR, QWidget *parent = Q_NULLPTR);
+    static QAction *exec(QList<QAction*> actions, const QPoint &pos, QAction *at = nullptr, QWidget *parent = nullptr);
 #endif
 
     QSize sizeHint() const override;
@@ -260,7 +260,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_platformMenuAboutToShow())
 
 protected:
-    QMenu(QMenuPrivate &dd, QWidget* parent = Q_NULLPTR);
+    QMenu(QMenuPrivate &dd, QWidget* parent = nullptr);
 
 private:
     Q_DISABLE_COPY(QMenu)