Fix compiler warnings

Change-Id: Ie0bed19704bed89044d3cf25e7aaa1f740a4b39a
Reviewed-by: Johan Helsing <johan.helsing@qt.io>

8 files changed, 26 insertions, 16 deletions

diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp
index f7d135e49..19944a349 100644
--- a/src/client/qwaylanddatadevice.cpp
+++ b/src/client/qwaylanddatadevice.cpp
@@ -157,7 +157,9 @@ void QWaylandDataDevice::data_device_drop()
         return;
     }
 
-    QPlatformDropQtResponse response = QWindowSystemInterface::handleDrop(m_dragWindow, dragData, m_dragPoint, supportedActions);
+    QPlatformDropQtResponse response = QWindowSystemInterface::handleDrop(m_dragWindow, dragData, m_dragPoint, supportedActions,
+                                                                          QGuiApplication::mouseButtons(),
+                                                                          QGuiApplication::keyboardModifiers());
 
     if (drag) {
         static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->finishDrag(response);
@@ -187,7 +189,9 @@ void QWaylandDataDevice::data_device_enter(uint32_t serial, wl_surface *surface,
         supportedActions = Qt::CopyAction | Qt::MoveAction | Qt::LinkAction;
     }
 
-    const QPlatformDragQtResponse &response = QWindowSystemInterface::handleDrag(m_dragWindow, dragData, m_dragPoint, supportedActions);
+    const QPlatformDragQtResponse &response = QWindowSystemInterface::handleDrag(m_dragWindow, dragData, m_dragPoint, supportedActions,
+                                                                                 QGuiApplication::mouseButtons(),
+                                                                                 QGuiApplication::keyboardModifiers());
 
     if (drag) {
         static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->setResponse(response);
@@ -203,7 +207,9 @@ void QWaylandDataDevice::data_device_enter(uint32_t serial, wl_surface *surface,
 void QWaylandDataDevice::data_device_leave()
 {
     if (m_dragWindow)
-        QWindowSystemInterface::handleDrag(m_dragWindow, nullptr, QPoint(), Qt::IgnoreAction);
+        QWindowSystemInterface::handleDrag(m_dragWindow, nullptr, QPoint(), Qt::IgnoreAction,
+                                           QGuiApplication::mouseButtons(),
+                                           QGuiApplication::keyboardModifiers());
 
     QDrag *drag = static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->currentDrag();
     if (!drag) {
@@ -232,7 +238,9 @@ void QWaylandDataDevice::data_device_motion(uint32_t time, wl_fixed_t x, wl_fixe
         supportedActions = Qt::CopyAction | Qt::MoveAction | Qt::LinkAction;
     }
 
-    QPlatformDragQtResponse response = QWindowSystemInterface::handleDrag(m_dragWindow, dragData, m_dragPoint, supportedActions);
+    QPlatformDragQtResponse response = QWindowSystemInterface::handleDrag(m_dragWindow, dragData, m_dragPoint, supportedActions,
+                                                                          QGuiApplication::mouseButtons(),
+                                                                          QGuiApplication::keyboardModifiers());
 
     if (drag) {
         static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->setResponse(response);
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index d33b0db8b..ce086ee4c 100644
--- a/src/client/qwaylandinputdevice.cpp
+++ b/src/client/qwaylandinputdevice.cpp
@@ -1006,6 +1006,8 @@ bool QWaylandInputDevice::Pointer::FrameData::hasPixelDelta() const
     case axis_source_finger:
     case axis_source_continuous:
         return !delta.isNull();
+    default:
+        return false;
     }
 }
 
diff --git a/src/client/qwaylandtouch.cpp b/src/client/qwaylandtouch.cpp
index 0394aef31..b79f5cf5b 100644
--- a/src/client/qwaylandtouch.cpp
+++ b/src/client/qwaylandtouch.cpp
@@ -165,7 +165,7 @@ void QWaylandTouchExtension::sendTouchEvent()
 
     QWindowSystemInterface::handleTouchEvent(mTargetWindow, mTimestamp, mTouchDevice, mTouchPoints);
 
-    Qt::TouchPointStates states = 0;
+    Qt::TouchPointStates states = {};
     for (int i = 0; i < mTouchPoints.count(); ++i)
         states |= mTouchPoints.at(i).state;
 
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index 44740feff..357805393 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -74,7 +74,7 @@ static const struct {
     QSGMaterialType materialType;
 } bufferTypes[] = {
     // BufferFormatEgl_Null
-    { "", "", 0, 0, false, 0, {} },
+    { "", "", 0, 0, false, {}, {} },
 
     // BufferFormatEgl_RGB
     {
diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp
index 1b8a3c2e2..6b7e86003 100644
--- a/src/compositor/extensions/qwaylandxdgshell.cpp
+++ b/src/compositor/extensions/qwaylandxdgshell.cpp
@@ -1725,7 +1725,7 @@ Qt::Orientations QWaylandXdgPopup::slideConstraints() const
     Q_D(const QWaylandXdgPopup);
     const uint flags = d->m_positionerData.constraintAdjustments;
 
-    Qt::Orientations constraints = 0;
+    Qt::Orientations constraints = {};
 
     if (flags & XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_X)
         constraints |= Qt::Horizontal;
@@ -1755,7 +1755,7 @@ Qt::Orientations QWaylandXdgPopup::flipConstraints() const
     Q_D(const QWaylandXdgPopup);
     const uint flags = d->m_positionerData.constraintAdjustments;
 
-    Qt::Orientations constraints = 0;
+    Qt::Orientations constraints = {};
 
     if (flags & XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_FLIP_X)
         constraints |= Qt::Horizontal;
@@ -1785,7 +1785,7 @@ Qt::Orientations QWaylandXdgPopup::resizeConstraints() const
     Q_D(const QWaylandXdgPopup);
     const uint flags = d->m_positionerData.constraintAdjustments;
 
-    Qt::Orientations constraints = 0;
+    Qt::Orientations constraints = {};
 
     if (flags & XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_RESIZE_X)
         constraints |= Qt::Horizontal;
diff --git a/src/compositor/extensions/qwaylandxdgshell_p.h b/src/compositor/extensions/qwaylandxdgshell_p.h
index 3223abf3a..de48f481d 100644
--- a/src/compositor/extensions/qwaylandxdgshell_p.h
+++ b/src/compositor/extensions/qwaylandxdgshell_p.h
@@ -63,8 +63,8 @@ QT_BEGIN_NAMESPACE
 struct Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPositionerData {
     QSize size;
     QRect anchorRect;
-    Qt::Edges anchorEdges = 0;
-    Qt::Edges gravityEdges = 0;
+    Qt::Edges anchorEdges = {};
+    Qt::Edges gravityEdges = {};
     uint constraintAdjustments = XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_NONE;
     QPoint offset;
     QWaylandXdgPositionerData();
diff --git a/src/compositor/extensions/qwaylandxdgshellv6.cpp b/src/compositor/extensions/qwaylandxdgshellv6.cpp
index 934dccb06..94c430aad 100644
--- a/src/compositor/extensions/qwaylandxdgshellv6.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellv6.cpp
@@ -1656,7 +1656,7 @@ Qt::Orientations QWaylandXdgPopupV6::slideConstraints() const
     Q_D(const QWaylandXdgPopupV6);
     const uint flags = d->m_positionerData.constraintAdjustments;
 
-    Qt::Orientations constraints = 0;
+    Qt::Orientations constraints = {};
 
     if (flags & ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_SLIDE_X)
         constraints |= Qt::Horizontal;
@@ -1686,7 +1686,7 @@ Qt::Orientations QWaylandXdgPopupV6::flipConstraints() const
     Q_D(const QWaylandXdgPopupV6);
     const uint flags = d->m_positionerData.constraintAdjustments;
 
-    Qt::Orientations constraints = 0;
+    Qt::Orientations constraints = {};
 
     if (flags & ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_FLIP_X)
         constraints |= Qt::Horizontal;
@@ -1716,7 +1716,7 @@ Qt::Orientations QWaylandXdgPopupV6::resizeConstraints() const
     Q_D(const QWaylandXdgPopupV6);
     const uint flags = d->m_positionerData.constraintAdjustments;
 
-    Qt::Orientations constraints = 0;
+    Qt::Orientations constraints = {};
 
     if (flags & ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_RESIZE_X)
         constraints |= Qt::Horizontal;
diff --git a/src/compositor/extensions/qwaylandxdgshellv6_p.h b/src/compositor/extensions/qwaylandxdgshellv6_p.h
index 457bc2201..f13e73da4 100644
--- a/src/compositor/extensions/qwaylandxdgshellv6_p.h
+++ b/src/compositor/extensions/qwaylandxdgshellv6_p.h
@@ -61,8 +61,8 @@ QT_BEGIN_NAMESPACE
 struct Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPositionerV6Data {
     QSize size;
     QRect anchorRect;
-    Qt::Edges anchorEdges = 0;
-    Qt::Edges gravityEdges = 0;
+    Qt::Edges anchorEdges = {};
+    Qt::Edges gravityEdges = {};
     uint constraintAdjustments = ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_NONE;
     QPoint offset;
     QWaylandXdgPositionerV6Data();