diff options
Diffstat (limited to 'tests/auto/testlib')
4 files changed, 25 insertions, 25 deletions
diff --git a/tests/auto/testlib/selftests/badxml/tst_badxml.cpp b/tests/auto/testlib/selftests/badxml/tst_badxml.cpp index bdf48a2f21..e3f650bd85 100644 --- a/tests/auto/testlib/selftests/badxml/tst_badxml.cpp +++ b/tests/auto/testlib/selftests/badxml/tst_badxml.cpp @@ -68,7 +68,7 @@ public: : className("tst_BadXml"), mo(0) {} ~tst_BadXmlSub() { free(mo); } - const QMetaObject* metaObject() const; + const QMetaObject* metaObject() const override; QByteArray className; private: diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp b/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp index c9e3327411..224b720f5f 100644 --- a/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp +++ b/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp @@ -39,16 +39,16 @@ public: TestEventDispatcher(QObject* parent =0) : QAbstractEventDispatcher(parent) {} - void interrupt() {} - bool processEvents(QEventLoop::ProcessEventsFlags) { return false; } - void registerSocketNotifier(QSocketNotifier*) {} - void registerTimer(int,int,Qt::TimerType,QObject*) {} - QList<TimerInfo> registeredTimers(QObject*) const { return QList<TimerInfo>(); } - void unregisterSocketNotifier(QSocketNotifier*) {} - bool unregisterTimer(int) { return false; } - bool unregisterTimers(QObject*) { return false; } - int remainingTime(int) { return 0; } - void wakeUp() {} + void interrupt() override {} + bool processEvents(QEventLoop::ProcessEventsFlags) override { return false; } + void registerSocketNotifier(QSocketNotifier*) override {} + void registerTimer(int,int,Qt::TimerType,QObject*) override {} + QList<TimerInfo> registeredTimers(QObject*) const override { return QList<TimerInfo>(); } + void unregisterSocketNotifier(QSocketNotifier*) override {} + bool unregisterTimer(int) override { return false; } + bool unregisterTimers(QObject*) override { return false; } + int remainingTime(int) override { return 0; } + void wakeUp() override {} #ifdef Q_OS_WIN bool registerEventNotifier(QWinEventNotifier *) { return false; } diff --git a/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp index 689f92cc39..5d77df91a0 100644 --- a/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp +++ b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp @@ -39,16 +39,16 @@ public: TestEventDispatcher(QObject* parent =0) : QAbstractEventDispatcher(parent) {} - void interrupt() {} - bool processEvents(QEventLoop::ProcessEventsFlags) { return false; } - void registerSocketNotifier(QSocketNotifier*) {} - void registerTimer(int,int,Qt::TimerType,QObject*) {} - QList<TimerInfo> registeredTimers(QObject*) const { return QList<TimerInfo>(); } - void unregisterSocketNotifier(QSocketNotifier*) {} - bool unregisterTimer(int) { return false; } - bool unregisterTimers(QObject*) { return false; } - int remainingTime(int) { return 0; } - void wakeUp() {} + void interrupt() override {} + bool processEvents(QEventLoop::ProcessEventsFlags) override { return false; } + void registerSocketNotifier(QSocketNotifier*) override {} + void registerTimer(int,int,Qt::TimerType,QObject*) override {} + QList<TimerInfo> registeredTimers(QObject*) const override { return QList<TimerInfo>(); } + void unregisterSocketNotifier(QSocketNotifier*) override {} + bool unregisterTimer(int) override { return false; } + bool unregisterTimers(QObject*) override { return false; } + int remainingTime(int) override { return 0; } + void wakeUp() override {} #ifdef Q_OS_WIN bool registerEventNotifier(QWinEventNotifier *) { return false; } diff --git a/tests/auto/testlib/selftests/mouse/tst_mouse.cpp b/tests/auto/testlib/selftests/mouse/tst_mouse.cpp index 43dda31daf..59dfc26043 100644 --- a/tests/auto/testlib/selftests/mouse/tst_mouse.cpp +++ b/tests/auto/testlib/selftests/mouse/tst_mouse.cpp @@ -61,25 +61,25 @@ public: ulong lastTimeStamp = 0; protected: - void mousePressEvent(QMouseEvent *e) + void mousePressEvent(QMouseEvent *e) override { pressCount++; processEvent(e); } - void mouseMoveEvent(QMouseEvent *e) + void mouseMoveEvent(QMouseEvent *e) override { moveCount++; stateInMouseMove = e->buttons(); processEvent(e); } - void mouseReleaseEvent(QMouseEvent *e) + void mouseReleaseEvent(QMouseEvent *e) override { processEvent(e); } - void mouseDoubleClickEvent(QMouseEvent *e) + void mouseDoubleClickEvent(QMouseEvent *e) override { doubleClickCount++; processEvent(e); |