diff options
Diffstat (limited to 'tests/auto/corelib/kernel')
10 files changed, 63 insertions, 59 deletions
diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp index e4036341fd..8567d8c3b9 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp +++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp @@ -44,7 +44,7 @@ class EventSpy : public QObject public: QList<int> recordedEvents; - bool eventFilter(QObject *, QEvent *event) + bool eventFilter(QObject *, QEvent *event) override { recordedEvents.append(event->type()); return false; @@ -234,7 +234,7 @@ class EventGenerator : public QObject public: QObject *other; - bool event(QEvent *e) + bool event(QEvent *e) override { if (e->type() == QEvent::MaxUser) { QCoreApplication::sendPostedEvents(other, 0); @@ -424,7 +424,7 @@ signals: void progress(int); protected: - void run() + void run() override { emit progress(1); emit progress(2); @@ -492,7 +492,7 @@ public slots: } public: - bool event(QEvent *event) + bool event(QEvent *event) override { switch (event->type()) { case QEvent::User: @@ -545,7 +545,7 @@ class GlobalPostedEventsCountObject : public QObject public: QList<int> globalPostedEventsCount; - bool event(QEvent *event) + bool event(QEvent *event) override { if (event->type() == QEvent::User) globalPostedEventsCount.append(qGlobalPostedEventsCount()); @@ -591,7 +591,7 @@ public: : counter(0) { } - bool event(QEvent *event) + bool event(QEvent *event) override { if (event->type() == QEvent::User) ++counter; @@ -622,7 +622,7 @@ class QuitBlocker : public QObject Q_OBJECT public: - bool eventFilter(QObject *, QEvent *event) + bool eventFilter(QObject *, QEvent *event) override { if (event->type() == QEvent::Quit) { event->ignore(); @@ -728,21 +728,21 @@ void tst_QCoreApplication::eventLoopExecAfterExit() class DummyEventDispatcher : public QAbstractEventDispatcher { public: DummyEventDispatcher() : QAbstractEventDispatcher(), visited(false) {} - bool processEvents(QEventLoop::ProcessEventsFlags) { + bool processEvents(QEventLoop::ProcessEventsFlags) override { visited = true; emit awake(); QCoreApplication::sendPostedEvents(); return false; } - void registerSocketNotifier(QSocketNotifier *) {} - void unregisterSocketNotifier(QSocketNotifier *) {} - void registerTimer(int , int , Qt::TimerType, QObject *) {} - bool unregisterTimer(int ) { return false; } - bool unregisterTimers(QObject *) { return false; } - QList<TimerInfo> registeredTimers(QObject *) const { return QList<TimerInfo>(); } - int remainingTime(int) { return 0; } - void wakeUp() {} - void interrupt() {} + void registerSocketNotifier(QSocketNotifier *) override {} + void unregisterSocketNotifier(QSocketNotifier *) override {} + void registerTimer(int , int , Qt::TimerType, QObject *) override {} + bool unregisterTimer(int ) override { return false; } + bool unregisterTimers(QObject *) override { return false; } + QList<TimerInfo> registeredTimers(QObject *) const override { return QList<TimerInfo>(); } + int remainingTime(int) override { return 0; } + void wakeUp() override {} + void interrupt() override {} #ifdef Q_OS_WIN bool registerEventNotifier(QWinEventNotifier *) { return false; } diff --git a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp index 7aadd14466..fa5c78bceb 100644 --- a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp +++ b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp @@ -51,7 +51,7 @@ class tst_QEventDispatcher : public QObject bool doubleTimer = false; protected: - bool event(QEvent *e); + bool event(QEvent *e) override; public: inline tst_QEventDispatcher() @@ -314,7 +314,7 @@ public: inline ProcessEventsOnlySendsQueuedEvents() : eventsReceived(0) {} - bool event(QEvent *event) + bool event(QEvent *event) override { ++eventsReceived; diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp index 1f0b8d4b4e..3765b6fbf8 100644 --- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp @@ -77,7 +77,7 @@ signals: void checkPoint(); public: QEventLoop *eventLoop; - void run(); + void run() override; }; void EventLoopThread::run() @@ -101,7 +101,7 @@ public: volatile int result2; MultipleExecThread() : result1(0xdead), result2(0xbeef) {} - void run() + void run() override { QMutexLocker locker(&mutex); // this exec should work @@ -180,7 +180,7 @@ private slots: void testQuitLock(); protected: - void customEvent(QEvent *e); + void customEvent(QEvent *e) override; }; void tst_QEventLoop::processEvents() @@ -446,7 +446,7 @@ class SocketTestThread : public QThread Q_OBJECT public: SocketTestThread():QThread(0),testResult(false){}; - void run() + void run() override { SocketEventsTester *tester = new SocketEventsTester(); if (tester->init()) @@ -489,7 +489,7 @@ public: : QObject(), gotTimerEvent(-1) { } - void timerEvent(QTimerEvent *event) + void timerEvent(QTimerEvent *event) override { gotTimerEvent = event->timerId(); } @@ -546,7 +546,7 @@ namespace DeliverInDefinedOrder { } int lastReceived[NbEventQueue]; int count; - virtual void customEvent(QEvent* e) { + virtual void customEvent(QEvent* e) override { QVERIFY(e->type() >= QEvent::User); QVERIFY(e->type() < QEvent::User + 5); uint idx = e->type() - QEvent::User; diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp index a3dd5e05e1..333c7931d9 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp @@ -1342,9 +1342,9 @@ class TestObject : public QObject // Manually expanded from Q_OBJECT macro public: static QMetaObject staticMetaObject; - virtual const QMetaObject *metaObject() const; - virtual void *qt_metacast(const char *); - virtual int qt_metacall(QMetaObject::Call, int, void **); + virtual const QMetaObject *metaObject() const override; + virtual void *qt_metacast(const char *) override; + virtual int qt_metacall(QMetaObject::Call, int, void **) override; private: Q_DECL_HIDDEN static void qt_static_metacall(QObject *, QMetaObject::Call, int, void **); diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index 05fffd928a..ca215386fb 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -477,7 +477,7 @@ class MetaTypeTorturer: public QThread { Q_OBJECT protected: - void run() + void run() override { Bar space[1]; space[0].~Bar(); diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index 01a847596e..51df41f5ac 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp @@ -776,9 +776,9 @@ public: disconnectedSignals.clear(); } protected: - void connectNotify(const QMetaMethod &signal) + void connectNotify(const QMetaMethod &signal) override { connectedSignals.append(signal); } - void disconnectNotify(const QMetaMethod &signal) + void disconnectNotify(const QMetaMethod &signal) override { disconnectedSignals.append(signal); } }; @@ -1003,9 +1003,9 @@ public: disconnectedSignals.clear(); } protected: - void connectNotify(const QMetaMethod &signal) + void connectNotify(const QMetaMethod &signal) override { connectedSignals.append(signal); } - void disconnectNotify(const QMetaMethod &signal) + void disconnectNotify(const QMetaMethod &signal) override { disconnectedSignals.append(signal); } Q_SIGNALS: void signal1(); @@ -1606,7 +1606,7 @@ class TestThread : public QThread { Q_OBJECT public: - inline void run() + inline void run() override { *object = new QObject; *child = new QObject(*object); @@ -1689,7 +1689,7 @@ public: : QObject(parent), timerEventThread(0), customEventThread(0), slotThread(0) { } - void customEvent(QEvent *) + void customEvent(QEvent *) override { if (customEventThread) qFatal("%s: customEventThread should be null", Q_FUNC_INFO); @@ -1697,7 +1697,7 @@ public: emit theSignal(); } - void timerEvent(QTimerEvent *) + void timerEvent(QTimerEvent *) override { if (timerEventThread) qFatal("%s: timerEventThread should be null", Q_FUNC_INFO); @@ -1736,7 +1736,7 @@ public: // wait for thread to start (void) eventLoop.exec(); } - void run() + void run() override { (void) exec(); } }; @@ -2311,7 +2311,7 @@ class FooObject: public QObject, public Foo::Bar Q_OBJECT Q_INTERFACES(Foo::Bar) public: - int rtti() const { return 42; } + int rtti() const override { return 42; } }; class BlehObject : public QObject, public Foo::Bleh @@ -2319,7 +2319,7 @@ class BlehObject : public QObject, public Foo::Bleh Q_OBJECT Q_INTERFACES(Foo::Bleh) public: - int rtti() const { return 43; } + int rtti() const override { return 43; } }; void tst_QObject::declareInterface() @@ -2913,7 +2913,7 @@ class DynamicPropertyObject : public PropertyObject public: inline DynamicPropertyObject() {} - inline virtual bool event(QEvent *e) { + inline virtual bool event(QEvent *e) override { if (e->type() == QEvent::DynamicPropertyChange) { changedDynamicProperties.append(static_cast<QDynamicPropertyChangeEvent *>(e)->propertyName()); } @@ -3060,7 +3060,7 @@ public: events.clear(); } - bool eventFilter(QObject *object, QEvent *event) + bool eventFilter(QObject *object, QEvent *event) override { events.append(qMakePair(object, event->type())); return false; @@ -3198,7 +3198,7 @@ void tst_QObject::installEventFilter() class EmitThread : public QThread { Q_OBJECT public: - void run(void) { + void run(void) override { emit work(); } signals: @@ -4292,7 +4292,7 @@ public: ThreadAffinityThread(SenderObject *sender) : sender(sender) { } - void run() + void run() override { sender->emitSignal1(); } @@ -5655,7 +5655,7 @@ signals: class VirtualSlotsObject : public VirtualSlotsObjectBase { Q_OBJECT public slots: - virtual void slot1() { + virtual void slot1() override { derived_counter1++; } public: @@ -5704,8 +5704,8 @@ public: public slots: void regularSlot() { ++regular_call_count; } - virtual void slot1() { ++derived_counter2; } - virtual void slot2() { ++virtual_base_count; } + virtual void slot1() override { ++derived_counter2; } + virtual void slot2() override { ++virtual_base_count; } }; struct NormalBase @@ -6804,6 +6804,7 @@ public: explicit CountedExceptionThrower(bool throwException, QObject *parent = nullptr) : QObject(parent) { + Q_UNUSED(throwException); #ifndef QT_NO_EXCEPTIONS if (throwException) throw ObjectException(); diff --git a/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp index 914f9e2b9b..ba973910a7 100644 --- a/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp +++ b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp @@ -327,7 +327,8 @@ void tst_QPointer::castDuringDestruction() } class TestRunnable : public QObject, public QRunnable { - void run() { + void run() override + { QPointer<QObject> obj1 = new QObject; QPointer<QObject> obj2 = new QObject; obj1->moveToThread(thread()); // this is the owner thread diff --git a/tests/auto/corelib/kernel/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/corelib/kernel/qsharedmemory/tst_qsharedmemory.cpp index fa2d5e3723..31b9c9740a 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/tst_qsharedmemory.cpp +++ b/tests/auto/corelib/kernel/qsharedmemory/tst_qsharedmemory.cpp @@ -593,7 +593,7 @@ class Consumer : public QThread { public: - void run() + void run() override { QSharedMemory consumer(QLatin1String("market")); while (!consumer.attach()) { @@ -641,7 +641,7 @@ public: } } - void run() + void run() override { char *memory = (char*)producer.data(); 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; diff --git a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp index 1b159e8c9e..cc35b6cb59 100644 --- a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp +++ b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp @@ -37,7 +37,7 @@ class tst_QTranslator : public QObject public: tst_QTranslator(); protected: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; private slots: void initTestCase(); @@ -157,7 +157,7 @@ void tst_QTranslator::load() class TranslatorThread : public QThread { - void run() { + void run() override { QTranslator tor( 0 ); tor.load("hellotr_la"); @@ -316,7 +316,7 @@ struct TranslateThread : public QThread QMutex startupLock; QWaitCondition runningCondition; - void run() { + void run() override { bool startSignalled = false; while (terminate.loadRelaxed() == 0) { |