diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-29 19:35:20 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-01 15:43:11 +0000 |
| commit | a01b14670e5b35a951ec57297613418dc829d65c (patch) | |
| tree | d9bdcc4ca7b325ff5a1c2e68b801efe9e4d667b8 /src/render/picking/qobjectpicker.cpp | |
| parent | f9dc7c72090b9a11a3daf9e2c912213fbeec5739 (diff) | |
Q_NULLPTR -> nullptr
Task-number: QTBUG-52736
Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/picking/qobjectpicker.cpp')
| -rw-r--r-- | src/render/picking/qobjectpicker.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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: |