From 0cd54e3cec9498a5ac8c55bd97965c5cd9518330 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Thu, 13 Jul 2017 14:47:55 +0200 Subject: [PATCH] xcb: use default member initialization in struct ... for better localization. This is not possible in C, but in C++ a struct has the same features as a class. Thus, use default member initialization feature (available since C++11). Change-Id: I91522c3a4fe4270c37bb6e85fddeb5970a847352 Reviewed-by: Alexander Volkov Reviewed-by: Friedemann Kleint --- src/plugins/platforms/xcb/qxcbconnection.h | 2 +- src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index 6d13a1b82c..674b0cef4b 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.h +++ b/src/plugins/platforms/xcb/qxcbconnection.h @@ -653,7 +653,7 @@ private: QHash m_touchDevices; #ifdef XCB_USE_XINPUT22 struct StartSystemResizeInfo { - xcb_window_t window; + xcb_window_t window = XCB_NONE; uint16_t deviceid; uint32_t pointid; Qt::Corner corner; diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp index 9236d98abf..bf17e9c1e1 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp @@ -78,9 +78,6 @@ void QXcbConnection::initializeXInput2() // X server's supported version. qCDebug(lcQpaXInput, "Using XInput version %d.%d", xiMajor, m_xi2Minor); m_xi2Enabled = true; -#ifdef XCB_USE_XINPUT22 - m_startSystemResizeInfo.window = XCB_NONE; -#endif xi2SetupDevices(); break; case BadRequest: // Must be an X server with XInput 1