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/render/materialsystem/qparameter.h | |
| 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/render/materialsystem/qparameter.h')
| -rw-r--r-- | src/render/materialsystem/qparameter.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h index 94b0f2889..579452cab 100644 --- a/src/render/materialsystem/qparameter.h +++ b/src/render/materialsystem/qparameter.h @@ -55,10 +55,10 @@ class QT3DRENDERSHARED_EXPORT QParameter : public Qt3DCore::QNode Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged) public: - explicit QParameter(Qt3DCore::QNode *parent = 0); + explicit QParameter(Qt3DCore::QNode *parent = Q_NULLPTR); ~QParameter(); - QParameter(const QString &name, const QVariant& value, Qt3DCore::QNode *parent = 0); - QParameter(const QString &name, QAbstractTextureProvider *texture, Qt3DCore::QNode *parent = 0); + QParameter(const QString &name, const QVariant& value, Qt3DCore::QNode *parent = Q_NULLPTR); + QParameter(const QString &name, QAbstractTextureProvider *texture, Qt3DCore::QNode *parent = Q_NULLPTR); QString name() const; @@ -77,7 +77,7 @@ Q_SIGNALS: void nameChanged(const QString &name); protected: - QParameter(QParameterPrivate &dd, Qt3DCore::QNode *parent = 0); + QParameter(QParameterPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: |