diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-02-27 16:21:17 +0100 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2018-02-28 10:51:35 +0000 |
commit | 1fab644753443a525475740fc23172dedaa70d0e (patch) | |
tree | bca0a88662679acd150172f5a73f64d1604960cf /src/hardwareintegration/compositor | |
parent | c4bd9198b4a0fac809903dd2c09276c2c3c1b22e (diff) |
Use default member initialization for raw pointers
Initialize to nullptr to prevent undefined behavior.
Change-Id: I7753c0be77a886d62ecb1cd7b86fc8c98340b0b8
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/hardwareintegration/compositor')
7 files changed, 9 insertions, 9 deletions
diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h index b3bcc3109..f6f162999 100644 --- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h @@ -83,7 +83,7 @@ public: QOpenGLTexture *toOpenGlTexture() override; private: - DrmEglServerBufferIntegration *m_integration; + DrmEglServerBufferIntegration *m_integration = nullptr; EGLImageKHR m_image; diff --git a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h index f99dacd99..f4b297785 100644 --- a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h @@ -84,7 +84,7 @@ public: QOpenGLTexture *toOpenGlTexture() override; private: - LibHybrisEglServerBufferIntegration *m_integration; + LibHybrisEglServerBufferIntegration *m_integration = nullptr; EGLImageKHR m_image; EGLClientBuffer m_buffer; diff --git a/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h b/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h index c303e5f18..850ad040a 100644 --- a/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h +++ b/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h @@ -67,9 +67,9 @@ public: QOpenGLTexture *toOpenGlTexture() override; private: - ShmServerBufferIntegration *m_integration; + ShmServerBufferIntegration *m_integration = nullptr; - QSharedMemory *m_shm; + QSharedMemory *m_shm = nullptr; int m_width; int m_height; int m_bpl; diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h index 60ce814de..04b99ea34 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h @@ -85,8 +85,8 @@ private: WaylandEglClientBuffer(WaylandEglClientBufferIntegration* integration, wl_resource *bufferResource); - BufferState *d; - WaylandEglClientBufferIntegration *m_integration; + BufferState *d = nullptr; + WaylandEglClientBufferIntegration *m_integration = nullptr; }; QT_END_NAMESPACE diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h index f57f741c2..aa6c5b87a 100644 --- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h @@ -79,7 +79,7 @@ public: private: QOpenGLTexture *m_texture = nullptr; - XCompositeEglClientBufferIntegration *m_integration; + XCompositeEglClientBufferIntegration *m_integration = nullptr; }; QT_END_NAMESPACE diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h index 23b856e93..948632ef1 100644 --- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h @@ -87,7 +87,7 @@ public: private: QOpenGLTexture *m_texture = nullptr; - XCompositeGLXClientBufferIntegration *m_integration; + XCompositeGLXClientBufferIntegration *m_integration = nullptr; GLXPixmap m_glxPixmap = 0; }; diff --git a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h index b30d5cca3..bb43ed1af 100644 --- a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h +++ b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h @@ -55,7 +55,7 @@ public: XCompositeHandler(QWaylandCompositor *compositor, Display *display); private: - QWindow *mFakeRootWindow; + QWindow *mFakeRootWindow = nullptr; QString mDisplayString; |