summaryrefslogtreecommitdiffstats
path: root/src/core/transforms
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-01 02:13:35 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-01 19:26:22 +0000
commit792fb7c40e33fa34d6039956c48dea4bd82bb8d1 (patch)
tree08002bd7d4ab4ce8e15604d7729b5721addf22df /src/core/transforms
parent7e4b3673ac571ce067e36e29d63f1fd4418bcfb7 (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/transforms')
-rw-r--r--src/core/transforms/qtransform.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/transforms/qtransform.h b/src/core/transforms/qtransform.h
index 00f69b125..ccb4e3e5b 100644
--- a/src/core/transforms/qtransform.h
+++ b/src/core/transforms/qtransform.h
@@ -61,7 +61,7 @@ class QT3DCORESHARED_EXPORT QTransform : public QComponent
Q_PROPERTY(QVector3D translation READ translation WRITE setTranslation NOTIFY translationChanged)
public:
- explicit QTransform(QNode *parent = 0);
+ explicit QTransform(QNode *parent = Q_NULLPTR);
~QTransform();
float scale() const;
@@ -111,7 +111,7 @@ Q_SIGNALS:
void matrixChanged(const QMatrix4x4 &matrix);
protected:
- QTransform(QTransformPrivate &dd, QNode *parent = 0);
+ QTransform(QTransformPrivate &dd, QNode *parent = Q_NULLPTR);
void copy(const QNode *ref) Q_DECL_OVERRIDE;
private: