diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-01 02:13:35 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-01 19:26:22 +0000 |
| commit | 792fb7c40e33fa34d6039956c48dea4bd82bb8d1 (patch) | |
| tree | 08002bd7d4ab4ce8e15604d7729b5721addf22df /src/logic | |
| parent | 7e4b3673ac571ce067e36e29d63f1fd4418bcfb7 (diff) | |
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.
Task-number: QTBUG-45291
Change-Id: I1453477ad718335ca6c5c0c3447539cb93e21176
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/logic')
| -rw-r--r-- | src/logic/qlogicaspect.h | 2 | ||||
| -rw-r--r-- | src/logic/qlogiccomponent.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/logic/qlogicaspect.h b/src/logic/qlogicaspect.h index 3abc5e03b..b70d4801f 100644 --- a/src/logic/qlogicaspect.h +++ b/src/logic/qlogicaspect.h @@ -50,7 +50,7 @@ class QT3DLOGICSHARED_EXPORT QLogicAspect : public Qt3DCore::QAbstractAspect { Q_OBJECT public: - explicit QLogicAspect(QObject *parent = 0); + explicit QLogicAspect(QObject *parent = Q_NULLPTR); QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; diff --git a/src/logic/qlogiccomponent.h b/src/logic/qlogiccomponent.h index 68d0bf69a..3d2e9739a 100644 --- a/src/logic/qlogiccomponent.h +++ b/src/logic/qlogiccomponent.h @@ -56,11 +56,11 @@ class QT3DLOGICSHARED_EXPORT QLogicComponent : public Qt3DCore::QComponent Q_OBJECT public: - explicit QLogicComponent(Qt3DCore::QNode *parent = 0); + explicit QLogicComponent(Qt3DCore::QNode *parent = Q_NULLPTR); ~QLogicComponent(); protected: - QLogicComponent(QLogicComponentPrivate &dd, QNode *parent = 0); + QLogicComponent(QLogicComponentPrivate &dd, QNode *parent = Q_NULLPTR); Q_SIGNALS: void frameUpdate(float dt); |