1 files changed, 7 insertions, 15 deletions

diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h
index 7cf25d41a6..8a4b577d2e 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.h
+++ b/src/plugins/platforms/xcb/qxcbconnection.h
@@ -104,10 +104,8 @@ public:
     virtual void handleFocusInEvent(const xcb_focus_in_event_t *) {}
     virtual void handleFocusOutEvent(const xcb_focus_out_event_t *) {}
     virtual void handlePropertyNotifyEvent(const xcb_property_notify_event_t *) {}
-#if QT_CONFIG(xcb_xinput)
     virtual void handleXIMouseEvent(xcb_ge_event_t *, Qt::MouseEventSource = Qt::MouseEventNotSynthesized) {}
     virtual void handleXIEnterLeave(xcb_ge_event_t *) {}
-#endif
     virtual QXcbWindow *toWindow() { return nullptr; }
 };
 
@@ -129,7 +127,7 @@ class Q_XCB_EXPORT QXcbConnection : public QXcbBasicConnection
 {
     Q_OBJECT
 public:
-    QXcbConnection(QXcbNativeInterface *nativeInterface, bool canGrabServer, xcb_visualid_t defaultVisualId, const char *displayName = 0);
+    QXcbConnection(QXcbNativeInterface *nativeInterface, bool canGrabServer, xcb_visualid_t defaultVisualId, const char *displayName = nullptr);
     ~QXcbConnection();
 
     QXcbConnection *connection() const { return const_cast<QXcbConnection *>(this); }
@@ -225,7 +223,6 @@ public:
 
     bool isUserInputEvent(xcb_generic_event_t *event) const;
 
-#if QT_CONFIG(xcb_xinput)
     void xi2SelectStateEvents();
     void xi2SelectDeviceEvents(xcb_window_t window);
     void xi2SelectDeviceEventsCompatibility(xcb_window_t window);
@@ -233,10 +230,9 @@ public:
     bool xi2MouseEventsDisabled() const;
     Qt::MouseButton xiToQtMouseButton(uint32_t b);
     void xi2UpdateScrollingDevices();
-    bool startSystemMoveResizeForTouchBegin(xcb_window_t window, const QPoint &point, int corner);
+    bool startSystemMoveResizeForTouch(xcb_window_t window, int edges);
     void abortSystemMoveResizeForTouch();
     bool isTouchScreen(int id);
-#endif
 
     bool canGrab() const { return m_canGrabServer; }
 
@@ -267,7 +263,6 @@ private:
     inline bool timeGreaterThan(xcb_timestamp_t a, xcb_timestamp_t b) const
     { return static_cast<int32_t>(a - b) > 0 || b == XCB_CURRENT_TIME; }
 
-#if QT_CONFIG(xcb_xinput)
     void xi2SetupDevice(void *info, bool removeExisting = true);
     void xi2SetupDevices();
     struct TouchDeviceData {
@@ -299,7 +294,7 @@ private:
         int deviceId = 0;
         QTabletEvent::PointerType pointerType = QTabletEvent::UnknownPointer;
         QTabletEvent::TabletDevice tool = QTabletEvent::Stylus;
-        Qt::MouseButtons buttons = 0;
+        Qt::MouseButtons buttons;
         qint64 serialId = 0;
         bool inProximity = false;
         struct ValuatorClassInfo {
@@ -323,8 +318,8 @@ private:
         int horizontalIndex = 0;
         double verticalIncrement = 0;
         double horizontalIncrement = 0;
-        Qt::Orientations orientations = 0;
-        Qt::Orientations legacyOrientations = 0;
+        Qt::Orientations orientations;
+        Qt::Orientations legacyOrientations;
         QPointF lastScrollPosition;
     };
     QHash<int, ScrollingDevice> m_scrollingDevices;
@@ -339,9 +334,8 @@ private:
         xcb_window_t window = XCB_NONE;
         uint16_t deviceid;
         uint32_t pointid;
-        int corner;
+        int edges;
     } m_startSystemMoveResizeInfo;
-#endif // QT_CONFIG(xcb_xinput)
 
     const bool m_canGrabServer;
     const xcb_visualid_t m_defaultVisualId;
@@ -366,7 +360,7 @@ private:
 
     WindowMapper m_mapper;
 
-    Qt::MouseButtons m_buttonState = nullptr;
+    Qt::MouseButtons m_buttonState;
     Qt::MouseButton m_button = Qt::NoButton;
 
     QXcbWindow *m_focusWindow = nullptr;
@@ -389,12 +383,10 @@ private:
     QTimer m_focusInTimer;
 
 };
-#if QT_CONFIG(xcb_xinput)
 #if QT_CONFIG(tabletevent)
 Q_DECLARE_TYPEINFO(QXcbConnection::TabletData::ValuatorClassInfo, Q_PRIMITIVE_TYPE);
 Q_DECLARE_TYPEINFO(QXcbConnection::TabletData, Q_MOVABLE_TYPE);
 #endif
-#endif
 
 class QXcbConnectionGrabber
 {