summaryrefslogtreecommitdiffstats
path: root/src/hardwareintegration/client/xcomposite-egl
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/xcomposite-egl
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/xcomposite-egl')
-rw-r--r--src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp2
-rw-r--r--src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h4
-rw-r--r--src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp3
-rw-r--r--src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h6
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;
};
}