diff options
Diffstat (limited to 'examples/quick/scenegraph')
6 files changed, 20 insertions, 20 deletions
diff --git a/examples/quick/scenegraph/customgeometry/beziercurve.cpp b/examples/quick/scenegraph/customgeometry/beziercurve.cpp index 750ff6aa3b..72fc7e6f1b 100644 --- a/examples/quick/scenegraph/customgeometry/beziercurve.cpp +++ b/examples/quick/scenegraph/customgeometry/beziercurve.cpp @@ -127,8 +127,8 @@ void BezierCurve::setSegmentCount(int count) //! [4] QSGNode *BezierCurve::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) { - QSGGeometryNode *node = 0; - QSGGeometry *geometry = 0; + QSGGeometryNode *node = nullptr; + QSGGeometry *geometry = nullptr; if (!oldNode) { node = new QSGGeometryNode; diff --git a/examples/quick/scenegraph/graph/graph.cpp b/examples/quick/scenegraph/graph/graph.cpp index 3ea6a8d07f..ccf98ef813 100644 --- a/examples/quick/scenegraph/graph/graph.cpp +++ b/examples/quick/scenegraph/graph/graph.cpp @@ -103,7 +103,7 @@ QSGNode *Graph::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) if (rect.isEmpty()) { delete n; - return 0; + return nullptr; } if (!n) { diff --git a/examples/quick/scenegraph/openglunderqml/squircle.cpp b/examples/quick/scenegraph/openglunderqml/squircle.cpp index b7082892b8..d6f6b327f2 100644 --- a/examples/quick/scenegraph/openglunderqml/squircle.cpp +++ b/examples/quick/scenegraph/openglunderqml/squircle.cpp @@ -57,7 +57,7 @@ //! [7] Squircle::Squircle() : m_t(0) - , m_renderer(0) + , m_renderer(nullptr) { connect(this, &QQuickItem::windowChanged, this, &Squircle::handleWindowChanged); } @@ -95,7 +95,7 @@ void Squircle::cleanup() { if (m_renderer) { delete m_renderer; - m_renderer = 0; + m_renderer = nullptr; } } diff --git a/examples/quick/scenegraph/rendernode/softwarerenderer.cpp b/examples/quick/scenegraph/rendernode/softwarerenderer.cpp index b6f7ffa577..0a0ec4b485 100644 --- a/examples/quick/scenegraph/rendernode/softwarerenderer.cpp +++ b/examples/quick/scenegraph/rendernode/softwarerenderer.cpp @@ -98,7 +98,7 @@ void SoftwareRenderNode::render(const RenderState *renderState) QSGRenderNode::StateFlags SoftwareRenderNode::changedStates() const { - return 0; + return nullptr; } QSGRenderNode::RenderingFlags SoftwareRenderNode::flags() const diff --git a/examples/quick/scenegraph/textureinthread/threadrenderer.cpp b/examples/quick/scenegraph/textureinthread/threadrenderer.cpp index 9782a83a90..27cb0eb5ea 100644 --- a/examples/quick/scenegraph/textureinthread/threadrenderer.cpp +++ b/examples/quick/scenegraph/textureinthread/threadrenderer.cpp @@ -74,11 +74,11 @@ class RenderThread : public QThread Q_OBJECT public: RenderThread(const QSize &size) - : surface(0) - , context(0) - , m_renderFbo(0) - , m_displayFbo(0) - , m_logoRenderer(0) + : surface(nullptr) + , context(nullptr) + , m_renderFbo(nullptr) + , m_displayFbo(nullptr) + , m_logoRenderer(nullptr) , m_size(size) { ThreadRenderer::threads << this; @@ -156,7 +156,7 @@ public: TextureNode(QQuickWindow *window) : m_id(0) , m_size(0, 0) - , m_texture(0) + , m_texture(nullptr) , m_window(window) { // Our texture node must have a texture, so use the default 0 texture. @@ -224,7 +224,7 @@ private: }; ThreadRenderer::ThreadRenderer() - : m_renderThread(0) + : m_renderThread(nullptr) { setFlag(ItemHasContents, true); m_renderThread = new RenderThread(QSize(512, 512)); @@ -264,7 +264,7 @@ QSGNode *ThreadRenderer::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData * current->makeCurrent(window()); QMetaObject::invokeMethod(this, "ready"); - return 0; + return nullptr; } if (!node) { diff --git a/examples/quick/scenegraph/twotextureproviders/xorblender.cpp b/examples/quick/scenegraph/twotextureproviders/xorblender.cpp index 1b1692eab6..3c02c4695e 100644 --- a/examples/quick/scenegraph/twotextureproviders/xorblender.cpp +++ b/examples/quick/scenegraph/twotextureproviders/xorblender.cpp @@ -149,8 +149,8 @@ public: // Set up material so it is all set for later.. m_material = XorBlendShader::createMaterial(); - m_material->state()->texture1 = 0; - m_material->state()->texture2 = 0; + m_material->state()->texture1 = nullptr; + m_material->state()->texture2 = nullptr; m_material->setFlag(QSGMaterial::Blending); m_node.setMaterial(m_material); m_node.setFlag(QSGNode::OwnsMaterial); @@ -214,8 +214,8 @@ private: XorBlender::XorBlender(QQuickItem *parent) : QQuickItem(parent) - , m_source1(0) - , m_source2(0) + , m_source1(nullptr) + , m_source2(nullptr) , m_source1Changed(false) , m_source2Changed(false) { @@ -256,7 +256,7 @@ QSGNode *XorBlender::updatePaintNode(QSGNode *old, UpdatePaintNodeData *) } if (abort) { delete old; - return 0; + return nullptr; } XorNode *node = static_cast<XorNode *>(old); @@ -264,7 +264,7 @@ QSGNode *XorBlender::updatePaintNode(QSGNode *old, UpdatePaintNodeData *) // If the sources have changed, recreate the nodes if (m_source1Changed || m_source2Changed) { delete node; - node = 0; + node = nullptr; m_source1Changed = false; m_source2Changed = false; } |