aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/rendercontrol
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/rendercontrol
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/rendercontrol')
-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
3 files changed, 19 insertions, 19 deletions
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()