diff options
Diffstat (limited to 'src/quick3d/quick3drender')
7 files changed, 11 insertions, 11 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) diff --git a/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp index 044fb40da..2d9456d12 100644 --- a/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp +++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp @@ -59,7 +59,7 @@ void QuickRenderNodeFactory::registerType(const char *className, const char *qui Qt3DCore::QNode *QuickRenderNodeFactory::createNode(const char *type) { if (!m_types.contains(type)) - return Q_NULLPTR; + return nullptr; Type &typeInfo(m_types[type]); @@ -68,7 +68,7 @@ Qt3DCore::QNode *QuickRenderNodeFactory::createNode(const char *type) typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second); } - return typeInfo.t ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t->create()) : Q_NULLPTR; + return typeInfo.t ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t->create()) : nullptr; } } // namespace Qt3DRender diff --git a/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h index 0b2161abe..9877e5b4e 100644 --- a/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h +++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h @@ -71,9 +71,9 @@ public: private: struct Type { - Type() : t(Q_NULLPTR), resolved(false) { } + Type() : t(nullptr), resolved(false) { } Type(const char *quickName, int major, int minor) - : quickName(quickName), version(major, minor), t(Q_NULLPTR), resolved(false) { } + : quickName(quickName), version(major, minor), t(nullptr), resolved(false) { } QByteArray quickName; QPair<int, int> version; QQmlType *t; |