Remove usages of deprecated APIs of QWheelEvent

- Replaced the usages of deprecated QWheelEvent::delta() and
  QWheelEvent::orientation() with QWheelEvent::angleDelta().

- Removed the tests for deprecated APIs.

Task-number: QTBUG-76491
Change-Id: I2f9a53d3236bce8ba6cee66ec1b0b933d50518aa
Reviewed-by: Johan Helsing <johan.helsing@qt.io>

6 files changed, 30 insertions, 50 deletions

diff --git a/examples/wayland/minimal-cpp/compositor.cpp b/examples/wayland/minimal-cpp/compositor.cpp
index fa9ae2da9..a4b989975 100644
--- a/examples/wayland/minimal-cpp/compositor.cpp
+++ b/examples/wayland/minimal-cpp/compositor.cpp
@@ -163,9 +163,13 @@ void Compositor::handleMouseMove(const QPoint &position)
     defaultSeat()->sendMouseMoveEvent(view, mapToView(view, position));
 }
 
-void Compositor::handleMouseWheel(Qt::Orientation orientation, int delta)
+void Compositor::handleMouseWheel(const QPoint &angleDelta)
 {
-    defaultSeat()->sendMouseWheelEvent(orientation, delta);
+    // TODO: fix this to send a single event, when diagonal scrolling is supported
+    if (angleDelta.x() != 0)
+        defaultSeat()->sendMouseWheelEvent(Qt::Horizontal, angleDelta.x());
+    if (angleDelta.y() != 0)
+        defaultSeat()->sendMouseWheelEvent(Qt::Vertical, angleDelta.y());
 }
 
 void Compositor::handleKeyPress(quint32 nativeScanCode)
diff --git a/examples/wayland/minimal-cpp/compositor.h b/examples/wayland/minimal-cpp/compositor.h
index 3c0c80e0e..e32442dd4 100644
--- a/examples/wayland/minimal-cpp/compositor.h
+++ b/examples/wayland/minimal-cpp/compositor.h
@@ -102,7 +102,7 @@ public:
     void handleMousePress(const QPoint &position, Qt::MouseButton button);
     void handleMouseRelease(const QPoint &position, Qt::MouseButton button, Qt::MouseButtons buttons);
     void handleMouseMove(const QPoint &position);
-    void handleMouseWheel(Qt::Orientation orientation, int delta);
+    void handleMouseWheel(const QPoint &angleDelta);
 
     void handleKeyPress(quint32 nativeScanCode);
     void handleKeyRelease(quint32 nativeScanCode);
diff --git a/examples/wayland/minimal-cpp/window.cpp b/examples/wayland/minimal-cpp/window.cpp
index f32fb515c..9f22cc68a 100644
--- a/examples/wayland/minimal-cpp/window.cpp
+++ b/examples/wayland/minimal-cpp/window.cpp
@@ -129,7 +129,7 @@ void Window::mouseMoveEvent(QMouseEvent *event)
 
 void Window::wheelEvent(QWheelEvent *event)
 {
-    m_compositor->handleMouseWheel(event->orientation(), event->delta());
+    m_compositor->handleMouseWheel(event->angleDelta());
 }
 
 void Window::keyPressEvent(QKeyEvent *e)
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index 01b183b8a..ee15a0871 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -616,7 +616,11 @@ void QWaylandQuickItem::wheelEvent(QWheelEvent *event)
         }
 
         QWaylandSeat *seat = compositor()->seatFor(event);
-        seat->sendMouseWheelEvent(event->orientation(), event->delta());
+        // TODO: fix this to send a single event, when diagonal scrolling is supported
+        if (event->angleDelta().x() != 0)
+            seat->sendMouseWheelEvent(Qt::Horizontal, event->angleDelta().x());
+        if (event->angleDelta().y() != 0)
+            seat->sendMouseWheelEvent(Qt::Vertical, event->angleDelta().y());
     } else {
         event->ignore();
     }
diff --git a/tests/auto/client/seatv4/tst_seatv4.cpp b/tests/auto/client/seatv4/tst_seatv4.cpp
index 77304deaf..40f8742a2 100644
--- a/tests/auto/client/seatv4/tst_seatv4.cpp
+++ b/tests/auto/client/seatv4/tst_seatv4.cpp
@@ -212,22 +212,20 @@ void tst_seatv4::simpleAxis_data()
 {
     QTest::addColumn<uint>("axis");
     QTest::addColumn<qreal>("value");
-    QTest::addColumn<Qt::Orientation>("orientation");
     QTest::addColumn<QPoint>("angleDelta");
 
     // Directions in regular windows/linux terms (no "natural" scrolling)
-    QTest::newRow("down") << uint(Pointer::axis_vertical_scroll) << 1.0 << Qt::Vertical << QPoint{0, -12};
-    QTest::newRow("up") << uint(Pointer::axis_vertical_scroll) << -1.0 << Qt::Vertical << QPoint{0, 12};
-    QTest::newRow("left") << uint(Pointer::axis_horizontal_scroll) << 1.0 << Qt::Horizontal << QPoint{-12, 0};
-    QTest::newRow("right") << uint(Pointer::axis_horizontal_scroll) << -1.0 << Qt::Horizontal << QPoint{12, 0};
-    QTest::newRow("up big") << uint(Pointer::axis_vertical_scroll) << -10.0 << Qt::Vertical << QPoint{0, 120};
+    QTest::newRow("down") << uint(Pointer::axis_vertical_scroll) << 1.0  << QPoint{0, -12};
+    QTest::newRow("up") << uint(Pointer::axis_vertical_scroll) << -1.0 << QPoint{0, 12};
+    QTest::newRow("left") << uint(Pointer::axis_horizontal_scroll) << 1.0 << QPoint{-12, 0};
+    QTest::newRow("right") << uint(Pointer::axis_horizontal_scroll) << -1.0 << QPoint{12, 0};
+    QTest::newRow("up big") << uint(Pointer::axis_vertical_scroll) << -10.0 << QPoint{0, 120};
 }
 
 void tst_seatv4::simpleAxis()
 {
     QFETCH(uint, axis);
     QFETCH(qreal, value);
-    QFETCH(Qt::Orientation, orientation);
     QFETCH(QPoint, angleDelta);
 
     class WheelWindow : QRasterWindow {
@@ -256,27 +254,18 @@ void tst_seatv4::simpleAxis()
             // We didn't press any buttons
             QCOMPARE(event->buttons(), Qt::NoButton);
 
-            if (event->orientation() == Qt::Horizontal)
-                QCOMPARE(event->delta(), event->angleDelta().x());
-            else
-                QCOMPARE(event->delta(), event->angleDelta().y());
-
             // There has been no information about what created the event.
             // Documentation says not synthesized is appropriate in such cases
             QCOMPARE(event->source(), Qt::MouseEventNotSynthesized);
 
-            m_events.append(Event(event->pixelDelta(), event->angleDelta(), event->orientation()));
+            m_events.append(Event{event->pixelDelta(), event->angleDelta()});
         }
         struct Event // Because I didn't find a convenient way to copy it entirely
         {
-            // TODO: Constructors can be removed when we start supporting brace-initializers
             Event() = default;
-            Event(const QPoint &pixelDelta, const QPoint &angleDelta, Qt::Orientation orientation)
-                : pixelDelta(pixelDelta), angleDelta(angleDelta), orientation(orientation)
-            {}
+
             const QPoint pixelDelta;
             const QPoint angleDelta; // eights of a degree, positive is upwards, left
-            const Qt::Orientation orientation{};
         };
         QVector<Event> m_events;
     };
@@ -299,7 +288,6 @@ void tst_seatv4::simpleAxis()
     QTRY_COMPARE(window.m_events.size(), 1);
     auto event = window.m_events.takeFirst();
     QCOMPARE(event.angleDelta, angleDelta);
-    QCOMPARE(event.orientation, orientation);
 }
 
 void tst_seatv4::invalidPointerEvents()
diff --git a/tests/auto/client/seatv5/tst_seatv5.cpp b/tests/auto/client/seatv5/tst_seatv5.cpp
index 76a68b86f..ca8de31ac 100644
--- a/tests/auto/client/seatv5/tst_seatv5.cpp
+++ b/tests/auto/client/seatv5/tst_seatv5.cpp
@@ -127,12 +127,8 @@ public:
         QRasterWindow::wheelEvent(event);
 //        qDebug() << event << "angleDelta" << event->angleDelta() << "pixelDelta" << event->pixelDelta();
 
-        if (event->phase() == Qt::ScrollUpdate || event->phase() == Qt::NoScrollPhase) {
-            // Angle delta should always be provided (says docs, but QPA sends compatibility events
-            // for Qt4 with zero angleDelta, and with a delta)
-            QVERIFY(!event->angleDelta().isNull() || event->delta());
-        } else {
-            // Shouldn't have deltas in the other phases
+        if (event->phase() != Qt::ScrollUpdate && event->phase() != Qt::NoScrollPhase) {
+            // Shouldn't have deltas in the these phases
             QCOMPARE(event->angleDelta(), QPoint(0, 0));
             QCOMPARE(event->pixelDelta(), QPoint(0, 0));
         }
@@ -144,13 +140,6 @@ public:
         // We didn't press any buttons
         QCOMPARE(event->buttons(), Qt::NoButton);
 
-        if (!event->angleDelta().isNull()) {
-            if (event->orientation() == Qt::Horizontal)
-                QCOMPARE(event->delta(), event->angleDelta().x());
-            else
-                QCOMPARE(event->delta(), event->angleDelta().y());
-        }
-
         m_events.append(Event{event});
     }
     struct Event // Because I didn't find a convenient way to copy it entirely
@@ -160,14 +149,12 @@ public:
             : phase(event->phase())
             , pixelDelta(event->pixelDelta())
             , angleDelta(event->angleDelta())
-            , orientation(event->orientation())
             , source(event->source())
         {
         }
         const Qt::ScrollPhase phase{};
         const QPoint pixelDelta;
         const QPoint angleDelta; // eights of a degree, positive is upwards, left
-        const Qt::Orientation orientation{};
         const Qt::MouseEventSource source{};
     };
     QVector<Event> m_events;
@@ -177,22 +164,20 @@ void tst_seatv5::simpleAxis_data()
 {
     QTest::addColumn<uint>("axis");
     QTest::addColumn<qreal>("value");
-    QTest::addColumn<Qt::Orientation>("orientation");
     QTest::addColumn<QPoint>("angleDelta");
 
     // Directions in regular windows/linux terms (no "natural" scrolling)
-    QTest::newRow("down") << uint(Pointer::axis_vertical_scroll) << 1.0 << Qt::Vertical << QPoint{0, -12};
-    QTest::newRow("up") << uint(Pointer::axis_vertical_scroll) << -1.0 << Qt::Vertical << QPoint{0, 12};
-    QTest::newRow("left") << uint(Pointer::axis_horizontal_scroll) << 1.0 << Qt::Horizontal << QPoint{-12, 0};
-    QTest::newRow("right") << uint(Pointer::axis_horizontal_scroll) << -1.0 << Qt::Horizontal << QPoint{12, 0};
-    QTest::newRow("up big") << uint(Pointer::axis_vertical_scroll) << -10.0 << Qt::Vertical << QPoint{0, 120};
+    QTest::newRow("down") << uint(Pointer::axis_vertical_scroll) << 1.0 << QPoint{0, -12};
+    QTest::newRow("up") << uint(Pointer::axis_vertical_scroll) << -1.0 << QPoint{0, 12};
+    QTest::newRow("left") << uint(Pointer::axis_horizontal_scroll) << 1.0 << QPoint{-12, 0};
+    QTest::newRow("right") << uint(Pointer::axis_horizontal_scroll) << -1.0 << QPoint{12, 0};
+    QTest::newRow("up big") << uint(Pointer::axis_vertical_scroll) << -10.0 << QPoint{0, 120};
 }
 
 void tst_seatv5::simpleAxis()
 {
     QFETCH(uint, axis);
     QFETCH(qreal, value);
-    QFETCH(Qt::Orientation, orientation);
     QFETCH(QPoint, angleDelta);
 
     WheelWindow window;
@@ -219,7 +204,6 @@ void tst_seatv5::simpleAxis()
         // There has been no information about what created the event.
         // Documentation says not synthesized is appropriate in such cases
         QCOMPARE(e.source, Qt::MouseEventNotSynthesized);
-        QCOMPARE(e.orientation, orientation);
         QCOMPARE(e.angleDelta, angleDelta);
     }
 
@@ -262,7 +246,7 @@ void tst_seatv5::fingerScroll()
     {
         auto e = window.m_events.takeFirst();
         QCOMPARE(e.phase, Qt::ScrollUpdate);
-        QCOMPARE(e.orientation, Qt::Vertical);
+        QVERIFY(qAbs(e.angleDelta.x()) <= qAbs(e.angleDelta.y())); // Vertical scroll
 //        QCOMPARE(e.angleDelta, angleDelta); // TODO: what should this be?
         QCOMPARE(e.pixelDelta, QPoint(0, 10));
         QCOMPARE(e.source, Qt::MouseEventSynthesizedBySystem); // A finger is not a wheel
@@ -280,7 +264,7 @@ void tst_seatv5::fingerScroll()
     {
         auto e = window.m_events.takeFirst();
         QCOMPARE(e.phase, Qt::ScrollUpdate);
-        QCOMPARE(e.orientation, Qt::Horizontal);
+        QVERIFY(qAbs(e.angleDelta.x()) > qAbs(e.angleDelta.y())); // Horizontal scroll
         QCOMPARE(e.pixelDelta, QPoint(10, 0));
         QCOMPARE(e.source, Qt::MouseEventSynthesizedBySystem); // A finger is not a wheel
     }
@@ -372,7 +356,7 @@ void tst_seatv5::wheelDiscreteScroll()
     {
         auto e = window.m_events.takeFirst();
         QCOMPARE(e.phase, Qt::NoScrollPhase);
-        QCOMPARE(e.orientation, Qt::Vertical);
+        QVERIFY(qAbs(e.angleDelta.x()) <= qAbs(e.angleDelta.y())); // Vertical scroll
         // According to the docs the angle delta is in eights of a degree and most mice have
         // 1 click = 15 degrees. The angle delta should therefore be:
         // 15 degrees / (1/8 eights per degrees) = 120 eights of degrees.