summaryrefslogtreecommitdiffstats
path: root/src/hardwareintegration/client/shm-emulation-server
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/hardwareintegration/client/shm-emulation-server
parent72999738489b5251d025c954a77c93e8e1fdfd9d (diff)
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/hardwareintegration/client/shm-emulation-server')
-rw-r--r--src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp4
-rw-r--r--src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp
index bc597ebf8..0c43b089a 100644
--- a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp
+++ b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp
@@ -89,9 +89,7 @@ static QOpenGLTexture *createTextureFromShm(const QString &key, int w, int h, in
namespace QtWaylandClient {
ShmServerBuffer::ShmServerBuffer(ShmServerBufferIntegration *integration, const QString &key, int32_t width, int32_t height, int32_t bytes_per_line, int32_t format)
- : QWaylandServerBuffer()
- , m_integration(integration)
- , m_texture(nullptr)
+ : m_integration(integration)
, m_key(key)
, m_bpl(bytes_per_line)
, m_format(format)
diff --git a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h
index ce4032ba4..788344ff6 100644
--- a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h
+++ b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h
@@ -62,7 +62,7 @@ public:
QOpenGLTexture* toOpenGlTexture() override;
private:
ShmServerBufferIntegration *m_integration;
- QOpenGLTexture *m_texture;
+ QOpenGLTexture *m_texture = nullptr;
QString m_key;
int m_bpl;
int m_format;