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/quick3d/quick3dextras | |
| 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/quick3d/quick3dextras')
| -rw-r--r-- | src/quick3d/quick3dextras/qt3dquickwindow.cpp | 8 | ||||
| -rw-r--r-- | src/quick3d/quick3dextras/qt3dquickwindow.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp index 96c4bff6a..7d4ad0dd9 100644 --- a/src/quick3d/quick3dextras/qt3dquickwindow.cpp +++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp @@ -70,10 +70,10 @@ namespace Quick { Qt3DQuickWindow::Qt3DQuickWindow(QWindow *parent) : QQuickWindow(parent) - , m_engine(Q_NULLPTR) - , m_renderAspect(Q_NULLPTR) - , m_inputAspect(Q_NULLPTR) - , m_logicAspect(Q_NULLPTR) + , m_engine(nullptr) + , m_renderAspect(nullptr) + , m_inputAspect(nullptr) + , m_logicAspect(nullptr) , m_initialized(false) , m_cameraAspectRatioMode(AutomaticAspectRatio) { diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.h b/src/quick3d/quick3dextras/qt3dquickwindow.h index 83d31dbc9..321e0c453 100644 --- a/src/quick3d/quick3dextras/qt3dquickwindow.h +++ b/src/quick3d/quick3dextras/qt3dquickwindow.h @@ -88,7 +88,7 @@ class QT3DQUICKEXTRASSHARED_EXPORT Qt3DQuickWindow : public QQuickWindow Q_PROPERTY(CameraAspectRatioMode cameraAspectRatioMode READ cameraAspectRatioMode WRITE setCameraAspectRatioMode NOTIFY cameraAspectRatioModeChanged) public: - Qt3DQuickWindow(QWindow *parent = Q_NULLPTR); + Qt3DQuickWindow(QWindow *parent = nullptr); ~Qt3DQuickWindow(); void registerAspect(Qt3DCore::QAbstractAspect *aspect); |