aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/scenegraph/textureinthread
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/quick/scenegraph/textureinthread
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/quick/scenegraph/textureinthread')
-rw-r--r--examples/quick/scenegraph/textureinthread/threadrenderer.cpp16
1 files changed, 8 insertions, 8 deletions
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) {