whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port two tests' QAbstractEventDispatcher overrides to V2 

Change-Id: I83dda2d36c904517b3c0fffd17b52c421bf08d5b
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
bb10
Thiago Macieira 2024-02-18 21:12:58 -08:00
parent af383319f6
commit c636129c13
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/auto/corelib/thread/qthread/tst_qthread.cpp
View File

@ -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 {}

13
tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp
View File

@ -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