From c636129c13808d71db9389e0c446d967b7590053 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sun, 18 Feb 2024 21:12:58 -0800
Subject: [PATCH] Port two tests' QAbstractEventDispatcher overrides to V2

Change-Id: I83dda2d36c904517b3c0fffd17b52c421bf08d5b
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
---
 tests/auto/corelib/thread/qthread/tst_qthread.cpp   | 13 +++++++------
 .../benchliboptions/tst_benchliboptions.cpp         | 13 +++++--------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
index 9b4cd06f86..a7194d4442 100644
--- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp
+++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
@@ -1229,9 +1229,10 @@ void tst_QThread::isRunningInFinished()
     }
 }
 
-class DummyEventDispatcher : public QAbstractEventDispatcher {
+class DummyEventDispatcher : public QAbstractEventDispatcherV2
+{
+    Q_OBJECT
 public:
-    DummyEventDispatcher() : QAbstractEventDispatcher() {}
     bool processEvents(QEventLoop::ProcessEventsFlags) override {
         visited.storeRelaxed(true);
         emit awake();
@@ -1240,11 +1241,11 @@ public:
     }
     void registerSocketNotifier(QSocketNotifier *) override {}
     void unregisterSocketNotifier(QSocketNotifier *) override {}
-    void registerTimer(int, qint64, Qt::TimerType, QObject *) override {}
-    bool unregisterTimer(int) override { return false; }
+    void registerTimer(Qt::TimerId, Duration, Qt::TimerType, QObject *) override {}
+    bool unregisterTimer(Qt::TimerId) override { return false; }
     bool unregisterTimers(QObject *) override { return false; }
-    QList<TimerInfo> registeredTimers(QObject *) const override { return QList<TimerInfo>(); }
-    int remainingTime(int) override { return 0; }
+    QList<TimerInfoV2> timersForObject(QObject *) const override { return {}; }
+    Duration remainingTime(Qt::TimerId) const override { return 0s; }
     void wakeUp() override {}
     void interrupt() override {}
 
diff --git a/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp
index 55e48beb79..35ba5e5309 100644
--- a/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp
+++ b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp
@@ -10,23 +10,20 @@
 #include <QAbstractEventDispatcher>
 
 /* Custom event dispatcher to ensure we don't receive any spontaneous events */
-class TestEventDispatcher : public QAbstractEventDispatcher
+class TestEventDispatcher : public QAbstractEventDispatcherV2
 {
     Q_OBJECT
 
 public:
-    TestEventDispatcher(QObject* parent =0)
-        : QAbstractEventDispatcher(parent)
-    {}
     void interrupt() override {}
     bool processEvents(QEventLoop::ProcessEventsFlags) override { return false; }
     void registerSocketNotifier(QSocketNotifier*) override {}
-    void registerTimer(int,qint64,Qt::TimerType,QObject*) override {}
-    QList<TimerInfo> registeredTimers(QObject*) const override { return QList<TimerInfo>(); }
+    void registerTimer(Qt::TimerId,Duration,Qt::TimerType,QObject*) override {}
+    QList<TimerInfoV2> timersForObject(QObject*) const override { return {}; }
     void unregisterSocketNotifier(QSocketNotifier*) override {}
-    bool unregisterTimer(int) override { return false; }
+    bool unregisterTimer(Qt::TimerId) override { return false; }
     bool unregisterTimers(QObject*) override { return false; }
-    int remainingTime(int) override { return 0; }
+    Duration remainingTime(Qt::TimerId) const override { return {}; }
     void wakeUp() override {}
 
 #ifdef Q_OS_WIN