diff options
| author | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-09-22 18:52:54 +0200 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-10-17 10:02:51 +0000 |
| commit | 67c3c0f240241340994898d46df7429d3eda4b69 (patch) | |
| tree | d0ccf907058541f49bb95e2497dc0af6d3e84439 /src/plugins/platforms/xcb/qxcbconnection.h | |
| parent | d67214302f269242ae3d8d2b962fd91ec42c979e (diff) | |
| download | qtbase-67c3c0f240241340994898d46df7429d3eda4b69.tar.gz | |
xcb: qxcbconnection_screens
Moved all screen handling method implementations into
qxcbconnection_screens, the same way we are doing with
xinput2 code in qxcbconnection_xi.cpp. The goal was to
reduce the size of qxcbconnection.h/cpp.
Change-Id: I9bad55ca4b0874171b7313d923b13c66034c3b3e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index fcc1309afe..49e79ec3fd 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.h +++ b/src/plugins/platforms/xcb/qxcbconnection.h @@ -330,7 +330,15 @@ private: ScrollingDevice *scrollingDeviceForId(int id); static bool xi2GetValuatorValueIfSet(const void *event, int valuatorNum, double *value); -#endif + + QHash<int, TouchDeviceData> m_touchDevices; + struct StartSystemMoveResizeInfo { + xcb_window_t window = XCB_NONE; + uint16_t deviceid; + uint32_t pointid; + int corner; + } m_startSystemMoveResizeInfo; +#endif // QT_CONFIG(xcb_xinput) const bool m_canGrabServer; const xcb_visualid_t m_defaultVisualId; @@ -353,15 +361,6 @@ private: QXcbEventQueue *m_eventQueue = nullptr; -#if QT_CONFIG(xcb_xinput) - QHash<int, TouchDeviceData> m_touchDevices; - struct StartSystemMoveResizeInfo { - xcb_window_t window = XCB_NONE; - uint16_t deviceid; - uint32_t pointid; - int corner; - } m_startSystemMoveResizeInfo; -#endif WindowMapper m_mapper; QVector<PeekFunc> m_peekFuncs; |