diff options
Diffstat (limited to 'src/hardwareintegration/client/xcomposite-egl')
4 files changed, 5 insertions, 10 deletions
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp index 2a7de6b72..aa5367e02 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp @@ -54,8 +54,6 @@ namespace QtWaylandClient { QWaylandXCompositeEGLClientBufferIntegration::QWaylandXCompositeEGLClientBufferIntegration() : QWaylandClientBufferIntegration() - , mWaylandDisplay(0) - , mDisplay(0) { qDebug() << "Using XComposite-EGL"; } diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h index cdc071e55..3742e1f56 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h @@ -92,10 +92,10 @@ public: bool supportsWindowDecoration() const override { return false; } private: - QWaylandDisplay *mWaylandDisplay; + QWaylandDisplay *mWaylandDisplay = nullptr; struct qt_xcomposite *mWaylandComposite; - Display *mDisplay; + Display *mDisplay = nullptr; EGLDisplay mEglDisplay; int mScreen; Window mRootWindow; diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp index 9c3dee3fc..57a7ba7b6 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp @@ -57,10 +57,7 @@ namespace QtWaylandClient { QWaylandXCompositeEGLWindow::QWaylandXCompositeEGLWindow(QWindow *window, QWaylandXCompositeEGLClientBufferIntegration *glxIntegration) : QWaylandWindow(window) , m_glxIntegration(glxIntegration) - , m_buffer(0) - , m_xWindow(0) , m_config(q_configFromGLFormat(glxIntegration->eglDisplay(), window->format(), true, EGL_WINDOW_BIT | EGL_PIXMAP_BIT)) - , m_surface(0) { } diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h index 90b4cc73e..d90159fa7 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h @@ -66,11 +66,11 @@ private: void createEglSurface(); QWaylandXCompositeEGLClientBufferIntegration *m_glxIntegration; - QWaylandBuffer *m_buffer; + QWaylandBuffer *m_buffer = nullptr; - Window m_xWindow; + Window m_xWindow = 0; EGLConfig m_config; - EGLSurface m_surface; + EGLSurface m_surface = EGL_NO_SURFACE; }; } |