summaryrefslogtreecommitdiff
path: root/src/compositor/compositor_api/qwaylandquickitem.cpp
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-02-27 11:32:15 +0100
committerJohan Helsing <johan.helsing@qt.io>2018-02-27 17:03:41 +0000
commitc4bd9198b4a0fac809903dd2c09276c2c3c1b22e (patch)
tree83325fe11d258c922ede480e0ad3de3df45032fa /src/compositor/compositor_api/qwaylandquickitem.cpp
parent72999738489b5251d025c954a77c93e8e1fdfd9d (diff)
downloadqtwayland-c4bd9198b4a0fac809903dd2c09276c2c3c1b22e.tar.gz
Init variables where they are declared when possible (clang-tidy)
clang-tidy -p compile_commands.json $file \ -checks='-*,modernize-use-default-member-init,readability-redundant-member-init' \ -config='{CheckOptions: [{key: modernize-use-default-member-init.UseAssignment, value: "1"}]}' \ -header-filter='qtwayland' \ -fix Afterwards I ran search and replace on the diff to clean up some whitespace errors: - Replaced '(\n\+[^:\n]*)(:\s+\+\s+)' with '$1: ' - Replaced '(\n\+[^,\n]*)(,\s+\+\s+)' with '$1, ' - Replaced '\n\+\s*\n' with '\n' I also had to do some manual edits, because for some reason, this particular clang-tidy check doesn't trigger for some files. Change-Id: I3b3909bac4bf20108bbe8ad1e01bcc54236dae1b Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickitem.cpp')
-rw-r--r--src/compositor/compositor_api/qwaylandquickitem.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index 91e85b88..23b52e0b 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -140,8 +140,7 @@ static const struct {
};
QWaylandBufferMaterialShader::QWaylandBufferMaterialShader(QWaylandBufferRef::BufferFormatEgl format)
- : QSGMaterialShader()
- , m_format(format)
+ : m_format(format)
{
setShaderSourceFile(QOpenGLShader::Vertex, QString::fromLatin1(bufferTypes[format].vertexShaderSourceFile));
setShaderSourceFile(QOpenGLShader::Fragment, QString::fromLatin1(bufferTypes[format].fragmentShaderSourceFile));
@@ -183,8 +182,7 @@ void QWaylandBufferMaterialShader::initialize()
}
QWaylandBufferMaterial::QWaylandBufferMaterial(QWaylandBufferRef::BufferFormatEgl format)
- : QSGMaterial()
- , m_format(format)
+ : m_format(format)
{
QOpenGLFunctions *gl = QOpenGLContext::currentContext()->functions();
@@ -267,8 +265,6 @@ class QWaylandSurfaceTextureProvider : public QSGTextureProvider
{
public:
QWaylandSurfaceTextureProvider()
- : m_smooth(false)
- , m_sgTex(nullptr)
{
}
@@ -313,8 +309,8 @@ public:
void setSmooth(bool smooth) { m_smooth = smooth; }
private:
- bool m_smooth;
- QSGTexture *m_sgTex;
+ bool m_smooth = false;
+ QSGTexture *m_sgTex = nullptr;
QWaylandBufferRef m_ref;
};