summaryrefslogtreecommitdiffstats
path: root/src/render/lights
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-04-29 19:35:20 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-05-01 15:43:11 +0000
commita01b14670e5b35a951ec57297613418dc829d65c (patch)
treed9bdcc4ca7b325ff5a1c2e68b801efe9e4d667b8 /src/render/lights
parentf9dc7c72090b9a11a3daf9e2c912213fbeec5739 (diff)
Q_NULLPTR -> nullptr
Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/lights')
-rw-r--r--src/render/lights/light.cpp2
-rw-r--r--src/render/lights/qabstractlight.h2
-rw-r--r--src/render/lights/qdirectionallight.h4
-rw-r--r--src/render/lights/qpointlight.h2
-rw-r--r--src/render/lights/qspotlight.h4
5 files changed, 7 insertions, 7 deletions
diff --git a/src/render/lights/light.cpp b/src/render/lights/light.cpp
index 87a0553bb..1bf5e2f85 100644
--- a/src/render/lights/light.cpp
+++ b/src/render/lights/light.cpp
@@ -57,7 +57,7 @@ void Light::updateFromPeer(QNode *node)
{
QAbstractLight *light = static_cast<QAbstractLight *>(node);
QShaderData *shaderData = light->findChild<QShaderData *>();
- if (shaderData != Q_NULLPTR)
+ if (shaderData != nullptr)
m_shaderDataId = shaderData->id();
}
diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h
index 29c4eece1..3881257c4 100644
--- a/src/render/lights/qabstractlight.h
+++ b/src/render/lights/qabstractlight.h
@@ -76,7 +76,7 @@ public Q_SLOTS:
void setIntensity(float intensity);
protected :
- QAbstractLight(QAbstractLightPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR);
+ QAbstractLight(QAbstractLightPrivate &dd, Qt3DCore::QNode *parent = nullptr);
Q_SIGNALS:
diff --git a/src/render/lights/qdirectionallight.h b/src/render/lights/qdirectionallight.h
index 79ad7c663..a0c756330 100644
--- a/src/render/lights/qdirectionallight.h
+++ b/src/render/lights/qdirectionallight.h
@@ -54,7 +54,7 @@ class QT3DRENDERSHARED_EXPORT QDirectionalLight : public QAbstractLight
Q_PROPERTY(QVector3D worldDirection READ worldDirection WRITE setWorldDirection NOTIFY worldDirectionChanged)
public:
- explicit QDirectionalLight(Qt3DCore::QNode *parent = Q_NULLPTR);
+ explicit QDirectionalLight(Qt3DCore::QNode *parent = nullptr);
QVector3D worldDirection() const;
@@ -65,7 +65,7 @@ Q_SIGNALS:
void worldDirectionChanged(const QVector3D &worldDirection);
protected:
- QDirectionalLight(QDirectionalLightPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR);
+ QDirectionalLight(QDirectionalLightPrivate &dd, Qt3DCore::QNode *parent = nullptr);
private:
Q_DECLARE_PRIVATE(QDirectionalLight)
diff --git a/src/render/lights/qpointlight.h b/src/render/lights/qpointlight.h
index 6f975f07b..c5b9b2d51 100644
--- a/src/render/lights/qpointlight.h
+++ b/src/render/lights/qpointlight.h
@@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QPointLight : public QAbstractLight
Q_PROPERTY(float quadraticAttenuation READ quadraticAttenuation WRITE setQuadraticAttenuation NOTIFY quadraticAttenuationChanged)
public:
- explicit QPointLight(Qt3DCore::QNode *parent = Q_NULLPTR);
+ explicit QPointLight(Qt3DCore::QNode *parent = nullptr);
float constantAttenuation() const;
float linearAttenuation() const;
diff --git a/src/render/lights/qspotlight.h b/src/render/lights/qspotlight.h
index d66aa2719..fff75e50e 100644
--- a/src/render/lights/qspotlight.h
+++ b/src/render/lights/qspotlight.h
@@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QSpotLight : public QAbstractLight
Q_PROPERTY(float cutOffAngle READ cutOffAngle WRITE setCutOffAngle NOTIFY cutOffAngleChanged)
public:
- explicit QSpotLight(Qt3DCore::QNode *parent = Q_NULLPTR);
+ explicit QSpotLight(Qt3DCore::QNode *parent = nullptr);
QVector3D attenuation() const;
QVector3D localDirection() const;
@@ -83,7 +83,7 @@ Q_SIGNALS:
void cutOffAngleChanged(float cutOffAngle);
protected:
- QSpotLight(QSpotLightPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR);
+ QSpotLight(QSpotLightPrivate &dd, Qt3DCore::QNode *parent = nullptr);
private:
Q_DECLARE_PRIVATE(QSpotLight)