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/core/aspects | |
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/core/aspects')
-rw-r--r-- | src/core/aspects/qabstractaspect.h | 4 | ||||
-rw-r--r-- | src/core/aspects/qaspectengine.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h index e5842aa08..7724a6e02 100644 --- a/src/core/aspects/qabstractaspect.h +++ b/src/core/aspects/qabstractaspect.h @@ -61,10 +61,10 @@ class QT3DCORESHARED_EXPORT QAbstractAspect : public QObject Q_OBJECT public: - explicit QAbstractAspect(QObject *parent = 0); + explicit QAbstractAspect(QObject *parent = Q_NULLPTR); protected: - QAbstractAspect(QAbstractAspectPrivate &dd, QObject *parent = 0); + QAbstractAspect(QAbstractAspectPrivate &dd, QObject *parent = Q_NULLPTR); template<class Frontend> void registerBackendType(const QBackendNodeFunctorPtr &functor); diff --git a/src/core/aspects/qaspectengine.h b/src/core/aspects/qaspectengine.h index b472e4130..37d0ac22e 100644 --- a/src/core/aspects/qaspectengine.h +++ b/src/core/aspects/qaspectengine.h @@ -56,7 +56,7 @@ class QT3DCORESHARED_EXPORT QAspectEngine : public QObject { Q_OBJECT public: - explicit QAspectEngine(QObject *parent = 0); + explicit QAspectEngine(QObject *parent = Q_NULLPTR); ~QAspectEngine(); void setRootEntity(QEntity *root); |