diff options
15 files changed, 23 insertions, 23 deletions
diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h b/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h index 7439087d..632429be 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h +++ b/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h @@ -85,7 +85,7 @@ public: void *userData() const; protected: - Format m_format; + Format m_format = RGBA32; QSize m_size; private: diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h index e9439d1b..41ad7025 100644 --- a/src/client/qwaylanddisplay_p.h +++ b/src/client/qwaylanddisplay_p.h @@ -224,10 +224,10 @@ private: QScopedPointer<QWaylandHardwareIntegration> mHardwareIntegration; QScopedPointer<QtWayland::zxdg_output_manager_v1> mXdgOutputManager; QSocketNotifier *mReadNotifier = nullptr; - int mFd; - int mWritableNotificationFd; + int mFd = -1; + int mWritableNotificationFd = -1; QList<RegistryGlobal> mGlobals; - int mCompositorVersion; + int mCompositorVersion = -1; uint32_t mLastInputSerial = 0; QWaylandInputDevice *mLastInputDevice = nullptr; QPointer<QWaylandWindow> mLastInputWindow; diff --git a/src/compositor/compositor_api/qwaylandsurface_p.h b/src/compositor/compositor_api/qwaylandsurface_p.h index 85643623..1637d870 100644 --- a/src/compositor/compositor_api/qwaylandsurface_p.h +++ b/src/compositor/compositor_api/qwaylandsurface_p.h @@ -151,9 +151,9 @@ public: //member variables QWaylandBufferRef buffer; QRegion damage; QPoint offset; - bool newlyAttached; + bool newlyAttached = false; QRegion inputRegion; - int bufferScale; + int bufferScale = 1; QRectF sourceGeometry; QSize destinationSize; QRegion opaqueRegion; diff --git a/src/compositor/extensions/qwaylandwlshellintegration_p.h b/src/compositor/extensions/qwaylandwlshellintegration_p.h index ff236e63..8af54dfc 100644 --- a/src/compositor/extensions/qwaylandwlshellintegration_p.h +++ b/src/compositor/extensions/qwaylandwlshellintegration_p.h @@ -100,14 +100,14 @@ private: struct { QWaylandSeat *seat = nullptr; QPointF initialOffset; - bool initialized; + bool initialized = false; } moveState; struct { QWaylandSeat *seat = nullptr; QWaylandWlShellSurface::ResizeEdge resizeEdges; QSizeF initialSize; QPointF initialMousePos; - bool initialized; + bool initialized = false; } resizeState; bool isPopup = false; diff --git a/src/compositor/extensions/qwaylandxdgshellv5integration_p.h b/src/compositor/extensions/qwaylandxdgshellv5integration_p.h index b2c16c6d..5d0e1e14 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5integration_p.h +++ b/src/compositor/extensions/qwaylandxdgshellv5integration_p.h @@ -91,7 +91,7 @@ private: struct { QWaylandSeat *seat = nullptr; QPointF initialOffset; - bool initialized; + bool initialized = false; } moveState; struct { @@ -101,7 +101,7 @@ private: QPointF initialMousePos; QPointF initialPosition; QSize initialSurfaceSize; - bool initialized; + bool initialized = false; } resizeState; struct { diff --git a/src/compositor/extensions/qwaylandxdgshellv6integration_p.h b/src/compositor/extensions/qwaylandxdgshellv6integration_p.h index 5b56af89..049b901c 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6integration_p.h +++ b/src/compositor/extensions/qwaylandxdgshellv6integration_p.h @@ -96,7 +96,7 @@ private: struct { QWaylandSeat *seat = nullptr; QPointF initialOffset; - bool initialized; + bool initialized = false; } moveState; struct { @@ -106,7 +106,7 @@ private: QPointF initialMousePos; QPointF initialPosition; QSize initialSurfaceSize; - bool initialized; + bool initialized = false; } resizeState; struct { diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h index 9a614f58..420f8d20 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h @@ -91,7 +91,7 @@ private: struct wl_display *m_waylandDisplay = nullptr; struct qt_brcm *m_waylandBrcm = nullptr; - EGLDisplay m_eglDisplay; + EGLDisplay m_eglDisplay = EGL_NO_DISPLAY; }; } diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h index d2733357..d95ea941 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h @@ -71,7 +71,7 @@ public: EGLContext eglContext() const { return m_context; } private: - EGLDisplay m_eglDisplay; + EGLDisplay m_eglDisplay = EGL_NO_DISPLAY; EGLContext m_context; EGLConfig m_config; diff --git a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h index 2c65969f..64201476 100644 --- a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h @@ -101,7 +101,7 @@ private: PFNEGLDESTROYIMAGEKHRPROC m_egl_destroy_image; PFNGLEGLIMAGETARGETTEXTURE2DOESPROC m_gl_egl_image_target_texture; QWaylandDisplay *m_display = nullptr; - EGLDisplay m_egl_display; + EGLDisplay m_egl_display = EGL_NO_DISPLAY; bool m_egl_initialized = false; }; diff --git a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h index 0bfbe0ea..588366aa 100644 --- a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h +++ b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h @@ -118,7 +118,7 @@ private: PFNGLEGLIMAGETARGETTEXTURE2DOESPROC m_gl_egl_image_target_texture; PFNEGLHYBRISCREATEREMOTEBUFFERPROC m_egl_create_buffer; QWaylandDisplay *m_display = nullptr; - EGLDisplay m_egl_display; + EGLDisplay m_egl_display = EGL_NO_DISPLAY; bool m_egl_initialized = false; }; diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h index 9e876ac1..0391bb26 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h @@ -83,7 +83,7 @@ public: private: void updateGLFormat(); - EGLDisplay m_eglDisplay; + EGLDisplay m_eglDisplay = EGL_NO_DISPLAY; QWaylandDisplay *m_display = nullptr; EGLContext m_context; EGLContext m_shareEGLContext; diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h index 7037ee2d..5fe21d7b 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h @@ -97,9 +97,9 @@ private: struct qt_xcomposite *mWaylandComposite = nullptr; Display *mDisplay = nullptr; - EGLDisplay mEglDisplay; - int mScreen; - Window mRootWindow; + EGLDisplay mEglDisplay = EGL_NO_DISPLAY; + int mScreen = 0; + Window mRootWindow = -1; static void wlDisplayHandleGlobal(void *data, struct ::wl_registry *registry, uint32_t id, const QString &interface, uint32_t version); diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h index ff329c1a..214a03fd 100644 --- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h @@ -116,7 +116,7 @@ public: inline void glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image); private: - EGLDisplay m_egl_display; + EGLDisplay m_egl_display = EGL_NO_DISPLAY; PFNEGLCREATEDRMIMAGEMESAPROC m_egl_create_drm_image; PFNEGLEXPORTDRMIMAGEMESAPROC m_egl_export_drm_image; PFNGLEGLIMAGETARGETTEXTURE2DOESPROC m_gl_egl_image_target_texture_2d; diff --git a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h index f4b29778..a5ca424b 100644 --- a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h @@ -121,7 +121,7 @@ public: inline void eglHybrisSerializeNativeBuffer(EGLClientBuffer buffer, int *ints, int *fds); private: - EGLDisplay m_egl_display; + EGLDisplay m_egl_display = EGL_NO_DISPLAY; PFNGLEGLIMAGETARGETTEXTURE2DOESPROC m_gl_egl_image_target_texture_2d; PFNEGLHYBRISCREATENATIVEBUFFERPROC m_egl_create_buffer; diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h index aa6c5b87..514ae09c 100644 --- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h @@ -62,7 +62,7 @@ public: private: Display *mDisplay = nullptr; - EGLDisplay mEglDisplay; + EGLDisplay mEglDisplay = EGL_NO_DISPLAY; }; class XCompositeEglClientBuffer : public QtWayland::ClientBuffer |