4 files changed, 7 insertions, 7 deletions
diff --git a/src/render/picking/pickeventfilter_p.h b/src/render/picking/pickeventfilter_p.h
index 99d505ec9..df94a3085 100644
--- a/src/render/picking/pickeventfilter_p.h
+++ b/src/render/picking/pickeventfilter_p.h
@@ -65,7 +65,7 @@ class PickEventFilter : public QObject
 {
     Q_OBJECT
 public:
-    explicit PickEventFilter(QObject *parent = Q_NULLPTR);
+    explicit PickEventFilter(QObject *parent = nullptr);
     ~PickEventFilter();
 
     QList<QMouseEvent> pendingEvents();
diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp
index 3f2af9694..5473a321a 100644
--- a/src/render/picking/qobjectpicker.cpp
+++ b/src/render/picking/qobjectpicker.cpp
@@ -248,12 +248,12 @@ void QObjectPickerPrivate::propagateEvent(QPickEvent *event, EventType type)
 {
     if (!m_entities.isEmpty()) {
         Qt3DCore::QEntity *entity = m_entities.first();
-        Qt3DCore::QEntity *parentEntity = Q_NULLPTR;
-        Qt3DRender::QObjectPicker *objectPicker = Q_NULLPTR;
-        while (entity != Q_NULLPTR && entity->parent() != Q_NULLPTR && !event->isAccepted()) {
+        Qt3DCore::QEntity *parentEntity = nullptr;
+        Qt3DRender::QObjectPicker *objectPicker = nullptr;
+        while (entity != nullptr && entity->parent() != nullptr && !event->isAccepted()) {
             parentEntity = entity->parentEntity();
             Q_FOREACH (Qt3DCore::QComponent *c, parentEntity->components()) {
-                if ((objectPicker = qobject_cast<Qt3DRender::QObjectPicker *>(c)) != Q_NULLPTR) {
+                if ((objectPicker = qobject_cast<Qt3DRender::QObjectPicker *>(c)) != nullptr) {
                     QObjectPickerPrivate *objectPickerPrivate = static_cast<QObjectPickerPrivate *>(QObjectPickerPrivate::get(objectPicker));
                     switch (type) {
                     case Pressed:
diff --git a/src/render/picking/qobjectpicker.h b/src/render/picking/qobjectpicker.h
index 607d332ba..07763aa4a 100644
--- a/src/render/picking/qobjectpicker.h
+++ b/src/render/picking/qobjectpicker.h
@@ -60,7 +60,7 @@ class QT3DRENDERSHARED_EXPORT QObjectPicker : public Qt3DCore::QComponent
     Q_PROPERTY(bool containsMouse READ containsMouse NOTIFY containsMouseChanged)
 
 public:
-    explicit QObjectPicker(QNode *parent = Q_NULLPTR);
+    explicit QObjectPicker(QNode *parent = nullptr);
 
     bool isHoverEnabled() const;
     bool isDragEnabled() const;
diff --git a/src/render/picking/qpickevent.h b/src/render/picking/qpickevent.h
index ae415ce1e..f80b6d84b 100644
--- a/src/render/picking/qpickevent.h
+++ b/src/render/picking/qpickevent.h
@@ -82,7 +82,7 @@ Q_SIGNALS:
     void acceptedChanged(bool accepted);
 
 protected:
-    QPickEvent(QObjectPrivate &dd, QObject *parent = Q_NULLPTR);
+    QPickEvent(QObjectPrivate &dd, QObject *parent = nullptr);
 
 private:
     Q_DECLARE_PRIVATE(QPickEvent)