diff options
Diffstat (limited to 'tests/auto/qsensor')
-rw-r--r-- | tests/auto/qsensor/test_backends.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qsensor/test_backends.h | 6 | ||||
-rw-r--r-- | tests/auto/qsensor/test_sensor.h | 2 | ||||
-rw-r--r-- | tests/auto/qsensor/test_sensor2.h | 4 | ||||
-rw-r--r-- | tests/auto/qsensor/test_sensor2impl.h | 4 | ||||
-rw-r--r-- | tests/auto/qsensor/test_sensorimpl.h | 4 | ||||
-rw-r--r-- | tests/auto/qsensor/test_sensorplugin.cpp | 6 | ||||
-rw-r--r-- | tests/auto/qsensor/tst_qsensor.cpp | 6 |
8 files changed, 17 insertions, 17 deletions
diff --git a/tests/auto/qsensor/test_backends.cpp b/tests/auto/qsensor/test_backends.cpp index 26d4779..4dde98f 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 c4fa43c..aba0b2f 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 23224fd..1adb06a 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 6ccbde2..69050f7 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 b51e9cd..30e03f9 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 9587731..42b2e09 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 fe11961..a48428b 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 3af58a0..911e9c2 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; } |