summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-09-10 20:39:49 +0200
committerLars Knoll <lars.knoll@qt.io>2020-09-11 00:20:47 +0200
commit6ae7a02104631a2234c475575ae15ca79bef14f9 (patch)
tree5ca2db0e3aa3c7851c6d19117147c581bebeeee3 /tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
parent459e8dfdfb8ac164383c14332b2b0919f59f8b3c (diff)
Remove most compiler warnings about missing overrides
Remove around 1000 compiler warnings about missing overrides in our auto tests. This significantly reduce the compiler warning noise in our auto tests, so that one can actually better see the real problems inbetween. Change-Id: Id0c04dba43fcaf55d8cd2b5c6697358857c31bf9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp')
-rw-r--r--tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
index ff345def85..1db210e0bd 100644
--- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
+++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
@@ -335,7 +335,8 @@ public:
secondTimerId = -1; // started later
}
- bool event(QEvent *e) {
+ bool event(QEvent *e) override
+ {
if (e->type() == 4002) {
// got the posted event
if (timeoutsForFirst == 1 && timeoutsForSecond == 0)
@@ -345,7 +346,8 @@ public:
return QObject::event(e);
}
- void timerEvent(QTimerEvent *te) {
+ void timerEvent(QTimerEvent *te) override
+ {
if (te->timerId() == firstTimerId) {
if (++timeoutsForFirst == 1) {
killTimer(extraTimerId);
@@ -403,7 +405,7 @@ public:
: inTimerEvent(false), timerEventRecursed(false), interval(interval)
{ }
- void timerEvent(QTimerEvent *timerEvent)
+ void timerEvent(QTimerEvent *timerEvent) override
{
timerEventRecursed = inTimerEvent;
if (timerEventRecursed) {
@@ -460,7 +462,7 @@ public:
: times(0), target(target), recurse(false)
{ }
- void timerEvent(QTimerEvent *timerEvent)
+ void timerEvent(QTimerEvent *timerEvent) override
{
if (++times == target) {
killTimer(timerEvent->timerId());
@@ -579,7 +581,7 @@ public:
interval = interval ? 0 : 1000;
}
- void timerEvent(QTimerEvent* ev)
+ void timerEvent(QTimerEvent* ev) override
{
if (ev->timerId() != m_timer.timerId())
return;
@@ -677,7 +679,7 @@ public:
delete timer;
}
- void run()
+ void run() override
{
QEventLoop eventLoop;
timer = new QTimer;
@@ -947,7 +949,7 @@ class DontBlockEvents : public QObject
Q_OBJECT
public:
DontBlockEvents();
- void timerEvent(QTimerEvent*);
+ void timerEvent(QTimerEvent*) override;
int count;
int total;