summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3drender/items
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/quick3d/quick3drender/items
parentf9dc7c72090b9a11a3daf9e2c912213fbeec5739 (diff)
Q_NULLPTR -> nullptr
Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drender/items')
-rw-r--r--src/quick3d/quick3drender/items/quick3dbuffer.cpp6
-rw-r--r--src/quick3d/quick3drender/items/quick3dbuffer_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3deffect.cpp2
-rw-r--r--src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp2
-rw-r--r--src/quick3d/quick3drender/items/quick3dtexture.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/quick3d/quick3drender/items/quick3dbuffer.cpp b/src/quick3d/quick3drender/items/quick3dbuffer.cpp
index 054fd1a9d..d2f49de6f 100644
--- a/src/quick3d/quick3drender/items/quick3dbuffer.cpp
+++ b/src/quick3d/quick3drender/items/quick3dbuffer.cpp
@@ -55,8 +55,8 @@ namespace Quick {
Quick3DBuffer::Quick3DBuffer(QObject *parent)
: QObject(parent)
- , m_engine(Q_NULLPTR)
- , m_v4engine(Q_NULLPTR)
+ , m_engine(nullptr)
+ , m_v4engine(nullptr)
{
QObject::connect(parentBuffer(), &Qt3DRender::QBuffer::dataChanged, this, &Quick3DBuffer::bufferDataChanged);
}
@@ -90,7 +90,7 @@ void Quick3DBuffer::setBufferData(const QVariant &bufferData)
void Quick3DBuffer::initEngines()
{
- if (m_engine == Q_NULLPTR) {
+ if (m_engine == nullptr) {
m_engine = qmlEngine(parent());
m_v4engine = QQmlEnginePrivate::getV4Engine(m_engine);
}
diff --git a/src/quick3d/quick3drender/items/quick3dbuffer_p.h b/src/quick3d/quick3drender/items/quick3dbuffer_p.h
index da0295a0a..512e6936c 100644
--- a/src/quick3d/quick3drender/items/quick3dbuffer_p.h
+++ b/src/quick3d/quick3drender/items/quick3dbuffer_p.h
@@ -74,7 +74,7 @@ class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DBuffer : public QObject
Q_OBJECT
Q_PROPERTY(QVariant data READ bufferData WRITE setBufferData NOTIFY bufferDataChanged)
public:
- explicit Quick3DBuffer(QObject *parent = Q_NULLPTR);
+ explicit Quick3DBuffer(QObject *parent = nullptr);
inline QBuffer *parentBuffer() const { return qobject_cast<QBuffer *>(parent()); }
QVariant bufferData() const;
diff --git a/src/quick3d/quick3drender/items/quick3deffect.cpp b/src/quick3d/quick3drender/items/quick3deffect.cpp
index 51f4a613a..eb8a7f8f1 100644
--- a/src/quick3d/quick3drender/items/quick3deffect.cpp
+++ b/src/quick3d/quick3drender/items/quick3deffect.cpp
@@ -82,7 +82,7 @@ QTechnique *Quick3DEffect::techniqueAt(QQmlListProperty<QTechnique> *list, int i
Quick3DEffect *eff = qobject_cast<Quick3DEffect*>(list->object);
if (eff)
return qobject_cast<QTechnique*>(eff->parentEffect()->techniques().at(index));
- return Q_NULLPTR;
+ return nullptr;
}
int Quick3DEffect::techniqueCount(QQmlListProperty<QTechnique> *list)
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
index a72bd560d..2444bef4e 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
@@ -71,7 +71,7 @@ QRenderTargetOutput *Quick3DRenderTargetOutput::renderAttachmentAt(QQmlListPrope
Quick3DRenderTargetOutput *rT = qobject_cast<Quick3DRenderTargetOutput *>(list->object);
if (rT)
return rT->parentRenderTarget()->outputs().at(index);
- return Q_NULLPTR;
+ return nullptr;
}
int Quick3DRenderTargetOutput::renderAttachmentCount(QQmlListProperty<QRenderTargetOutput> *list)
diff --git a/src/quick3d/quick3drender/items/quick3dtexture.cpp b/src/quick3d/quick3drender/items/quick3dtexture.cpp
index 4c7b7911b..ea0ac3f41 100644
--- a/src/quick3d/quick3drender/items/quick3dtexture.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtexture.cpp
@@ -72,7 +72,7 @@ QAbstractTextureImage *Quick3DTextureExtension::textureImageAt(QQmlListProperty<
Quick3DTextureExtension *self = qobject_cast<Quick3DTextureExtension *>(list->object);
if (self)
return self->parentTexture()->textureImages().at(index);
- return Q_NULLPTR;
+ return nullptr;
}
int Quick3DTextureExtension::textureImageCount(QQmlListProperty<QAbstractTextureImage> *list)