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>

2 files changed, 4 insertions, 4 deletions

diff --git a/src/widgets/statemachine/qkeyeventtransition.h b/src/widgets/statemachine/qkeyeventtransition.h
index b8c4a99710..676f5f7846 100644
--- a/src/widgets/statemachine/qkeyeventtransition.h
+++ b/src/widgets/statemachine/qkeyeventtransition.h
@@ -54,9 +54,9 @@ class Q_WIDGETS_EXPORT QKeyEventTransition : public QEventTransition
     Q_PROPERTY(int key READ key WRITE setKey)
     Q_PROPERTY(Qt::KeyboardModifiers modifierMask READ modifierMask WRITE setModifierMask)
 public:
-    QKeyEventTransition(QState *sourceState = Q_NULLPTR);
+    QKeyEventTransition(QState *sourceState = nullptr);
     QKeyEventTransition(QObject *object, QEvent::Type type, int key,
-                        QState *sourceState = Q_NULLPTR);
+                        QState *sourceState = nullptr);
     ~QKeyEventTransition();
 
     int key() const;
diff --git a/src/widgets/statemachine/qmouseeventtransition.h b/src/widgets/statemachine/qmouseeventtransition.h
index 49fc156a51..41f738d894 100644
--- a/src/widgets/statemachine/qmouseeventtransition.h
+++ b/src/widgets/statemachine/qmouseeventtransition.h
@@ -55,9 +55,9 @@ class Q_WIDGETS_EXPORT QMouseEventTransition : public QEventTransition
     Q_PROPERTY(Qt::MouseButton button READ button WRITE setButton)
     Q_PROPERTY(Qt::KeyboardModifiers modifierMask READ modifierMask WRITE setModifierMask)
 public:
-    QMouseEventTransition(QState *sourceState = Q_NULLPTR);
+    QMouseEventTransition(QState *sourceState = nullptr);
     QMouseEventTransition(QObject *object, QEvent::Type type,
-                          Qt::MouseButton button, QState *sourceState = Q_NULLPTR);
+                          Qt::MouseButton button, QState *sourceState = nullptr);
     ~QMouseEventTransition();
 
     Qt::MouseButton button() const;