summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-02-21 10:41:54 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2018-02-26 07:13:18 +0000
commit499ec43937e926e4f2fa57a9baa455fcb3862262 (patch)
tree206c90d47387f8322b68f5e3db613189397e1af3 /examples
parent53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff)
use nullptr consistently (clang-tidy)
From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/qml/qmlextensionplugins/plugin.cpp4
-rw-r--r--examples/qml/referenceexamples/attached/birthdayparty.cpp2
-rw-r--r--examples/qml/referenceexamples/binding/birthdayparty.cpp2
-rw-r--r--examples/qml/referenceexamples/coercion/birthdayparty.cpp2
-rw-r--r--examples/qml/referenceexamples/default/birthdayparty.cpp2
-rw-r--r--examples/qml/referenceexamples/grouped/birthdayparty.cpp2
-rw-r--r--examples/qml/referenceexamples/grouped/main.cpp2
-rw-r--r--examples/qml/referenceexamples/methods/birthdayparty.cpp2
-rw-r--r--examples/qml/referenceexamples/properties/birthdayparty.cpp2
-rw-r--r--examples/qml/referenceexamples/signal/birthdayparty.cpp2
-rw-r--r--examples/qml/referenceexamples/valuesource/birthdayparty.cpp2
-rw-r--r--examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp2
-rw-r--r--examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.cpp2
-rw-r--r--examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp2
-rw-r--r--examples/quick/quickwidgets/qquickviewcomparison/fbitem.cpp2
-rw-r--r--examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp4
-rw-r--r--examples/quick/rendercontrol/cuberenderer.cpp10
-rw-r--r--examples/quick/rendercontrol/window_multithreaded.cpp22
-rw-r--r--examples/quick/rendercontrol/window_singlethreaded.cpp6
-rw-r--r--examples/quick/scenegraph/customgeometry/beziercurve.cpp4
-rw-r--r--examples/quick/scenegraph/graph/graph.cpp2
-rw-r--r--examples/quick/scenegraph/openglunderqml/squircle.cpp4
-rw-r--r--examples/quick/scenegraph/rendernode/softwarerenderer.cpp2
-rw-r--r--examples/quick/scenegraph/textureinthread/threadrenderer.cpp16
-rw-r--r--examples/quick/scenegraph/twotextureproviders/xorblender.cpp12
-rw-r--r--examples/quick/textureprovider/etcprovider.cpp8
26 files changed, 61 insertions, 61 deletions
diff --git a/examples/qml/qmlextensionplugins/plugin.cpp b/examples/qml/qmlextensionplugins/plugin.cpp
index c00c7bc015..3ef7f04f95 100644
--- a/examples/qml/qmlextensionplugins/plugin.cpp
+++ b/examples/qml/qmlextensionplugins/plugin.cpp
@@ -115,7 +115,7 @@ class TimeModel : public QObject
//![0]
public:
- TimeModel(QObject *parent=0) : QObject(parent)
+ TimeModel(QObject *parent=nullptr) : QObject(parent)
{
if (++instances == 1) {
if (!timer)
@@ -145,7 +145,7 @@ private:
};
int TimeModel::instances=0;
-MinuteTimer *TimeModel::timer=0;
+MinuteTimer *TimeModel::timer=nullptr;
//![plugin]
class QExampleQmlPlugin : public QQmlExtensionPlugin
diff --git a/examples/qml/referenceexamples/attached/birthdayparty.cpp b/examples/qml/referenceexamples/attached/birthdayparty.cpp
index 2594fea641..26aa56e86c 100644
--- a/examples/qml/referenceexamples/attached/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/attached/birthdayparty.cpp
@@ -65,7 +65,7 @@ void BirthdayPartyAttached::setRsvp(const QDate &d)
}
BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
+: QObject(parent), m_host(nullptr)
{
}
diff --git a/examples/qml/referenceexamples/binding/birthdayparty.cpp b/examples/qml/referenceexamples/binding/birthdayparty.cpp
index d30674a92d..866c1f6968 100644
--- a/examples/qml/referenceexamples/binding/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/binding/birthdayparty.cpp
@@ -69,7 +69,7 @@ void BirthdayPartyAttached::setRsvp(const QDate &d)
BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
+: QObject(parent), m_host(nullptr)
{
}
diff --git a/examples/qml/referenceexamples/coercion/birthdayparty.cpp b/examples/qml/referenceexamples/coercion/birthdayparty.cpp
index fd6995597b..e729c42bb5 100644
--- a/examples/qml/referenceexamples/coercion/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/coercion/birthdayparty.cpp
@@ -50,7 +50,7 @@
#include "birthdayparty.h"
BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
+: QObject(parent), m_host(nullptr)
{
}
diff --git a/examples/qml/referenceexamples/default/birthdayparty.cpp b/examples/qml/referenceexamples/default/birthdayparty.cpp
index fd6995597b..e729c42bb5 100644
--- a/examples/qml/referenceexamples/default/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/default/birthdayparty.cpp
@@ -50,7 +50,7 @@
#include "birthdayparty.h"
BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
+: QObject(parent), m_host(nullptr)
{
}
diff --git a/examples/qml/referenceexamples/grouped/birthdayparty.cpp b/examples/qml/referenceexamples/grouped/birthdayparty.cpp
index fd6995597b..e729c42bb5 100644
--- a/examples/qml/referenceexamples/grouped/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/grouped/birthdayparty.cpp
@@ -50,7 +50,7 @@
#include "birthdayparty.h"
BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
+: QObject(parent), m_host(nullptr)
{
}
diff --git a/examples/qml/referenceexamples/grouped/main.cpp b/examples/qml/referenceexamples/grouped/main.cpp
index 8a137b0380..17dcd09c34 100644
--- a/examples/qml/referenceexamples/grouped/main.cpp
+++ b/examples/qml/referenceexamples/grouped/main.cpp
@@ -76,7 +76,7 @@ int main(int argc, char ** argv)
else
qWarning() << "She is inviting:";
- Person *bestShoe = 0;
+ Person *bestShoe = nullptr;
for (int ii = 0; ii < party->guestCount(); ++ii) {
Person *guest = party->guest(ii);
qWarning() << " " << guest->name();
diff --git a/examples/qml/referenceexamples/methods/birthdayparty.cpp b/examples/qml/referenceexamples/methods/birthdayparty.cpp
index 7f2a2cc153..dfb36257eb 100644
--- a/examples/qml/referenceexamples/methods/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/methods/birthdayparty.cpp
@@ -50,7 +50,7 @@
#include "birthdayparty.h"
BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
+: QObject(parent), m_host(nullptr)
{
}
diff --git a/examples/qml/referenceexamples/properties/birthdayparty.cpp b/examples/qml/referenceexamples/properties/birthdayparty.cpp
index 1cb79c8b1b..8a5e9e553e 100644
--- a/examples/qml/referenceexamples/properties/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/properties/birthdayparty.cpp
@@ -50,7 +50,7 @@
#include "birthdayparty.h"
BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
+: QObject(parent), m_host(nullptr)
{
}
diff --git a/examples/qml/referenceexamples/signal/birthdayparty.cpp b/examples/qml/referenceexamples/signal/birthdayparty.cpp
index c0e4f177e5..a5fbb742a5 100644
--- a/examples/qml/referenceexamples/signal/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/signal/birthdayparty.cpp
@@ -66,7 +66,7 @@ void BirthdayPartyAttached::setRsvp(const QDate &d)
BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
+: QObject(parent), m_host(nullptr)
{
}
diff --git a/examples/qml/referenceexamples/valuesource/birthdayparty.cpp b/examples/qml/referenceexamples/valuesource/birthdayparty.cpp
index beb59315ea..b107c61570 100644
--- a/examples/qml/referenceexamples/valuesource/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/valuesource/birthdayparty.cpp
@@ -66,7 +66,7 @@ void BirthdayPartyAttached::setRsvp(const QDate &d)
BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
+: QObject(parent), m_host(nullptr)
{
}
diff --git a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp
index 0107a1fc69..066963cf33 100644
--- a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp
+++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp
@@ -51,7 +51,7 @@
#include "pieslice.h"
PieChart::PieChart(QQuickItem *parent)
- : QQuickItem(parent), m_pieSlice(0)
+ : QQuickItem(parent), m_pieSlice(nullptr)
{
}
diff --git a/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.cpp b/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.cpp
index 699fce14ca..ac680bb9c9 100644
--- a/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.cpp
+++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.cpp
@@ -68,7 +68,7 @@ void PieChart::setName(const QString &name)
//![0]
QQmlListProperty<PieSlice> PieChart::slices()
{
- return QQmlListProperty<PieSlice>(this, 0, &PieChart::append_slice, 0, 0, 0);
+ return QQmlListProperty<PieSlice>(this, nullptr, &PieChart::append_slice, nullptr, nullptr, nullptr);
}
void PieChart::append_slice(QQmlListProperty<PieSlice> *list, PieSlice *slice)
diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp
index 40b31b32de..1c712c887a 100644
--- a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp
+++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp
@@ -67,7 +67,7 @@ void PieChart::setName(const QString &name)
QQmlListProperty<PieSlice> PieChart::slices()
{
- return QQmlListProperty<PieSlice>(this, 0, &PieChart::append_slice, 0, 0, 0);
+ return QQmlListProperty<PieSlice>(this, nullptr, &PieChart::append_slice, nullptr, nullptr, nullptr);
}
void PieChart::append_slice(QQmlListProperty<PieSlice> *list, PieSlice *slice)
diff --git a/examples/quick/quickwidgets/qquickviewcomparison/fbitem.cpp b/examples/quick/quickwidgets/qquickviewcomparison/fbitem.cpp
index 1f1bd55cfd..139fcbae5c 100644
--- a/examples/quick/quickwidgets/qquickviewcomparison/fbitem.cpp
+++ b/examples/quick/quickwidgets/qquickviewcomparison/fbitem.cpp
@@ -238,7 +238,7 @@ void FbItemRenderer::setupVertexAttribs()
QOpenGLFunctions *f = QOpenGLContext::currentContext()->functions();
f->glEnableVertexAttribArray(0);
f->glEnableVertexAttribArray(1);
- f->glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), 0);
+ f->glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), nullptr);
f->glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), reinterpret_cast<void *>(3 * sizeof(GLfloat)));
m_logoVbo.release();
}
diff --git a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp
index 524af1e915..84e116dce6 100644
--- a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp
+++ b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp
@@ -58,8 +58,8 @@
#include <QQuickItem>
MainWindow::MainWindow(bool transparency, bool noRenderAlpha)
- : m_currentView(0),
- m_currentRootObject(0),
+ : m_currentView(nullptr),
+ m_currentRootObject(nullptr),
m_transparent(transparency),
m_noRenderAlpha(noRenderAlpha)
{
diff --git a/examples/quick/rendercontrol/cuberenderer.cpp b/examples/quick/rendercontrol/cuberenderer.cpp
index 9acc1bd127..f3ecfc2566 100644
--- a/examples/quick/rendercontrol/cuberenderer.cpp
+++ b/examples/quick/rendercontrol/cuberenderer.cpp
@@ -60,10 +60,10 @@
CubeRenderer::CubeRenderer(QOffscreenSurface *offscreenSurface)
: m_offscreenSurface(offscreenSurface),
- m_context(0),
- m_program(0),
- m_vbo(0),
- m_vao(0),
+ m_context(nullptr),
+ m_program(nullptr),
+ m_vbo(nullptr),
+ m_vao(nullptr),
m_matrixLoc(0)
{
}
@@ -180,7 +180,7 @@ void CubeRenderer::setupVertexAttribs()
m_vbo->bind();
m_program->enableAttributeArray(0);
m_program->enableAttributeArray(1);
- m_context->functions()->glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, 0);
+ m_context->functions()->glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
m_context->functions()->glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 0,
(const void *)(36 * 3 * sizeof(GLfloat)));
m_vbo->release();
diff --git a/examples/quick/rendercontrol/window_multithreaded.cpp b/examples/quick/rendercontrol/window_multithreaded.cpp
index ac82847dbf..01d6b8b5b2 100644
--- a/examples/quick/rendercontrol/window_multithreaded.cpp
+++ b/examples/quick/rendercontrol/window_multithreaded.cpp
@@ -87,13 +87,13 @@ static const QEvent::Type STOP = QEvent::Type(QEvent::User + 4);
static const QEvent::Type UPDATE = QEvent::Type(QEvent::User + 5);
QuickRenderer::QuickRenderer()
- : m_context(0),
- m_surface(0),
- m_fbo(0),
- m_window(0),
- m_quickWindow(0),
- m_renderControl(0),
- m_cubeRenderer(0),
+ : m_context(nullptr),
+ m_surface(nullptr),
+ m_fbo(nullptr),
+ m_window(nullptr),
+ m_quickWindow(nullptr),
+ m_renderControl(nullptr),
+ m_cubeRenderer(nullptr),
m_quit(false)
{
}
@@ -162,10 +162,10 @@ void QuickRenderer::cleanup()
m_renderControl->invalidate();
delete m_fbo;
- m_fbo = 0;
+ m_fbo = nullptr;
delete m_cubeRenderer;
- m_cubeRenderer = 0;
+ m_cubeRenderer = nullptr;
m_context->doneCurrent();
m_context->moveToThread(QCoreApplication::instance()->thread());
@@ -177,7 +177,7 @@ void QuickRenderer::ensureFbo()
{
if (m_fbo && m_fbo->size() != m_window->size() * m_window->devicePixelRatio()) {
delete m_fbo;
- m_fbo = 0;
+ m_fbo = nullptr;
}
if (!m_fbo) {
@@ -235,7 +235,7 @@ private:
WindowMultiThreaded::WindowMultiThreaded()
: m_qmlComponent(nullptr),
- m_rootItem(0),
+ m_rootItem(nullptr),
m_quickInitialized(false),
m_psrRequested(false)
{
diff --git a/examples/quick/rendercontrol/window_singlethreaded.cpp b/examples/quick/rendercontrol/window_singlethreaded.cpp
index d0bf0adad4..ddbbfe4b52 100644
--- a/examples/quick/rendercontrol/window_singlethreaded.cpp
+++ b/examples/quick/rendercontrol/window_singlethreaded.cpp
@@ -84,8 +84,8 @@ QWindow *RenderControl::renderWindow(QPoint *offset)
}
WindowSingleThreaded::WindowSingleThreaded()
- : m_rootItem(0),
- m_fbo(0),
+ : m_rootItem(nullptr),
+ m_fbo(nullptr),
m_quickInitialized(false),
m_quickReady(false),
m_dpr(0)
@@ -191,7 +191,7 @@ void WindowSingleThreaded::createFbo()
void WindowSingleThreaded::destroyFbo()
{
delete m_fbo;
- m_fbo = 0;
+ m_fbo = nullptr;
}
void WindowSingleThreaded::render()
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;
}
diff --git a/examples/quick/textureprovider/etcprovider.cpp b/examples/quick/textureprovider/etcprovider.cpp
index de8eb12366..01a3f69be3 100644
--- a/examples/quick/textureprovider/etcprovider.cpp
+++ b/examples/quick/textureprovider/etcprovider.cpp
@@ -137,7 +137,7 @@ void EtcTexture::bind()
#endif
QOpenGLContext *ctx = QOpenGLContext::currentContext();
- Q_ASSERT(ctx != 0);
+ Q_ASSERT(ctx != nullptr);
ctx->functions()->glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_ETC1_RGB8_OES,
m_size.width(), m_size.height(), 0,
(m_paddedSize.width() * m_paddedSize.height()) >> 1,
@@ -181,7 +181,7 @@ public:
QQuickTextureFactory *EtcProvider::requestTexture(const QString &id, QSize *size, const QSize &requestedSize)
{
Q_UNUSED(requestedSize);
- QEtcTextureFactory *ret = 0;
+ QEtcTextureFactory *ret = nullptr;
size->setHeight(0);
size->setWidth(0);
@@ -199,7 +199,7 @@ QQuickTextureFactory *EtcProvider::requestTexture(const QString &id, QSize *size
ret = new QEtcTextureFactory;
ret->m_data = file.readAll();
if (!ret->m_data.isEmpty()) {
- ETCHeader *pETCHeader = NULL;
+ ETCHeader *pETCHeader = nullptr;
pETCHeader = (ETCHeader *)ret->m_data.data();
size->setHeight(getHeight(pETCHeader));
size->setWidth(getWidth(pETCHeader));
@@ -209,7 +209,7 @@ QQuickTextureFactory *EtcProvider::requestTexture(const QString &id, QSize *size
}
else {
delete ret;
- ret = 0;
+ ret = nullptr;
}
}