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>

13 files changed, 31 insertions, 66 deletions

diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.cpp b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.cpp
index 768545772..f5573fefd 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.cpp
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.cpp
@@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE
 BrcmBuffer::BrcmBuffer(struct ::wl_client *client, uint32_t id, const QSize &size, EGLint *data, size_t count)
     : QtWaylandServer::wl_buffer(client, id, 1)
     , m_handle(count)
-    , m_invertedY(false)
     , m_size(size)
 {
     for (size_t i = 0; i < count; ++i)
diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h
index 605adef7f..3028fbed5 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h
@@ -70,7 +70,7 @@ protected:
 
 private:
     QVector<EGLint> m_handle;
-    bool m_invertedY;
+    bool m_invertedY = false;
     QSize m_size;
 };
 
diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
index 312dfbcfa..852ec3dee 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
@@ -60,15 +60,12 @@ QT_BEGIN_NAMESPACE
 class BrcmEglIntegrationPrivate
 {
 public:
-    BrcmEglIntegrationPrivate()
-        : egl_display(EGL_NO_DISPLAY)
-        , valid(false)
-    { }
+    BrcmEglIntegrationPrivate() = default;
 
     static BrcmEglIntegrationPrivate *get(BrcmEglIntegration *integration);
 
-    EGLDisplay egl_display;
-    bool valid;
+    EGLDisplay egl_display = EGL_NO_DISPLAY;
+    bool valid = false;
     PFNEGLQUERYGLOBALIMAGEBRCMPROC eglQueryGlobalImageBRCM;
     PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES;
     PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR;
@@ -76,9 +73,7 @@ public:
 };
 
 BrcmEglIntegration::BrcmEglIntegration()
-    : QtWayland::ClientBufferIntegration()
-    , QtWaylandServer::qt_brcm()
-    , d_ptr(new BrcmEglIntegrationPrivate)
+    : d_ptr(new BrcmEglIntegrationPrivate)
 {
 }
 
@@ -188,7 +183,6 @@ void BrcmEglIntegration::brcm_create_buffer(Resource *resource, uint32_t id, int
 BrcmEglClientBuffer::BrcmEglClientBuffer(BrcmEglIntegration *integration, wl_resource *buffer)
     : ClientBuffer(buffer)
     , m_integration(integration)
-    , m_texture(nullptr)
 {
 }
 
diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
index dea61b4bb..89e53bc30 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
@@ -79,8 +79,8 @@ public:
     QWaylandSurface::Origin origin() const override;
     QOpenGLTexture *toOpenGlTexture(int plane) override;
 private:
-    BrcmEglIntegration *m_integration;
-    QOpenGLTexture *m_texture;
+    BrcmEglIntegration *m_integration = nullptr;
+    QOpenGLTexture *m_texture = nullptr;
 };
 
 
diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp
index c7dbe1bea..ef14aa2a2 100644
--- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp
+++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp
@@ -47,7 +47,6 @@ QT_BEGIN_NAMESPACE
 DrmEglServerBuffer::DrmEglServerBuffer(DrmEglServerBufferIntegration *integration, const QImage &qimage, QtWayland::ServerBuffer::Format format)
     : QtWayland::ServerBuffer(qimage.size(),format)
     , m_integration(integration)
-    , m_texture(nullptr)
 {
     m_format = format;
 
diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
index e1cc8768f..b3bcc3109 100644
--- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
+++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
@@ -89,7 +89,7 @@ private:
 
     int32_t m_name;
     int32_t m_stride;
-    QOpenGLTexture *m_texture;
+    QOpenGLTexture *m_texture = nullptr;
     QtWaylandServer::qt_drm_egl_server_buffer::format m_drm_format;
 };
 
diff --git a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp
index de9e1cf6e..5a42c00dc 100644
--- a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp
+++ b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp
@@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE
 LibHybrisEglServerBuffer::LibHybrisEglServerBuffer(LibHybrisEglServerBufferIntegration *integration, const QImage &qimage, QtWayland::ServerBuffer::Format format)
     : QtWayland::ServerBuffer(qimage.size(),format)
     , m_integration(integration)
-    , m_texture(nullptr)
 {
     m_format = format;
 
diff --git a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h
index 0e1593447..f99dacd99 100644
--- a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h
+++ b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h
@@ -91,7 +91,7 @@ private:
 
     int32_t m_name;
     int32_t m_stride;
-    QOpenGLTexture *m_texture;
+    QOpenGLTexture *m_texture = nullptr;
     QtWaylandServer::qt_libhybris_egl_server_buffer::format m_hybris_format;
     QVector<int32_t> m_ints;
     QVector<int32_t> m_fds;
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
index a088027a3..6de664564 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
@@ -151,7 +151,7 @@ egl_error_string(EGLint code)
 
 struct BufferState
 {
-    BufferState();
+    BufferState() = default;
 
     enum EglMode {
         ModeUninitialized,
@@ -159,14 +159,14 @@ struct BufferState
         ModeEGLStream
     };
 
-    EGLint egl_format;
+    EGLint egl_format = EGL_TEXTURE_RGBA;
     QVarLengthArray<EGLImageKHR, 3> egl_images;
     QOpenGLTexture *textures[3] = {};
-    EGLStreamKHR egl_stream;
+    EGLStreamKHR egl_stream = EGL_NO_STREAM_KHR;
 
-    bool isYInverted;
+    bool isYInverted = true;
     QSize size;
-    EglMode eglMode;
+    EglMode eglMode = ModeUninitialized;
 };
 
 class WaylandEglClientBufferIntegrationPrivate
@@ -181,22 +181,22 @@ public:
     void handleEglstreamTexture(WaylandEglClientBuffer *buffer, wl_resource *bufferHandle);
     void registerBuffer(struct ::wl_resource *buffer, BufferState state);
 
-    EGLDisplay egl_display;
-    bool valid;
-    bool display_bound;
+    EGLDisplay egl_display = EGL_NO_DISPLAY;
+    bool valid = false;
+    bool display_bound = false;
     QOffscreenSurface *offscreenSurface = nullptr;
     QOpenGLContext *localContext = nullptr;
 
-    PFNEGLBINDWAYLANDDISPLAYWL egl_bind_wayland_display;
-    PFNEGLUNBINDWAYLANDDISPLAYWL egl_unbind_wayland_display;
-    PFNEGLQUERYWAYLANDBUFFERWL_compat egl_query_wayland_buffer;
+    PFNEGLBINDWAYLANDDISPLAYWL egl_bind_wayland_display = nullptr;
+    PFNEGLUNBINDWAYLANDDISPLAYWL egl_unbind_wayland_display = nullptr;
+    PFNEGLQUERYWAYLANDBUFFERWL_compat egl_query_wayland_buffer = nullptr;
 
-    PFNEGLCREATEIMAGEKHRPROC egl_create_image;
-    PFNEGLDESTROYIMAGEKHRPROC egl_destroy_image;
+    PFNEGLCREATEIMAGEKHRPROC egl_create_image = nullptr;
+    PFNEGLDESTROYIMAGEKHRPROC egl_destroy_image = nullptr;
 
-    PFNGLEGLIMAGETARGETTEXTURE2DOESPROC gl_egl_image_target_texture_2d;
+    PFNGLEGLIMAGETARGETTEXTURE2DOESPROC gl_egl_image_target_texture_2d = nullptr;
 
-    QEGLStreamConvenience *funcs;
+    QEGLStreamConvenience *funcs = nullptr;
     static WaylandEglClientBufferIntegrationPrivate *get(WaylandEglClientBufferIntegration *integration) {
         return shuttingDown ? nullptr : integration->d_ptr.data();
     }
@@ -206,24 +206,7 @@ public:
 
 bool WaylandEglClientBufferIntegrationPrivate::shuttingDown = false;
 
-BufferState::BufferState()
-    : egl_format(EGL_TEXTURE_RGBA)
-    , egl_stream(EGL_NO_STREAM_KHR)
-    , isYInverted(true)
-    , eglMode(ModeUninitialized)
-{}
-
 WaylandEglClientBufferIntegrationPrivate::WaylandEglClientBufferIntegrationPrivate()
-    : egl_display(EGL_NO_DISPLAY)
-    , valid(false)
-    , display_bound(false)
-    , egl_bind_wayland_display(nullptr)
-    , egl_unbind_wayland_display(nullptr)
-    , egl_query_wayland_buffer(nullptr)
-    , egl_create_image(nullptr)
-    , egl_destroy_image(nullptr)
-    , gl_egl_image_target_texture_2d(nullptr)
-    , funcs(nullptr)
 {
 }
 
@@ -394,8 +377,7 @@ void WaylandEglClientBufferIntegrationPrivate::handleEglstreamTexture(WaylandEgl
 }
 
 WaylandEglClientBufferIntegration::WaylandEglClientBufferIntegration()
-    : QtWayland::ClientBufferIntegration()
-    , d_ptr(new WaylandEglClientBufferIntegrationPrivate)
+    : d_ptr(new WaylandEglClientBufferIntegrationPrivate)
 {
 }
 
diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
index 049b8b3fe..37932447c 100644
--- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
+++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
@@ -68,8 +68,6 @@ QVector<EGLint> eglbuildSpec()
 }
 
 XCompositeEglClientBufferIntegration::XCompositeEglClientBufferIntegration()
-    : QtWayland::ClientBufferIntegration()
-    , mDisplay(nullptr)
 {
 
 }
@@ -100,7 +98,6 @@ QtWayland::ClientBuffer *XCompositeEglClientBufferIntegration::createBufferFor(w
 
 XCompositeEglClientBuffer::XCompositeEglClientBuffer(XCompositeEglClientBufferIntegration *integration, wl_resource *bufferResource)
     : QtWayland::ClientBuffer(bufferResource)
-    , m_texture(nullptr)
     , m_integration(integration)
 {
 }
diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
index 16d9591ba..f57f741c2 100644
--- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
+++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
@@ -61,7 +61,7 @@ public:
     inline EGLDisplay eglDisplay() const { return mEglDisplay; }
 
 private:
-    Display *mDisplay;
+    Display *mDisplay = nullptr;
     EGLDisplay mEglDisplay;
 };
 
@@ -78,7 +78,7 @@ public:
     }
 
 private:
-    QOpenGLTexture *m_texture;
+    QOpenGLTexture *m_texture = nullptr;
     XCompositeEglClientBufferIntegration *m_integration;
 };
 
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp
index b1c947b53..511a8f6b8 100644
--- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp
+++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp
@@ -71,9 +71,6 @@ QVector<int> qglx_buildSpec()
 
 
 XCompositeGLXClientBufferIntegration::XCompositeGLXClientBufferIntegration()
-    : QtWayland::ClientBufferIntegration()
-    , mDisplay(nullptr)
-    , mHandler(nullptr)
 {
     qDebug() << "Loading GLX integration";
 }
@@ -122,9 +119,7 @@ QtWayland::ClientBuffer *XCompositeGLXClientBufferIntegration::createBufferFor(w
 
 XCompositeGLXClientBuffer::XCompositeGLXClientBuffer(XCompositeGLXClientBufferIntegration *integration, wl_resource *bufferResource)
     : QtWayland::ClientBuffer(bufferResource)
-    , m_texture(nullptr)
     , m_integration(integration)
-    , m_glxPixmap(0)
 {
 }
 
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
index ccdca7613..23b856e93 100644
--- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
+++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
@@ -68,9 +68,9 @@ public:
     PFNGLXRELEASETEXIMAGEEXTPROC m_glxReleaseTexImageEXT;
 
 private:
-    Display *mDisplay;
+    Display *mDisplay = nullptr;
     int mScreen;
-    XCompositeHandler *mHandler;
+    XCompositeHandler *mHandler = nullptr;
 };
 
 class XCompositeGLXClientBuffer : public QtWayland::ClientBuffer
@@ -86,9 +86,9 @@ public:
     }
 
 private:
-    QOpenGLTexture *m_texture;
+    QOpenGLTexture *m_texture = nullptr;
     XCompositeGLXClientBufferIntegration *m_integration;
-    GLXPixmap m_glxPixmap;
+    GLXPixmap m_glxPixmap = 0;
 };
 
 QT_END_NAMESPACE