diff options
Diffstat (limited to 'tests')
19 files changed, 65 insertions, 65 deletions
diff --git a/tests/auto/qsensor/test_backends.cpp b/tests/auto/qsensor/test_backends.cpp index 26d4779d..4dde98fe 100644 --- a/tests/auto/qsensor/test_backends.cpp +++ b/tests/auto/qsensor/test_backends.cpp @@ -54,7 +54,7 @@ static bool registerTestBackend(const char *className, CreateFunc func) class BackendFactory : public QSensorBackendFactory { - QSensorBackend *createBackend(QSensor *sensor) + QSensorBackend *createBackend(QSensor *sensor) override { foreach (const Record &record, records) { if (sensor->identifier() == record.type) { diff --git a/tests/auto/qsensor/test_backends.h b/tests/auto/qsensor/test_backends.h index c4fa43c6..aba0b2f2 100644 --- a/tests/auto/qsensor/test_backends.h +++ b/tests/auto/qsensor/test_backends.h @@ -56,10 +56,10 @@ void unregister_test_backends(); {\ public:\ SensorClass ## _impl(QSensor *sensor);\ - void start();\ - void stop();\ + void start() override;\ + void stop() override;\ };\ - class SensorClass ## _testfilter : public FilterClass { bool filter(ReadingClass *); }; + class SensorClass ## _testfilter : public FilterClass { bool filter(ReadingClass *) override; }; #define PREPARE_SENSORINTERFACE_IMPLS(SensorClass, ReadingClass, FilterClass, readingcode)\ SensorClass ## _impl::SensorClass ##_impl(QSensor *sensor) : QSensorBackend(sensor) {}\ diff --git a/tests/auto/qsensor/test_sensor.h b/tests/auto/qsensor/test_sensor.h index 23224fd8..1adb06a6 100644 --- a/tests/auto/qsensor/test_sensor.h +++ b/tests/auto/qsensor/test_sensor.h @@ -48,7 +48,7 @@ class TestSensorFilter : public QSensorFilter public: virtual bool filter(TestSensorReading *reading) = 0; private: - bool filter(QSensorReading *reading) { return filter(static_cast<TestSensorReading*>(reading)); } + bool filter(QSensorReading *reading) override { return filter(static_cast<TestSensorReading*>(reading)); } }; class TestSensor : public QSensor diff --git a/tests/auto/qsensor/test_sensor2.h b/tests/auto/qsensor/test_sensor2.h index 6ccbde2c..69050f7c 100644 --- a/tests/auto/qsensor/test_sensor2.h +++ b/tests/auto/qsensor/test_sensor2.h @@ -59,7 +59,7 @@ private: public:\ classname(QObject *parent = 0);\ virtual ~classname();\ - void copyValuesFrom(QSensorReading *other);\ + void copyValuesFrom(QSensorReading *other) override;\ private:\ qTypedWrapper<pclassname> d; @@ -80,7 +80,7 @@ class TestSensor2Filter : public QSensorFilter public: virtual bool filter(TestSensor2Reading *reading) = 0; private: - bool filter(QSensorReading *reading) { return filter(static_cast<TestSensor2Reading*>(reading)); } + bool filter(QSensorReading *reading) override { return filter(static_cast<TestSensor2Reading*>(reading)); } }; class TestSensor2 : public QSensor diff --git a/tests/auto/qsensor/test_sensor2impl.h b/tests/auto/qsensor/test_sensor2impl.h index b51e9cdd..30e03f9e 100644 --- a/tests/auto/qsensor/test_sensor2impl.h +++ b/tests/auto/qsensor/test_sensor2impl.h @@ -39,8 +39,8 @@ public: testsensor2impl(QSensor *sensor); - void start(); - void stop(); + void start() override; + void stop() override; private: TestSensor2Reading m_reading; diff --git a/tests/auto/qsensor/test_sensorimpl.h b/tests/auto/qsensor/test_sensorimpl.h index 95877310..42b2e09a 100644 --- a/tests/auto/qsensor/test_sensorimpl.h +++ b/tests/auto/qsensor/test_sensorimpl.h @@ -41,8 +41,8 @@ public: testsensorimpl(QSensor *sensor); ~testsensorimpl(); - void start(); - void stop(); + void start() override; + void stop() override; bool isFeatureSupported(QSensor::Feature feature) const override; signals: diff --git a/tests/auto/qsensor/test_sensorplugin.cpp b/tests/auto/qsensor/test_sensorplugin.cpp index fe119619..a48428b3 100644 --- a/tests/auto/qsensor/test_sensorplugin.cpp +++ b/tests/auto/qsensor/test_sensorplugin.cpp @@ -44,7 +44,7 @@ class TestSensorPlugin : public QObject, Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0") Q_INTERFACES(QSensorPluginInterface QSensorChangesInterface) public: - void registerSensors() + void registerSensors() override { static bool recursive = false; QVERIFY2(!recursive, "Recursively called TestSensorPlugin::registerSensors!"); @@ -62,7 +62,7 @@ public: QSensorManager::registerBackend(TestSensor2::type, testsensor2impl::id, this); } - void sensorsChanged() + void sensorsChanged() override { // Register a new type on initial load // This is testing the "don't emit availableSensorsChanged() too many times" functionality. @@ -80,7 +80,7 @@ public: } } - QSensorBackend *createBackend(QSensor *sensor) + QSensorBackend *createBackend(QSensor *sensor) override { if (sensor->identifier() == testsensorimpl::id) { return new testsensorimpl(sensor); diff --git a/tests/auto/qsensor/tst_qsensor.cpp b/tests/auto/qsensor/tst_qsensor.cpp index 3af58a0c..911e9c2c 100644 --- a/tests/auto/qsensor/tst_qsensor.cpp +++ b/tests/auto/qsensor/tst_qsensor.cpp @@ -75,11 +75,11 @@ namespace QTest { } -class MyFilter : public TestSensorFilter { bool filter(TestSensorReading *) { return false; } }; +class MyFilter : public TestSensorFilter { bool filter(TestSensorReading *) override { return false; } }; class ModFilter : public TestSensorFilter { - bool filter(TestSensorReading *reading) + bool filter(TestSensorReading *reading) override { reading->setTest(3); return true; @@ -88,7 +88,7 @@ class ModFilter : public TestSensorFilter class MyFactory : public QSensorBackendFactory { - QSensorBackend *createBackend(QSensor * /*sensor*/) + QSensorBackend *createBackend(QSensor * /*sensor*/) override { return 0; } diff --git a/tests/auto/qsensorgestures/plugins/test/qtest2recognizer.h b/tests/auto/qsensorgestures/plugins/test/qtest2recognizer.h index 7077561e..ad9a1584 100644 --- a/tests/auto/qsensorgestures/plugins/test/qtest2recognizer.h +++ b/tests/auto/qsensorgestures/plugins/test/qtest2recognizer.h @@ -39,12 +39,12 @@ public: QTest2Recognizer(QObject *parent = 0); ~QTest2Recognizer(); - void create(); + void create() override; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const override; + bool start() override; + bool stop() override; + bool isActive() override; int thresholdTime() const; void setThresholdTime(int msec); diff --git a/tests/auto/qsensorgestures/plugins/test/qtestrecognizer.h b/tests/auto/qsensorgestures/plugins/test/qtestrecognizer.h index fd230b4f..3afe7806 100644 --- a/tests/auto/qsensorgestures/plugins/test/qtestrecognizer.h +++ b/tests/auto/qsensorgestures/plugins/test/qtestrecognizer.h @@ -41,12 +41,12 @@ public: QTestRecognizer(QObject *parent = 0); ~QTestRecognizer(); - void create(); + void create() override; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const override; + bool start() override; + bool stop() override; + bool isActive() override; int thresholdTime() const; void setThresholdTime(int msec); diff --git a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h index 7730edcd..0a62cb3b 100644 --- a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h +++ b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h @@ -53,11 +53,11 @@ public: explicit QTestSensorGesturePlugin(); ~QTestSensorGesturePlugin(); - QList <QSensorGestureRecognizer *> createRecognizers(); + QList<QSensorGestureRecognizer *> createRecognizers() override; // QStringList gestureSignals() const; - QStringList supportedIds() const; - QString name() const; + QStringList supportedIds() const override; + QString name() const override; QList<QSensorGestureRecognizer*> recognizers() const; diff --git a/tests/auto/qsensorgestures/plugins/test1/qtest2recognizerdup.h b/tests/auto/qsensorgestures/plugins/test1/qtest2recognizerdup.h index e3c9eda5..7ce2a765 100644 --- a/tests/auto/qsensorgestures/plugins/test1/qtest2recognizerdup.h +++ b/tests/auto/qsensorgestures/plugins/test1/qtest2recognizerdup.h @@ -39,12 +39,12 @@ public: QTest2RecognizerDup(QObject *parent = 0); ~QTest2RecognizerDup(); - void create(); + void create() override; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const override; + bool start() override; + bool stop() override; + bool isActive() override; int thresholdTime() const; void setThresholdTime(int msec); diff --git a/tests/auto/qsensorgestures/plugins/test1/qtestrecognizerdup.h b/tests/auto/qsensorgestures/plugins/test1/qtestrecognizerdup.h index aa061701..6b66a6ba 100644 --- a/tests/auto/qsensorgestures/plugins/test1/qtestrecognizerdup.h +++ b/tests/auto/qsensorgestures/plugins/test1/qtestrecognizerdup.h @@ -41,12 +41,12 @@ public: QTestRecognizerDup(QObject *parent = 0); ~QTestRecognizerDup(); - void create(); + void create() override; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const override; + bool start() override; + bool stop() override; + bool isActive() override; int thresholdTime() const; void setThresholdTime(int msec); diff --git a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h b/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h index 179167dc..1a577cb3 100644 --- a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h +++ b/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h @@ -43,11 +43,11 @@ public: ~QTestSensorGestureDupPlugin(); - QList <QSensorGestureRecognizer *> createRecognizers(); + QList<QSensorGestureRecognizer *> createRecognizers() override; QStringList gestureSignals() const; - QStringList supportedIds() const; - QString name() const; + QStringList supportedIds() const override; + QString name() const override; QList<QSensorGestureRecognizer*> recognizers() const; diff --git a/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp b/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp index 8323e0f4..99884ccb 100644 --- a/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp +++ b/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp @@ -77,12 +77,12 @@ public: QTest3Recognizer(QObject *parent = 0); - void create(); + void create() override; - QString id() const; - bool start() ; - bool stop(); - bool isActive(); + QString id() const override; + bool start() override; + bool stop() override; + bool isActive() override; void changeId(const QString &); QString recognizerId; diff --git a/tests/auto/qsensorgestures_gestures/mockbackends.h b/tests/auto/qsensorgestures_gestures/mockbackends.h index 28af79ea..474a7ef7 100644 --- a/tests/auto/qsensorgestures_gestures/mockbackends.h +++ b/tests/auto/qsensorgestures_gestures/mockbackends.h @@ -55,7 +55,7 @@ class mockSensorPlugin : public QObject, public: QString m_filename; - void registerSensors() + void registerSensors() override { qDebug() << "loaded the mock plugin"; @@ -76,7 +76,7 @@ public: } - QSensorBackend *createBackend(QSensor *sensor) + QSensorBackend *createBackend(QSensor *sensor) override { if (sensor->identifier() == mockaccelerometer::id) { return new mockaccelerometer(sensor); diff --git a/tests/auto/qsensorgestures_gestures/mockcommon.h b/tests/auto/qsensorgestures_gestures/mockcommon.h index c3007337..cbb36f25 100644 --- a/tests/auto/qsensorgestures_gestures/mockcommon.h +++ b/tests/auto/qsensorgestures_gestures/mockcommon.h @@ -78,8 +78,8 @@ class mockcommon : public QSensorBackend public: mockcommon(QSensor *sensor); - void start(); - void stop(); + void start() override; + void stop() override; static char const * const id; Q_SIGNALS: diff --git a/tests/auto/sensors2qmlapi/qtemplategestureplugin.h b/tests/auto/sensors2qmlapi/qtemplategestureplugin.h index 62ee60a6..94f6aaea 100644 --- a/tests/auto/sensors2qmlapi/qtemplategestureplugin.h +++ b/tests/auto/sensors2qmlapi/qtemplategestureplugin.h @@ -43,11 +43,11 @@ public: explicit QTemplateGesturePlugin(); ~QTemplateGesturePlugin(); - QList <QSensorGestureRecognizer *> createRecognizers(); + QList<QSensorGestureRecognizer *> createRecognizers() override; QStringList gestureSignals() const; - QStringList supportedIds() const; - QString name() const { return "TemplateGestures"; } + QStringList supportedIds() const override; + QString name() const override { return "TemplateGestures"; } }; #endif // QTEMPLATEGESTUREPLUGIN_H diff --git a/tests/auto/sensors2qmlapi/qtemplaterecognizer.h b/tests/auto/sensors2qmlapi/qtemplaterecognizer.h index 17f84b0a..10e5bc33 100644 --- a/tests/auto/sensors2qmlapi/qtemplaterecognizer.h +++ b/tests/auto/sensors2qmlapi/qtemplaterecognizer.h @@ -41,12 +41,12 @@ public: QTemplateGestureRecognizer(QObject *parent = 0); ~QTemplateGestureRecognizer(); - void create(); + void create() override; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const override; + bool start() override; + bool stop() override; + bool isActive() override; private slots: void timeout(); @@ -63,12 +63,12 @@ public: QTemplateGestureRecognizer1(QObject *parent = 0); ~QTemplateGestureRecognizer1(); - void create(); + void create() override; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const override; + bool start() override; + bool stop() override; + bool isActive() override; private slots: void timeout(); |