summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/sensors/grue/console_app/main.cpp2
-rw-r--r--examples/sensors/grue/import/main.cpp2
-rw-r--r--examples/sensors/grue/lib/gruesensor.h2
-rw-r--r--examples/sensors/grue/plugin/gruesensorimpl.h4
-rw-r--r--examples/sensors/grue/plugin/main.cpp6
-rw-r--r--examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h6
-rw-r--r--examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.h10
-rw-r--r--examples/sensors/sensor_explorer/import/main.cpp2
-rw-r--r--src/imports/sensors/qmlsensor.h4
-rw-r--r--src/imports/sensors/sensors.cpp2
-rw-r--r--src/plugins/sensors/android/src/androidpressure.h4
-rw-r--r--src/plugins/sensors/android/src/main.cpp4
-rw-r--r--src/plugins/sensors/dummy/main.cpp4
-rw-r--r--src/plugins/sensors/generic/main.cpp6
-rw-r--r--src/plugins/sensors/iio-sensor-proxy/main.cpp4
-rw-r--r--src/plugins/sensors/ios/main.mm4
-rw-r--r--src/plugins/sensors/linux/main.cpp4
-rw-r--r--src/plugins/sensors/sensorfw/main.cpp4
-rw-r--r--src/plugins/sensors/simulator/main.cpp4
-rw-r--r--src/plugins/sensors/winrt/main.cpp4
-rw-r--r--src/sensors/doc/snippets/sensorgestures/myplugin.h16
-rw-r--r--src/sensors/doc/snippets/sensors/mybackend.h4
-rw-r--r--src/sensors/doc/snippets/sensors/plugin.cpp4
-rw-r--r--src/sensors/gestures/qsensorgesture.h4
-rw-r--r--src/sensors/qaccelerometer.h2
-rw-r--r--src/sensors/qambientlightsensor.h2
-rw-r--r--src/sensors/qsensor.h2
-rw-r--r--tests/auto/qsensor/test_backends.cpp2
-rw-r--r--tests/auto/qsensor/test_backends.h6
-rw-r--r--tests/auto/qsensor/test_sensor.h2
-rw-r--r--tests/auto/qsensor/test_sensor2.h4
-rw-r--r--tests/auto/qsensor/test_sensor2impl.h4
-rw-r--r--tests/auto/qsensor/test_sensorimpl.h4
-rw-r--r--tests/auto/qsensor/test_sensorplugin.cpp6
-rw-r--r--tests/auto/qsensor/tst_qsensor.cpp6
-rw-r--r--tests/auto/qsensorgestures/plugins/test/qtest2recognizer.h10
-rw-r--r--tests/auto/qsensorgestures/plugins/test/qtestrecognizer.h10
-rw-r--r--tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h6
-rw-r--r--tests/auto/qsensorgestures/plugins/test1/qtest2recognizerdup.h10
-rw-r--r--tests/auto/qsensorgestures/plugins/test1/qtestrecognizerdup.h10
-rw-r--r--tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h6
-rw-r--r--tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp10
-rw-r--r--tests/auto/qsensorgestures_gestures/mockbackends.h4
-rw-r--r--tests/auto/qsensorgestures_gestures/mockcommon.h4
-rw-r--r--tests/auto/sensors2qmlapi/qtemplategestureplugin.h6
-rw-r--r--tests/auto/sensors2qmlapi/qtemplaterecognizer.h20
46 files changed, 123 insertions, 123 deletions
diff --git a/examples/sensors/grue/console_app/main.cpp b/examples/sensors/grue/console_app/main.cpp
index 6eb5d062..29a629b5 100644
--- a/examples/sensors/grue/console_app/main.cpp
+++ b/examples/sensors/grue/console_app/main.cpp
@@ -61,7 +61,7 @@ public:
{
}
- bool filter(QSensorReading *reading)
+ bool filter(QSensorReading *reading) override
{
int percent = reading->property("chanceOfBeingEaten").value<int>();
if (percent == 0) {
diff --git a/examples/sensors/grue/import/main.cpp b/examples/sensors/grue/import/main.cpp
index b4b6faae..4827af48 100644
--- a/examples/sensors/grue/import/main.cpp
+++ b/examples/sensors/grue/import/main.cpp
@@ -66,7 +66,7 @@ class GrueSensorQmlImport : public QQmlExtensionPlugin
Q_OBJECT
Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "import.json")
public:
- virtual void registerTypes(const char *uri)
+ void registerTypes(const char *uri) override
{
char const * const package = "Grue";
if (QLatin1String(uri) != QLatin1String(package)) return;
diff --git a/examples/sensors/grue/lib/gruesensor.h b/examples/sensors/grue/lib/gruesensor.h
index b65e5d89..90379939 100644
--- a/examples/sensors/grue/lib/gruesensor.h
+++ b/examples/sensors/grue/lib/gruesensor.h
@@ -78,7 +78,7 @@ class Q_GRUE_EXPORT GrueFilter : public QSensorFilter
public:
virtual bool filter(GrueSensorReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) { return filter(static_cast<GrueSensorReading*>(reading)); }
+ bool filter(QSensorReading *reading) override { return filter(static_cast<GrueSensorReading*>(reading)); }
};
class Q_GRUE_EXPORT GrueSensor : public QSensor
diff --git a/examples/sensors/grue/plugin/gruesensorimpl.h b/examples/sensors/grue/plugin/gruesensorimpl.h
index 15c23b5f..0847ed9c 100644
--- a/examples/sensors/grue/plugin/gruesensorimpl.h
+++ b/examples/sensors/grue/plugin/gruesensorimpl.h
@@ -68,8 +68,8 @@ public:
gruesensorimpl(QSensor *sensor);
- void start();
- void stop();
+ void start() override;
+ void stop() override;
private Q_SLOTS:
void lightChanged();
diff --git a/examples/sensors/grue/plugin/main.cpp b/examples/sensors/grue/plugin/main.cpp
index c8fdc1d1..4c5da15d 100644
--- a/examples/sensors/grue/plugin/main.cpp
+++ b/examples/sensors/grue/plugin/main.cpp
@@ -61,12 +61,12 @@ class GrueSensorPlugin : public QObject, public QSensorPluginInterface, public Q
Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json")
Q_INTERFACES(QSensorPluginInterface QSensorChangesInterface)
public:
- void registerSensors()
+ void registerSensors() override
{
qDebug() << "loaded the grue plugin";
}
- void sensorsChanged()
+ void sensorsChanged() override
{
if (!QSensor::defaultSensorForType(QAmbientLightSensor::type).isEmpty()) {
// There is a light sensor available. Register the backend
@@ -78,7 +78,7 @@ public:
}
}
- QSensorBackend *createBackend(QSensor *sensor)
+ QSensorBackend *createBackend(QSensor *sensor) override
{
if (sensor->identifier() == gruesensorimpl::id)
return new gruesensorimpl(sensor);
diff --git a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h b/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h
index e4198930..1b756328 100644
--- a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h
+++ b/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h
@@ -66,11 +66,11 @@ public:
explicit QCounterGesturePlugin();
~QCounterGesturePlugin();
- QList <QSensorGestureRecognizer *> createRecognizers();
+ QList<QSensorGestureRecognizer *> createRecognizers() override;
QStringList gestureSignals() const;
- QStringList supportedIds() const;
- QString name() const { return "CounterGestures"; }
+ QStringList supportedIds() const override;
+ QString name() const override { return "CounterGestures"; }
};
#endif // QCOUNTERGESTUREPLUGIN_H
diff --git a/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.h b/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.h
index abdf0332..4a0212ab 100644
--- a/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.h
+++ b/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.h
@@ -63,12 +63,12 @@ public:
QCounterGestureRecognizer(QObject *parent = 0);
~QCounterGestureRecognizer();
- 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();
diff --git a/examples/sensors/sensor_explorer/import/main.cpp b/examples/sensors/sensor_explorer/import/main.cpp
index 8acf56cc..b43ea339 100644
--- a/examples/sensors/sensor_explorer/import/main.cpp
+++ b/examples/sensors/sensor_explorer/import/main.cpp
@@ -60,7 +60,7 @@ class SensorExplorerDeclarativeModule : public QQmlExtensionPlugin
Q_OBJECT
Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "import.json")
public:
- virtual void registerTypes(const char *uri)
+ void registerTypes(const char *uri) override
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("Explorer"));
// @uri Explorer
diff --git a/src/imports/sensors/qmlsensor.h b/src/imports/sensors/qmlsensor.h
index f74aeeb8..e46278b2 100644
--- a/src/imports/sensors/qmlsensor.h
+++ b/src/imports/sensors/qmlsensor.h
@@ -167,10 +167,10 @@ private Q_SLOTS:
void updateReading();
protected Q_SLOTS:
- void componentComplete();
+ void componentComplete() override;
private:
- void classBegin();
+ void classBegin() override;
virtual void _update();
bool m_parsed;
bool m_active;
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
index 28f85d37..df81880b 100644
--- a/src/imports/sensors/sensors.cpp
+++ b/src/imports/sensors/sensors.cpp
@@ -98,7 +98,7 @@ class QtSensorsDeclarativeModule : public QQmlExtensionPlugin
Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "plugin.json")
public:
QtSensorsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
- virtual void registerTypes(const char *uri)
+ void registerTypes(const char *uri) override
{
char const * const package = "QtSensors";
if (QLatin1String(uri) != QLatin1String(package)) return;
diff --git a/src/plugins/sensors/android/src/androidpressure.h b/src/plugins/sensors/android/src/androidpressure.h
index eae1ae6d..dbb59c1b 100644
--- a/src/plugins/sensors/android/src/androidpressure.h
+++ b/src/plugins/sensors/android/src/androidpressure.h
@@ -49,8 +49,8 @@ class AndroidPressure : public AndroidCommonSensor<QPressureReading>
public:
AndroidPressure(AndroidSensors::AndroidSensorType type, QSensor *sensor);
private:
- virtual void onAccuracyChanged(jint accuracy);
- virtual void onSensorChanged(jlong timestamp, const jfloat *values, uint size);
+ void onAccuracyChanged(jint accuracy) override;
+ void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
};
#endif // ANDROIDPRESSURE_H
diff --git a/src/plugins/sensors/android/src/main.cpp b/src/plugins/sensors/android/src/main.cpp
index 18da9d0a..fc80a273 100644
--- a/src/plugins/sensors/android/src/main.cpp
+++ b/src/plugins/sensors/android/src/main.cpp
@@ -61,7 +61,7 @@ class AndroidSensorPlugin : public QObject, public QSensorPluginInterface, publi
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json")
Q_INTERFACES(QSensorPluginInterface)
public:
- void registerSensors()
+ void registerSensors() override
{
bool accelerometer = false;
bool magnetometer = false;
@@ -114,7 +114,7 @@ public:
QSensorManager::registerBackend(QCompass::type, AndroidCompass::id, this);
}
- QSensorBackend *createBackend(QSensor *sensor)
+ QSensorBackend *createBackend(QSensor *sensor) override
{
if (sensor->identifier() == AndroidCompass::id)
return new AndroidCompass(sensor);
diff --git a/src/plugins/sensors/dummy/main.cpp b/src/plugins/sensors/dummy/main.cpp
index 181f2543..13dd732e 100644
--- a/src/plugins/sensors/dummy/main.cpp
+++ b/src/plugins/sensors/dummy/main.cpp
@@ -51,13 +51,13 @@ class dummySensorPlugin : public QObject, public QSensorPluginInterface, public
Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json")
Q_INTERFACES(QSensorPluginInterface)
public:
- void registerSensors()
+ void registerSensors() override
{
QSensorManager::registerBackend(QAccelerometer::type, dummyaccelerometer::id, this);
QSensorManager::registerBackend(QAmbientLightSensor::type, dummylightsensor::id, this);
}
- QSensorBackend *createBackend(QSensor *sensor)
+ QSensorBackend *createBackend(QSensor *sensor) override
{
if (sensor->identifier() == dummyaccelerometer::id) {
return new dummyaccelerometer(sensor);
diff --git a/src/plugins/sensors/generic/main.cpp b/src/plugins/sensors/generic/main.cpp
index 9bed9011..44bfff09 100644
--- a/src/plugins/sensors/generic/main.cpp
+++ b/src/plugins/sensors/generic/main.cpp
@@ -61,12 +61,12 @@ class genericSensorPlugin : public QObject, public QSensorPluginInterface, publi
Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json")
Q_INTERFACES(QSensorPluginInterface QSensorChangesInterface)
public:
- void registerSensors()
+ void registerSensors() override
{
// Nothing to register here
}
- void sensorsChanged()
+ void sensorsChanged() override
{
if (!QSensor::defaultSensorForType(QAccelerometer::type).isEmpty()) {
// There is an accelerometer available. Register the backends
@@ -110,7 +110,7 @@ public:
}
}
- QSensorBackend *createBackend(QSensor *sensor)
+ QSensorBackend *createBackend(QSensor *sensor) override
{
#ifdef QTSENSORS_GENERICORIENTATIONSENSOR
if (sensor->identifier() == genericorientationsensor::id)
diff --git a/src/plugins/sensors/iio-sensor-proxy/main.cpp b/src/plugins/sensors/iio-sensor-proxy/main.cpp
index 5d38833f..136dd40e 100644
--- a/src/plugins/sensors/iio-sensor-proxy/main.cpp
+++ b/src/plugins/sensors/iio-sensor-proxy/main.cpp
@@ -55,7 +55,7 @@ class IIOSensorProxySensorPlugin : public QObject, public QSensorPluginInterface
Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json")
Q_INTERFACES(QSensorPluginInterface)
public:
- void registerSensors()
+ void registerSensors() override
{
if (!QSensorManager::isBackendRegistered(QOrientationSensor::type, IIOSensorProxyOrientationSensor::id))
QSensorManager::registerBackend(QOrientationSensor::type, IIOSensorProxyOrientationSensor::id, this);
@@ -65,7 +65,7 @@ public:
QSensorManager::registerBackend(QCompass::type, IIOSensorProxyCompass::id, this);
}
- QSensorBackend *createBackend(QSensor *sensor)
+ QSensorBackend *createBackend(QSensor *sensor) override
{
if (sensor->identifier() == IIOSensorProxyOrientationSensor::id)
return new IIOSensorProxyOrientationSensor(sensor);
diff --git a/src/plugins/sensors/ios/main.mm b/src/plugins/sensors/ios/main.mm
index a4766c37..d6b98192 100644
--- a/src/plugins/sensors/ios/main.mm
+++ b/src/plugins/sensors/ios/main.mm
@@ -59,7 +59,7 @@ class IOSSensorPlugin : public QObject, public QSensorPluginInterface, public QS
Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json")
Q_INTERFACES(QSensorPluginInterface)
public:
- void registerSensors()
+ void registerSensors() override
{
#ifdef HAVE_COREMOTION
QSensorManager::registerBackend(QAccelerometer::type, IOSAccelerometer::id, this);
@@ -78,7 +78,7 @@ public:
#endif
}
- QSensorBackend *createBackend(QSensor *sensor)
+ QSensorBackend *createBackend(QSensor *sensor) override
{
#ifdef HAVE_COREMOTION
if (sensor->identifier() == IOSAccelerometer::id)
diff --git a/src/plugins/sensors/linux/main.cpp b/src/plugins/sensors/linux/main.cpp
index 3f68cd11..a82ab821 100644
--- a/src/plugins/sensors/linux/main.cpp
+++ b/src/plugins/sensors/linux/main.cpp
@@ -52,14 +52,14 @@ class LinuxSensorPlugin : public QObject, public QSensorPluginInterface, public
Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json")
Q_INTERFACES(QSensorPluginInterface)
public:
- void registerSensors()
+ void registerSensors() override
{
QString path = QString::fromLatin1(qgetenv("QT_ACCEL_FILEPATH"));
if (!path.isEmpty() && !QSensorManager::isBackendRegistered(QAccelerometer::type, LinuxSysAccelerometer::id))
QSensorManager::registerBackend(QAccelerometer::type, LinuxSysAccelerometer::id, this);
}
- QSensorBackend *createBackend(QSensor *sensor)
+ QSensorBackend *createBackend(QSensor *sensor) override
{
if (sensor->identifier() == LinuxSysAccelerometer::id)
return new LinuxSysAccelerometer(sensor);
diff --git a/src/plugins/sensors/sensorfw/main.cpp b/src/plugins/sensors/sensorfw/main.cpp
index bc1246ab..c1a02a57 100644
--- a/src/plugins/sensors/sensorfw/main.cpp
+++ b/src/plugins/sensors/sensorfw/main.cpp
@@ -64,7 +64,7 @@ class sensorfwSensorPlugin : public QObject, public QSensorPluginInterface, publ
public:
- void registerSensors()
+ void registerSensors() override
{
// if no default - no support either, uses Sensors.conf
QSettings settings(QSettings::SystemScope, QLatin1String("QtProject"), QLatin1String("Sensors"));
@@ -78,7 +78,7 @@ public:
}
- QSensorBackend *createBackend(QSensor *sensor)
+ QSensorBackend *createBackend(QSensor *sensor) override
{
if (sensor->identifier() == sensorfwaccelerometer::id)
return new sensorfwaccelerometer(sensor);
diff --git a/src/plugins/sensors/simulator/main.cpp b/src/plugins/sensors/simulator/main.cpp
index a1b00256..167711a9 100644
--- a/src/plugins/sensors/simulator/main.cpp
+++ b/src/plugins/sensors/simulator/main.cpp
@@ -61,7 +61,7 @@ public:
connect(connection, SIGNAL(setAvailableFeatures(quint32)), this, SLOT(setAvailableFeatures(quint32)));
}
- void registerSensors()
+ void registerSensors() override
{
QSensorManager::registerBackend(QAccelerometer::type, SimulatorAccelerometer::id, this);
QSensorManager::registerBackend(QAmbientLightSensor::type, SimulatorAmbientLightSensor::id, this);
@@ -72,7 +72,7 @@ public:
QSensorManager::registerBackend(QMagnetometer::type, SimulatorMagnetometer::id, this);
}
- QSensorBackend *createBackend(QSensor *sensor)
+ QSensorBackend *createBackend(QSensor *sensor) override
{
if (sensor->identifier() == SimulatorAccelerometer::id) {
return new SimulatorAccelerometer(sensor);
diff --git a/src/plugins/sensors/winrt/main.cpp b/src/plugins/sensors/winrt/main.cpp
index 565d8fec..ecf2a41b 100644
--- a/src/plugins/sensors/winrt/main.cpp
+++ b/src/plugins/sensors/winrt/main.cpp
@@ -59,7 +59,7 @@ class WinRtSensorPlugin : public QObject, public QSensorPluginInterface, public
Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json")
Q_INTERFACES(QSensorPluginInterface)
public:
- void registerSensors()
+ void registerSensors() override
{
QSensorManager::registerBackend(QAccelerometer::type, QByteArrayLiteral("WinRtAccelerometer"), this);
QSensorManager::registerBackend(QCompass::type, QByteArrayLiteral("WinRtCompass"), this);
@@ -69,7 +69,7 @@ public:
QSensorManager::registerBackend(QOrientationSensor::type, QByteArrayLiteral("WinRtOrientationSensor"), this);
}
- QSensorBackend *createBackend(QSensor *sensor)
+ QSensorBackend *createBackend(QSensor *sensor) override
{
if (sensor->identifier() == QByteArrayLiteral("WinRtAccelerometer"))
return new WinRtAccelerometer(sensor);
diff --git a/src/sensors/doc/snippets/sensorgestures/myplugin.h b/src/sensors/doc/snippets/sensorgestures/myplugin.h
index c03966d0..0cf1a92b 100644
--- a/src/sensors/doc/snippets/sensorgestures/myplugin.h
+++ b/src/sensors/doc/snippets/sensorgestures/myplugin.h
@@ -52,12 +52,12 @@ class MySensorGestureRecognizer : public QSensorGestureRecognizer
MySensorGestureRecognizer(QObject *parent = 0);
~MySensorGestureRecognizer();
- 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;
Q_SIGNALS:
// all signals will get exported to QSensorGesture
@@ -74,9 +74,9 @@ public:
explicit MySensorGesturePlugin();
~MySensorGesturePlugin();
- QList <QSensorGestureRecognizer *> createRecognizers();
- QStringList supportedIds() const;
- QString name() const { return "MyGestures"; }
+ QList<QSensorGestureRecognizer *> createRecognizers() override;
+ QStringList supportedIds() const override;
+ QString name() const override { return "MyGestures"; }
};
#endif
diff --git a/src/sensors/doc/snippets/sensors/mybackend.h b/src/sensors/doc/snippets/sensors/mybackend.h
index 2c026dcd..59c54069 100644
--- a/src/sensors/doc/snippets/sensors/mybackend.h
+++ b/src/sensors/doc/snippets/sensors/mybackend.h
@@ -47,8 +47,8 @@ class MyBackend : public QSensorBackend
{
public:
MyBackend(QSensor *sensor) : QSensorBackend(sensor) {}
- void stop() {}
- void start() {}
+ void stop() override {}
+ void start() override {}
void poll() {}
static const char *id;
diff --git a/src/sensors/doc/snippets/sensors/plugin.cpp b/src/sensors/doc/snippets/sensors/plugin.cpp
index d1c30534..1eef5966 100644
--- a/src/sensors/doc/snippets/sensors/plugin.cpp
+++ b/src/sensors/doc/snippets/sensors/plugin.cpp
@@ -50,12 +50,12 @@ class MyPluginClass : public QObject, public QSensorPluginInterface, public QSen
//Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json")
Q_INTERFACES(QSensorPluginInterface)
public:
- void registerSensors()
+ void registerSensors() override
{
QSensorManager::registerBackend(QAccelerometer::type, MyBackend::id, this);
}
- QSensorBackend *createBackend(QSensor *sensor)
+ QSensorBackend *createBackend(QSensor *sensor) override
{
if (sensor->identifier() == MyBackend::id)
return new MyBackend(sensor);
diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h
index 880be69b..dd95b3bd 100644
--- a/src/sensors/gestures/qsensorgesture.h
+++ b/src/sensors/gestures/qsensorgesture.h
@@ -76,8 +76,8 @@ private:
private:
// Pretend to be a Q_OBJECT
- const QMetaObject *metaObject() const;
- int qt_metacall(QMetaObject::Call, int, void **);
+ const QMetaObject *metaObject() const override;
+ int qt_metacall(QMetaObject::Call, int, void **) override;
#ifdef Q_QDOC
Q_SIGNALS:
diff --git a/src/sensors/qaccelerometer.h b/src/sensors/qaccelerometer.h
index 1911e5fb..a44971f2 100644
--- a/src/sensors/qaccelerometer.h
+++ b/src/sensors/qaccelerometer.h
@@ -69,7 +69,7 @@ class Q_SENSORS_EXPORT QAccelerometerFilter : public QSensorFilter
public:
virtual bool filter(QAccelerometerReading *reading) = 0;
private:
- bool filter(QSensorReading *reading);
+ bool filter(QSensorReading *reading) override;
};
class QAccelerometerPrivate;
diff --git a/src/sensors/qambientlightsensor.h b/src/sensors/qambientlightsensor.h
index f9f7d1b1..9d1acec9 100644
--- a/src/sensors/qambientlightsensor.h
+++ b/src/sensors/qambientlightsensor.h
@@ -71,7 +71,7 @@ class Q_SENSORS_EXPORT QAmbientLightFilter : public QSensorFilter
public:
virtual bool filter(QAmbientLightReading *reading) = 0;
private:
- bool filter(QSensorReading *reading);
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT QAmbientLightSensor : public QSensor
diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h
index cf8de767..7dd7ea19 100644
--- a/src/sensors/qsensor.h
+++ b/src/sensors/qsensor.h
@@ -263,7 +263,7 @@ private:
public:\
classname(QObject *parent = Q_NULLPTR);\
virtual ~classname();\
- void copyValuesFrom(QSensorReading *other);\
+ void copyValuesFrom(QSensorReading *other) override;\
private:\
QScopedPointer<pclassname> d;
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();