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/extras/defaults/qfirstpersoncameracontroller.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/extras/defaults/qfirstpersoncameracontroller.cpp')
| -rw-r--r-- | src/extras/defaults/qfirstpersoncameracontroller.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/extras/defaults/qfirstpersoncameracontroller.cpp b/src/extras/defaults/qfirstpersoncameracontroller.cpp index 57cf3ba88..2558dc7b6 100644 --- a/src/extras/defaults/qfirstpersoncameracontroller.cpp +++ b/src/extras/defaults/qfirstpersoncameracontroller.cpp @@ -67,7 +67,7 @@ namespace Qt3DExtras { QFirstPersonCameraControllerPrivate::QFirstPersonCameraControllerPrivate() : Qt3DCore::QEntityPrivate() - , m_camera(Q_NULLPTR) + , m_camera(nullptr) , m_leftMouseButtonAction(new Qt3DInput::QAction()) , m_fineMotionAction(new Qt3DInput::QAction()) , m_rxAxis(new Qt3DInput::QAxis()) @@ -178,7 +178,7 @@ void QFirstPersonCameraControllerPrivate::init() void QFirstPersonCameraControllerPrivate::_q_onTriggered(float dt) { - if (m_camera != Q_NULLPTR) { + if (m_camera != nullptr) { m_camera->translate(QVector3D(m_txAxis->value() * m_linearSpeed, m_tyAxis->value() * m_linearSpeed, m_tzAxis->value() * m_linearSpeed) * dt); |