summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2016-12-02 02:09:24 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2016-12-02 08:46:51 +0000
commit2c595c382c50a5632b14eda00d85a9b7fcb09b5d (patch)
treef8e070d11537c794ee99a977a7de91c460d5ebc7
parent07bf3002fecd493a47bfb97420d3c3fbe6ee1458 (diff)
downloadqtsensors-2c595c382c50a5632b14eda00d85a9b7fcb09b5d.tar.gz
Replace Q_DECL_OVERRIDE by override
'override' keyword can be used directly since Qt 5.7. Change-Id: Ibf0fc590f7e247a310a833a22ece700ec75199bb Reviewed-by: Lorn Potter <lorn.potter@canonical.com>
-rw-r--r--src/imports/sensors/qmlaccelerometer.h8
-rw-r--r--src/imports/sensors/qmlaltimeter.h8
-rw-r--r--src/imports/sensors/qmlambientlightsensor.h8
-rw-r--r--src/imports/sensors/qmlambienttemperaturesensor.h8
-rw-r--r--src/imports/sensors/qmlcompass.h8
-rw-r--r--src/imports/sensors/qmldistancesensor.h8
-rw-r--r--src/imports/sensors/qmlgyroscope.h8
-rw-r--r--src/imports/sensors/qmlholstersensor.h8
-rw-r--r--src/imports/sensors/qmlirproximitysensor.h8
-rw-r--r--src/imports/sensors/qmllightsensor.h8
-rw-r--r--src/imports/sensors/qmlmagnetometer.h8
-rw-r--r--src/imports/sensors/qmlorientationsensor.h8
-rw-r--r--src/imports/sensors/qmlpressuresensor.h8
-rw-r--r--src/imports/sensors/qmlproximitysensor.h8
-rw-r--r--src/imports/sensors/qmlrotationsensor.h10
-rw-r--r--src/imports/sensors/qmlsensorgesture.h4
-rw-r--r--src/imports/sensors/qmltapsensor.h8
-rw-r--r--src/imports/sensors/qmltiltsensor.h8
-rw-r--r--src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qshake2recognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h6
-rw-r--r--src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/shake/qshakerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h6
-rw-r--r--src/plugins/sensors/android/src/androidaccelerometer.h4
-rw-r--r--src/plugins/sensors/android/src/androidcommonsensor.h4
-rw-r--r--src/plugins/sensors/android/src/androidcompass.cpp8
-rw-r--r--src/plugins/sensors/android/src/androidcompass.h4
-rw-r--r--src/plugins/sensors/android/src/androidgyroscope.h4
-rw-r--r--src/plugins/sensors/android/src/androidlight.h4
-rw-r--r--src/plugins/sensors/android/src/androidmagnetometer.h4
-rw-r--r--src/plugins/sensors/android/src/androidproximity.h4
-rw-r--r--src/plugins/sensors/android/src/androidrotation.h4
-rw-r--r--src/plugins/sensors/android/src/androidtemperature.h4
-rw-r--r--src/plugins/sensors/dummy/dummyaccelerometer.h2
-rw-r--r--src/plugins/sensors/dummy/dummycommon.h6
-rw-r--r--src/plugins/sensors/dummy/dummylightsensor.h2
-rw-r--r--src/plugins/sensors/generic/genericalssensor.h6
-rw-r--r--src/plugins/sensors/generic/genericorientationsensor.h6
-rw-r--r--src/plugins/sensors/generic/genericrotationsensor.h6
-rw-r--r--src/plugins/sensors/generic/generictiltsensor.h8
-rw-r--r--src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h6
-rw-r--r--src/plugins/sensors/iio-sensor-proxy/iiosensorproxylightsensor.h6
-rw-r--r--src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h6
-rw-r--r--src/plugins/sensors/ios/iosaccelerometer.h6
-rw-r--r--src/plugins/sensors/ios/ioscompass.h4
-rw-r--r--src/plugins/sensors/ios/iosgyroscope.h6
-rw-r--r--src/plugins/sensors/ios/iosmagnetometer.h6
-rw-r--r--src/plugins/sensors/ios/iosproximitysensor.h4
-rw-r--r--src/plugins/sensors/linux/linuxsysaccelerometer.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwaccelerometer.h8
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwals.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwcompass.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwgyroscope.h8
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwlightsensor.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwmagnetometer.h8
-rw-r--r--src/plugins/sensors/sensorfw/sensorfworientationsensor.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwproximitysensor.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwrotationsensor.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwsensorbase.h4
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwtapsensor.h6
-rw-r--r--src/plugins/sensors/simulator/simulatoraccelerometer.h2
-rw-r--r--src/plugins/sensors/simulator/simulatorambientlightsensor.h2
-rw-r--r--src/plugins/sensors/simulator/simulatorcommon.h6
-rw-r--r--src/plugins/sensors/simulator/simulatorcompass.h2
-rw-r--r--src/plugins/sensors/simulator/simulatorirproximitysensor.h2
-rw-r--r--src/plugins/sensors/simulator/simulatorlightsensor.h2
-rw-r--r--src/plugins/sensors/simulator/simulatormagnetometer.h2
-rw-r--r--src/plugins/sensors/simulator/simulatorproximitysensor.h2
-rw-r--r--src/plugins/sensors/winrt/winrtaccelerometer.h4
-rw-r--r--src/plugins/sensors/winrt/winrtambientlightsensor.h4
-rw-r--r--src/plugins/sensors/winrt/winrtcompass.h4
-rw-r--r--src/plugins/sensors/winrt/winrtgyroscope.h6
-rw-r--r--src/plugins/sensors/winrt/winrtorientationsensor.h4
-rw-r--r--src/plugins/sensors/winrt/winrtrotationsensor.h6
-rwxr-xr-xsrc/sensors/make_sensor.pl10
-rw-r--r--src/sensors/qaltimeter.h2
-rw-r--r--src/sensors/qambienttemperaturesensor.h2
-rw-r--r--src/sensors/qcompass.h2
-rw-r--r--src/sensors/qdistancesensor.h2
-rw-r--r--src/sensors/qgyroscope.h2
-rw-r--r--src/sensors/qholstersensor.h2
-rw-r--r--src/sensors/qirproximitysensor.h2
-rw-r--r--src/sensors/qlightsensor.h2
-rw-r--r--src/sensors/qmagnetometer.h2
-rw-r--r--src/sensors/qorientationsensor.h2
-rw-r--r--src/sensors/qpressuresensor.h2
-rw-r--r--src/sensors/qproximitysensor.h2
-rw-r--r--src/sensors/qrotationsensor.h2
-rw-r--r--src/sensors/qtapsensor.h2
-rw-r--r--src/sensors/qtiltsensor.h2
-rw-r--r--tests/auto/qsensor/test_sensorimpl.h2
100 files changed, 280 insertions, 280 deletions
diff --git a/src/imports/sensors/qmlaccelerometer.h b/src/imports/sensors/qmlaccelerometer.h
index 4c759a8..e04b971 100644
--- a/src/imports/sensors/qmlaccelerometer.h
+++ b/src/imports/sensors/qmlaccelerometer.h
@@ -70,9 +70,9 @@ signals:
Q_REVISION(1) void accelerationModeChanged(AccelerationMode accelerationMode);
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
QAccelerometer *m_sensor;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QmlSensorReading *createReading() const override;
};
class QmlAccelerometerReading : public QmlSensorReading
@@ -95,8 +95,8 @@ Q_SIGNALS:
void zChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QAccelerometer *m_sensor;
qreal m_x;
qreal m_y;
diff --git a/src/imports/sensors/qmlaltimeter.h b/src/imports/sensors/qmlaltimeter.h
index e16f65a..04938b5 100644
--- a/src/imports/sensors/qmlaltimeter.h
+++ b/src/imports/sensors/qmlaltimeter.h
@@ -53,8 +53,8 @@ public:
~QmlAltimeter();
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
+ QmlSensorReading *createReading() const override;
QAltimeter *m_sensor;
};
@@ -73,8 +73,8 @@ Q_SIGNALS:
void altitudeChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QAltimeter *m_sensor;
qreal m_altitude;
diff --git a/src/imports/sensors/qmlambientlightsensor.h b/src/imports/sensors/qmlambientlightsensor.h
index 5fc1a4e..4de42f3 100644
--- a/src/imports/sensors/qmlambientlightsensor.h
+++ b/src/imports/sensors/qmlambientlightsensor.h
@@ -55,9 +55,9 @@ public:
~QmlAmbientLightSensor();
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
QAmbientLightSensor *m_sensor;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QmlSensorReading *createReading() const override;
};
@@ -76,8 +76,8 @@ Q_SIGNALS:
void lightLevelChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QAmbientLightSensor *m_sensor;
QAmbientLightReading::LightLevel m_lightLevel;
};
diff --git a/src/imports/sensors/qmlambienttemperaturesensor.h b/src/imports/sensors/qmlambienttemperaturesensor.h
index 0171da4..31ec72f 100644
--- a/src/imports/sensors/qmlambienttemperaturesensor.h
+++ b/src/imports/sensors/qmlambienttemperaturesensor.h
@@ -53,8 +53,8 @@ public:
~QmlAmbientTemperatureSensor();
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
+ QmlSensorReading *createReading() const override;
QAmbientTemperatureSensor *m_sensor;
};
@@ -73,8 +73,8 @@ Q_SIGNALS:
void temperatureChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QAmbientTemperatureSensor *m_sensor;
qreal m_temperature;
diff --git a/src/imports/sensors/qmlcompass.h b/src/imports/sensors/qmlcompass.h
index cd5de19..ef4fd22 100644
--- a/src/imports/sensors/qmlcompass.h
+++ b/src/imports/sensors/qmlcompass.h
@@ -55,9 +55,9 @@ public:
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
QCompass *m_sensor;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QmlSensorReading *createReading() const override;
};
class QmlCompassReading : public QmlSensorReading
@@ -77,8 +77,8 @@ Q_SIGNALS:
void calibrationLevelChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QCompass *m_sensor;
qreal m_azimuth;
qreal m_calibrationLevel;
diff --git a/src/imports/sensors/qmldistancesensor.h b/src/imports/sensors/qmldistancesensor.h
index a7635f5..e60e0e7 100644
--- a/src/imports/sensors/qmldistancesensor.h
+++ b/src/imports/sensors/qmldistancesensor.h
@@ -54,8 +54,8 @@ public:
~QmlDistanceSensor();
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
+ QmlSensorReading *createReading() const override;
QDistanceSensor *m_sensor;
};
@@ -74,8 +74,8 @@ Q_SIGNALS:
void distanceChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QDistanceSensor *m_sensor;
qreal m_distance;
diff --git a/src/imports/sensors/qmlgyroscope.h b/src/imports/sensors/qmlgyroscope.h
index 9d3f5c7..010e4f0 100644
--- a/src/imports/sensors/qmlgyroscope.h
+++ b/src/imports/sensors/qmlgyroscope.h
@@ -55,9 +55,9 @@ public:
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
QGyroscope *m_sensor;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QmlSensorReading *createReading() const override;
};
class QmlGyroscopeReading : public QmlSensorReading
@@ -80,8 +80,8 @@ Q_SIGNALS:
void zChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QGyroscope *m_sensor;
qreal m_x;
qreal m_y;
diff --git a/src/imports/sensors/qmlholstersensor.h b/src/imports/sensors/qmlholstersensor.h
index 8b6eef7..630d1d8 100644
--- a/src/imports/sensors/qmlholstersensor.h
+++ b/src/imports/sensors/qmlholstersensor.h
@@ -53,8 +53,8 @@ public:
~QmlHolsterSensor();
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
+ QmlSensorReading *createReading() const override;
QHolsterSensor *m_sensor;
};
@@ -73,8 +73,8 @@ Q_SIGNALS:
void holsteredChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QHolsterSensor *m_sensor;
bool m_holstered;
diff --git a/src/imports/sensors/qmlirproximitysensor.h b/src/imports/sensors/qmlirproximitysensor.h
index 054451b..8ba1d48 100644
--- a/src/imports/sensors/qmlirproximitysensor.h
+++ b/src/imports/sensors/qmlirproximitysensor.h
@@ -54,9 +54,9 @@ public:
~QmlIRProximitySensor();
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
QIRProximitySensor *m_sensor;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QmlSensorReading *createReading() const override;
};
class QmlIRProximitySensorReading : public QmlSensorReading
@@ -73,8 +73,8 @@ Q_SIGNALS:
void reflectanceChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QIRProximitySensor *m_sensor;
qreal m_reflectance;
};
diff --git a/src/imports/sensors/qmllightsensor.h b/src/imports/sensors/qmllightsensor.h
index abc886b..c77b4bf 100644
--- a/src/imports/sensors/qmllightsensor.h
+++ b/src/imports/sensors/qmllightsensor.h
@@ -60,9 +60,9 @@ Q_SIGNALS:
void fieldOfViewChanged(qreal fieldOfView);
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
QLightSensor *m_sensor;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QmlSensorReading *createReading() const override;
};
class QmlLightSensorReading : public QmlSensorReading
@@ -79,8 +79,8 @@ Q_SIGNALS:
void illuminanceChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QLightSensor *m_sensor;
qreal m_illuminance;
};
diff --git a/src/imports/sensors/qmlmagnetometer.h b/src/imports/sensors/qmlmagnetometer.h
index e55a365..3c3c2ba 100644
--- a/src/imports/sensors/qmlmagnetometer.h
+++ b/src/imports/sensors/qmlmagnetometer.h
@@ -61,9 +61,9 @@ Q_SIGNALS:
void returnGeoValuesChanged(bool returnGeoValues);
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
QMagnetometer *m_sensor;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QmlSensorReading *createReading() const override;
};
class QmlMagnetometerReading : public QmlSensorReading
@@ -89,8 +89,8 @@ Q_SIGNALS:
void calibrationLevelChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QMagnetometer *m_sensor;
qreal m_x;
qreal m_y;
diff --git a/src/imports/sensors/qmlorientationsensor.h b/src/imports/sensors/qmlorientationsensor.h
index 896279d..bdb1b1e 100644
--- a/src/imports/sensors/qmlorientationsensor.h
+++ b/src/imports/sensors/qmlorientationsensor.h
@@ -56,9 +56,9 @@ public:
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
QOrientationSensor *m_sensor;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QmlSensorReading *createReading() const override;
};
class QmlOrientationSensorReading : public QmlSensorReading
@@ -76,8 +76,8 @@ Q_SIGNALS:
void orientationChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QOrientationSensor *m_sensor;
QOrientationReading::Orientation m_orientation;
};
diff --git a/src/imports/sensors/qmlpressuresensor.h b/src/imports/sensors/qmlpressuresensor.h
index 4a99b46..6304d69 100644
--- a/src/imports/sensors/qmlpressuresensor.h
+++ b/src/imports/sensors/qmlpressuresensor.h
@@ -53,8 +53,8 @@ public:
~QmlPressureSensor();
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
+ QmlSensorReading *createReading() const override;
QPressureSensor *m_sensor;
};
@@ -76,8 +76,8 @@ Q_SIGNALS:
Q_REVISION(1) void temperatureChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QPressureSensor *m_sensor;
qreal m_pressure;
diff --git a/src/imports/sensors/qmlproximitysensor.h b/src/imports/sensors/qmlproximitysensor.h
index c785dd8..8bab8cf 100644
--- a/src/imports/sensors/qmlproximitysensor.h
+++ b/src/imports/sensors/qmlproximitysensor.h
@@ -57,9 +57,9 @@ public:
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
QProximitySensor *m_sensor;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QmlSensorReading *createReading() const override;
};
class QmlProximitySensorReading : public QmlSensorReading
@@ -76,8 +76,8 @@ Q_SIGNALS:
void nearChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QProximitySensor *m_sensor;
bool m_near;
};
diff --git a/src/imports/sensors/qmlrotationsensor.h b/src/imports/sensors/qmlrotationsensor.h
index 0c79c3d..c0760ac 100644
--- a/src/imports/sensors/qmlrotationsensor.h
+++ b/src/imports/sensors/qmlrotationsensor.h
@@ -60,10 +60,10 @@ Q_SIGNALS:
void hasZChanged(bool hasZ);
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
- void _update() Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
+ void _update() override;
QRotationSensor *m_sensor;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QmlSensorReading *createReading() const override;
};
class QmlRotationSensorReading : public QmlSensorReading
@@ -86,8 +86,8 @@ Q_SIGNALS:
void zChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QRotationSensor *m_sensor;
qreal m_x;
qreal m_y;
diff --git a/src/imports/sensors/qmlsensorgesture.h b/src/imports/sensors/qmlsensorgesture.h
index ec50a46..7cd4aca 100644
--- a/src/imports/sensors/qmlsensorgesture.h
+++ b/src/imports/sensors/qmlsensorgesture.h
@@ -61,8 +61,8 @@ class QmlSensorGesture : public QObject, public QQmlParserStatus
public:
explicit QmlSensorGesture(QObject* parent = 0);
~QmlSensorGesture();
- void classBegin() Q_DECL_OVERRIDE;
- void componentComplete() Q_DECL_OVERRIDE;
+ void classBegin() override;
+ void componentComplete() override;
Q_SIGNALS:
void detected(const QString &gesture);
diff --git a/src/imports/sensors/qmltapsensor.h b/src/imports/sensors/qmltapsensor.h
index c5f560a..260cb2c 100644
--- a/src/imports/sensors/qmltapsensor.h
+++ b/src/imports/sensors/qmltapsensor.h
@@ -62,9 +62,9 @@ Q_SIGNALS:
void returnDoubleTapEventsChanged(bool returnDoubleTapEvents);
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
QTapSensor *m_sensor;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QmlSensorReading *createReading() const override;
};
class QmlTapSensorReading : public QmlSensorReading
@@ -85,8 +85,8 @@ Q_SIGNALS:
void isDoubleTapChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QTapSensor *m_sensor;
QTapReading::TapDirection m_tapDirection;
bool m_isDoubleTap;
diff --git a/src/imports/sensors/qmltiltsensor.h b/src/imports/sensors/qmltiltsensor.h
index 548ff57..c922cb8 100644
--- a/src/imports/sensors/qmltiltsensor.h
+++ b/src/imports/sensors/qmltiltsensor.h
@@ -57,9 +57,9 @@ public:
Q_INVOKABLE void calibrate();
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
QTiltSensor *m_sensor;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QmlSensorReading *createReading() const override;
};
class QmlTiltSensorReading : public QmlSensorReading
@@ -79,8 +79,8 @@ Q_SIGNALS:
void xRotationChanged();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
QTiltSensor *m_sensor;
qreal m_yRotation;
qreal m_xRotation;
diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
index 1478e70..d9c57e8 100644
--- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
@@ -55,12 +55,12 @@ public:
explicit QCoverSensorGestureRecognizer(QObject *parent = 0);
~QCoverSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void cover();
diff --git a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h
index 6522882..73d7db5 100644
--- a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h
@@ -56,12 +56,12 @@ public:
explicit QDoubleTapSensorGestureRecognizer(QObject *parent = 0);
~QDoubleTapSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void doubletap();
diff --git a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
index 89fdb4d..124475a 100644
--- a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
@@ -55,12 +55,12 @@ public:
explicit QFreefallSensorGestureRecognizer(QObject *parent = 0);
~QFreefallSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void freefall();
diff --git a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h
index 072f840..d0c8f70 100644
--- a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h
@@ -55,12 +55,12 @@ public:
explicit QHoverSensorGestureRecognizer(QObject *parent = 0);
~QHoverSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void hover();
diff --git a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h
index 28e511c..fdc0a6f 100644
--- a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h
@@ -53,12 +53,12 @@ public:
explicit QPickupSensorGestureRecognizer(QObject *parent = 0);
~QPickupSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void pickup();
diff --git a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h
index 3b8c5ec..9e402cf 100644
--- a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h
@@ -71,12 +71,12 @@ public:
QShake2SensorGestureRecognizer(QObject *parent = 0);
~QShake2SensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
int timerTimeout;
diff --git a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
index c2a1fc6..4217eec 100644
--- a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
@@ -55,12 +55,12 @@ public:
explicit QSlamSensorGestureRecognizer(QObject *parent = 0);
~QSlamSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void slam();
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
index 79b6cf4..87a93f1 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
+++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
@@ -56,11 +56,11 @@ class QtSensorGesturePlugin : public QObject, public QSensorGesturePluginInterfa
public:
explicit QtSensorGesturePlugin();
~QtSensorGesturePlugin();
- QList <QSensorGestureRecognizer *> createRecognizers() Q_DECL_OVERRIDE;
+ QList <QSensorGestureRecognizer *> createRecognizers() override;
QStringList gestureSignals() const;
- QStringList supportedIds() const Q_DECL_OVERRIDE;
- QString name() const Q_DECL_OVERRIDE { return "QtSensorGestures"; }
+ QStringList supportedIds() const override;
+ QString name() const override { return "QtSensorGestures"; }
};
diff --git a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h
index 679a443..295cb5f 100644
--- a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h
@@ -52,12 +52,12 @@ public:
explicit QTurnoverSensorGestureRecognizer(QObject *parent = 0);
~QTurnoverSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void turnover();
diff --git a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
index a12845c..3080e2a 100644
--- a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
@@ -61,12 +61,12 @@ public:
explicit QTwistSensorGestureRecognizer(QObject *parent = 0);
~QTwistSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void twistLeft();
diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h
index 8e14345..6d674ab 100644
--- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h
@@ -54,12 +54,12 @@ public:
explicit QWhipSensorGestureRecognizer(QObject *parent = 0);
~QWhipSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void whip();
diff --git a/src/plugins/sensorgestures/shake/qshakerecognizer.h b/src/plugins/sensorgestures/shake/qshakerecognizer.h
index 46d1632..21c8566 100644
--- a/src/plugins/sensorgestures/shake/qshakerecognizer.h
+++ b/src/plugins/sensorgestures/shake/qshakerecognizer.h
@@ -64,12 +64,12 @@ public:
QShakeSensorGestureRecognizer(QObject *parent = 0);
~QShakeSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
QTimer *timer;
int timerTimeout;
diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
index 397ae07..96814eb 100644
--- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
+++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
@@ -55,11 +55,11 @@ public:
explicit QShakeSensorGesturePlugin();
~QShakeSensorGesturePlugin();
- QList <QSensorGestureRecognizer *> createRecognizers() Q_DECL_OVERRIDE;
+ QList <QSensorGestureRecognizer *> createRecognizers() override;
QStringList gestureSignals() const;
- QStringList supportedIds() const Q_DECL_OVERRIDE;
- QString name() const Q_DECL_OVERRIDE { return "ShakeGestures"; }
+ QStringList supportedIds() const override;
+ QString name() const override { return "ShakeGestures"; }
};
#endif // QSHAKESENSORGESTUREPLUGIN_H
diff --git a/src/plugins/sensors/android/src/androidaccelerometer.h b/src/plugins/sensors/android/src/androidaccelerometer.h
index b13e5f9..9b8bf0b 100644
--- a/src/plugins/sensors/android/src/androidaccelerometer.h
+++ b/src/plugins/sensors/android/src/androidaccelerometer.h
@@ -51,8 +51,8 @@ public:
AndroidAccelerometer(AndroidSensors::AndroidSensorType type, QSensor *sensor);
static AndroidSensors::AndroidSensorType modeToSensor(QAccelerometer::AccelerationMode mode);
private:
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
- void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+ void onAccuracyChanged(jint accuracy) override;
+ void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
private Q_SLOTS:
void applyAccelerationMode();
diff --git a/src/plugins/sensors/android/src/androidcommonsensor.h b/src/plugins/sensors/android/src/androidcommonsensor.h
index 739501d..bfd36db 100644
--- a/src/plugins/sensors/android/src/androidcommonsensor.h
+++ b/src/plugins/sensors/android/src/androidcommonsensor.h
@@ -61,13 +61,13 @@ public:
if (m_isStarted)
stop();
}
- void start() Q_DECL_OVERRIDE
+ void start() override
{
if (AndroidSensors::registerListener(m_type, this, sensor()->dataRate()))
m_isStarted = true;
}
- void stop() Q_DECL_OVERRIDE
+ void stop() override
{
if (m_isStarted) {
m_isStarted = false;
diff --git a/src/plugins/sensors/android/src/androidcompass.cpp b/src/plugins/sensors/android/src/androidcompass.cpp
index 462695b..e98f048 100644
--- a/src/plugins/sensors/android/src/androidcompass.cpp
+++ b/src/plugins/sensors/android/src/androidcompass.cpp
@@ -64,12 +64,12 @@ public:
AndroidSensors::unregisterListener(AndroidSensors::TYPE_ACCELEROMETER, this);
}
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE
+ void onAccuracyChanged(jint accuracy) override
{
Q_UNUSED(accuracy);
}
- void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) Q_DECL_OVERRIDE
+ void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) override
{
if (size < 3)
return;
@@ -104,12 +104,12 @@ public:
AndroidSensors::unregisterListener(AndroidSensors::TYPE_MAGNETIC_FIELD, this);
}
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE
+ void onAccuracyChanged(jint accuracy) override
{
Q_UNUSED(accuracy);
}
- void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) Q_DECL_OVERRIDE
+ void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) override
{
if (size < 3)
return;
diff --git a/src/plugins/sensors/android/src/androidcompass.h b/src/plugins/sensors/android/src/androidcompass.h
index e808339..16a7c41 100644
--- a/src/plugins/sensors/android/src/androidcompass.h
+++ b/src/plugins/sensors/android/src/androidcompass.h
@@ -56,8 +56,8 @@ public:
AndroidCompass(QSensor *sensor);
~AndroidCompass();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
AndroidAccelerometerListener *m_accelerometerListener;
diff --git a/src/plugins/sensors/android/src/androidgyroscope.h b/src/plugins/sensors/android/src/androidgyroscope.h
index 14ac986..9dd5629 100644
--- a/src/plugins/sensors/android/src/androidgyroscope.h
+++ b/src/plugins/sensors/android/src/androidgyroscope.h
@@ -48,8 +48,8 @@ class AndroidGyroscope : public AndroidCommonSensor<QGyroscopeReading>
public:
AndroidGyroscope(AndroidSensors::AndroidSensorType type, QSensor *sensor);
private:
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
- void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+ void onAccuracyChanged(jint accuracy) override;
+ void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
};
#endif // ANDROIDGYROSCOPE_H
diff --git a/src/plugins/sensors/android/src/androidlight.h b/src/plugins/sensors/android/src/androidlight.h
index 1f708fa..3c94c13 100644
--- a/src/plugins/sensors/android/src/androidlight.h
+++ b/src/plugins/sensors/android/src/androidlight.h
@@ -48,8 +48,8 @@ class AndroidLight : public AndroidCommonSensor<QLightReading>
public:
AndroidLight(AndroidSensors::AndroidSensorType type, QSensor *sensor);
private:
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
- void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+ void onAccuracyChanged(jint accuracy) override;
+ void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
};
#endif // ANDROIDLIGHT_H
diff --git a/src/plugins/sensors/android/src/androidmagnetometer.h b/src/plugins/sensors/android/src/androidmagnetometer.h
index 5cceccc..1b6a435 100644
--- a/src/plugins/sensors/android/src/androidmagnetometer.h
+++ b/src/plugins/sensors/android/src/androidmagnetometer.h
@@ -48,8 +48,8 @@ class AndroidMagnetometer : public AndroidCommonSensor<QMagnetometerReading>
public:
AndroidMagnetometer(AndroidSensors::AndroidSensorType type, QSensor *sensor);
private:
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
- void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+ void onAccuracyChanged(jint accuracy) override;
+ void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
};
#endif // ANDROIDMAGNETOMETER_H
diff --git a/src/plugins/sensors/android/src/androidproximity.h b/src/plugins/sensors/android/src/androidproximity.h
index a007f3c..5a3110c 100644
--- a/src/plugins/sensors/android/src/androidproximity.h
+++ b/src/plugins/sensors/android/src/androidproximity.h
@@ -49,8 +49,8 @@ class AndroidProximity : public AndroidCommonSensor<QProximityReading>
public:
AndroidProximity(AndroidSensors::AndroidSensorType type, QSensor *sensor);
private:
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
- void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+ void onAccuracyChanged(jint accuracy) override;
+ void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
qreal m_maximumRange;
};
diff --git a/src/plugins/sensors/android/src/androidrotation.h b/src/plugins/sensors/android/src/androidrotation.h
index ae6aeaf..0fe90a6 100644
--- a/src/plugins/sensors/android/src/androidrotation.h
+++ b/src/plugins/sensors/android/src/androidrotation.h
@@ -47,8 +47,8 @@ class AndroidRotation : public AndroidCommonSensor<QRotationReading>
public:
AndroidRotation(AndroidSensors::AndroidSensorType type, QSensor *sensor);
private:
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
- void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+ void onAccuracyChanged(jint accuracy) override;
+ void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
};
#endif // ANDROIDROTATION_H
diff --git a/src/plugins/sensors/android/src/androidtemperature.h b/src/plugins/sensors/android/src/androidtemperature.h
index 78a9338..1640033 100644
--- a/src/plugins/sensors/android/src/androidtemperature.h
+++ b/src/plugins/sensors/android/src/androidtemperature.h
@@ -49,8 +49,8 @@ class AndroidTemperature : public AndroidCommonSensor<QAmbientTemperatureReading
public:
AndroidTemperature(AndroidSensors::AndroidSensorType type, QSensor *sensor);
private:
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
- void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+ void onAccuracyChanged(jint accuracy) override;
+ void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
};
#endif // ANDROIDTEMPERATURE_H
diff --git a/src/plugins/sensors/dummy/dummyaccelerometer.h b/src/plugins/sensors/dummy/dummyaccelerometer.h
index 73c674c..6c890f6 100644
--- a/src/plugins/sensors/dummy/dummyaccelerometer.h
+++ b/src/plugins/sensors/dummy/dummyaccelerometer.h
@@ -50,7 +50,7 @@ public:
dummyaccelerometer(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QAccelerometerReading m_reading;
};
diff --git a/src/plugins/sensors/dummy/dummycommon.h b/src/plugins/sensors/dummy/dummycommon.h
index 816947e..5e775b6 100644
--- a/src/plugins/sensors/dummy/dummycommon.h
+++ b/src/plugins/sensors/dummy/dummycommon.h
@@ -48,10 +48,10 @@ class dummycommon : public QSensorBackend
public:
dummycommon(QSensor *sensor);
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
virtual void poll() = 0;
- void timerEvent(QTimerEvent * /*event*/) Q_DECL_OVERRIDE;
+ void timerEvent(QTimerEvent * /*event*/) override;
protected:
quint64 getTimestamp();
diff --git a/src/plugins/sensors/dummy/dummylightsensor.h b/src/plugins/sensors/dummy/dummylightsensor.h
index 8d005fd..3bcaf41 100644
--- a/src/plugins/sensors/dummy/dummylightsensor.h
+++ b/src/plugins/sensors/dummy/dummylightsensor.h
@@ -50,7 +50,7 @@ public:
dummylightsensor(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QAmbientLightReading m_reading;
};
diff --git a/src/plugins/sensors/generic/genericalssensor.h b/src/plugins/sensors/generic/genericalssensor.h
index 83950ea..3d10b9a 100644
--- a/src/plugins/sensors/generic/genericalssensor.h
+++ b/src/plugins/sensors/generic/genericalssensor.h
@@ -51,10 +51,10 @@ public:
genericalssensor(QSensor *sensor);
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
- bool filter(QLightReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QLightReading *reading) override;
private:
QAmbientLightReading m_reading;
diff --git a/src/plugins/sensors/generic/genericorientationsensor.h b/src/plugins/sensors/generic/genericorientationsensor.h
index 7afdc38..01265a0 100644
--- a/src/plugins/sensors/generic/genericorientationsensor.h
+++ b/src/plugins/sensors/generic/genericorientationsensor.h
@@ -51,10 +51,10 @@ public:
genericorientationsensor(QSensor *sensor);
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
- bool filter(QAccelerometerReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QAccelerometerReading *reading) override;
private:
QOrientationReading m_reading;
diff --git a/src/plugins/sensors/generic/genericrotationsensor.h b/src/plugins/sensors/generic/genericrotationsensor.h
index f1c9163..98b8f97 100644
--- a/src/plugins/sensors/generic/genericrotationsensor.h
+++ b/src/plugins/sensors/generic/genericrotationsensor.h
@@ -52,10 +52,10 @@ public:
genericrotationsensor(QSensor *sensor);
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
private:
QRotationReading m_reading;
diff --git a/src/plugins/sensors/generic/generictiltsensor.h b/src/plugins/sensors/generic/generictiltsensor.h
index 9562aca..71db69d 100644
--- a/src/plugins/sensors/generic/generictiltsensor.h
+++ b/src/plugins/sensors/generic/generictiltsensor.h
@@ -55,14 +55,14 @@ public:
GenericTiltSensor(QSensor *sensor);
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
Q_INVOKABLE void calibrate();
- bool filter(QAccelerometerReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QAccelerometerReading *reading) override;
- bool isFeatureSupported(QSensor::Feature feature) const Q_DECL_OVERRIDE;
+ bool isFeatureSupported(QSensor::Feature feature) const override;
private:
QTiltReading m_reading;
diff --git a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h
index 60b201e..30d79e3 100644
--- a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h
+++ b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h
@@ -56,11 +56,11 @@ public:
IIOSensorProxyCompass(QSensor *sensor);
~IIOSensorProxyCompass();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
protected:
- void updateProperties(const QVariantMap &changedProperties) Q_DECL_OVERRIDE;
+ void updateProperties(const QVariantMap &changedProperties) override;
private:
void updateAzimuth(double azimuth);
diff --git a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxylightsensor.h b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxylightsensor.h
index e1acd23..14c07d6 100644
--- a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxylightsensor.h
+++ b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxylightsensor.h
@@ -56,11 +56,11 @@ public:
IIOSensorProxyLightSensor(QSensor *sensor);
~IIOSensorProxyLightSensor();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
protected:
- void updateProperties(const QVariantMap &changedProperties) Q_DECL_OVERRIDE;
+ void updateProperties(const QVariantMap &changedProperties) override;
private:
void updateLightLevel(double lux);
diff --git a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h
index b62aad9..959113f 100644
--- a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h
+++ b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h
@@ -56,11 +56,11 @@ public:
IIOSensorProxyOrientationSensor(QSensor *sensor);
~IIOSensorProxyOrientationSensor();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
protected:
- void updateProperties(const QVariantMap &changedProperties) Q_DECL_OVERRIDE;
+ void updateProperties(const QVariantMap &changedProperties) override;
private:
void updateOrientation(const QString &orientation);
diff --git a/src/plugins/sensors/ios/iosaccelerometer.h b/src/plugins/sensors/ios/iosaccelerometer.h
index 14b6cc0..4ac73a9 100644
--- a/src/plugins/sensors/ios/iosaccelerometer.h
+++ b/src/plugins/sensors/ios/iosaccelerometer.h
@@ -53,10 +53,10 @@ public:
static char const * const id;
explicit IOSAccelerometer(QSensor *sensor);
- void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+ void timerEvent(QTimerEvent *) override;
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
CMMotionManager *m_motionManager;
diff --git a/src/plugins/sensors/ios/ioscompass.h b/src/plugins/sensors/ios/ioscompass.h
index 997b1df..2babc92 100644
--- a/src/plugins/sensors/ios/ioscompass.h
+++ b/src/plugins/sensors/ios/ioscompass.h
@@ -55,8 +55,8 @@ public:
explicit IOSCompass(QSensor *sensor);
~IOSCompass();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
void headingChanged(qreal heading, quint64 timestamp, qreal calibrationLevel);
diff --git a/src/plugins/sensors/ios/iosgyroscope.h b/src/plugins/sensors/ios/iosgyroscope.h
index 3969bb1..0d7fea4 100644
--- a/src/plugins/sensors/ios/iosgyroscope.h
+++ b/src/plugins/sensors/ios/iosgyroscope.h
@@ -53,10 +53,10 @@ public:
static char const * const id;
explicit IOSGyroscope(QSensor *sensor);
- void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+ void timerEvent(QTimerEvent *) override;
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
CMMotionManager *m_motionManager;
diff --git a/src/plugins/sensors/ios/iosmagnetometer.h b/src/plugins/sensors/ios/iosmagnetometer.h
index f4ab34a..2c55eac 100644
--- a/src/plugins/sensors/ios/iosmagnetometer.h
+++ b/src/plugins/sensors/ios/iosmagnetometer.h
@@ -53,10 +53,10 @@ public:
static char const * const id;
explicit IOSMagnetometer(QSensor *sensor);
- void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+ void timerEvent(QTimerEvent *) override;
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
void startMagnetometer();
void startDeviceMotion();
diff --git a/src/plugins/sensors/ios/iosproximitysensor.h b/src/plugins/sensors/ios/iosproximitysensor.h
index 4cff4fc..0d69391 100644
--- a/src/plugins/sensors/ios/iosproximitysensor.h
+++ b/src/plugins/sensors/ios/iosproximitysensor.h
@@ -55,8 +55,8 @@ public:
explicit IOSProximitySensor(QSensor *sensor);
~IOSProximitySensor();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
void proximityChanged(bool close);
static bool available();
diff --git a/src/plugins/sensors/linux/linuxsysaccelerometer.h b/src/plugins/sensors/linux/linuxsysaccelerometer.h
index fbcc82e..af89bf7 100644
--- a/src/plugins/sensors/linux/linuxsysaccelerometer.h
+++ b/src/plugins/sensors/linux/linuxsysaccelerometer.h
@@ -53,10 +53,10 @@ public:
LinuxSysAccelerometer(QSensor *sensor);
~LinuxSysAccelerometer();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
void poll();
- void timerEvent(QTimerEvent * /*event*/) Q_DECL_OVERRIDE;
+ void timerEvent(QTimerEvent * /*event*/) override;
private:
QAccelerometerReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h
index 23be816..89d7bf7 100644
--- a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h
+++ b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h
@@ -55,10 +55,10 @@ public:
static char const * const id;
sensorfwaccelerometer(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- qreal correctionFactor() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ qreal correctionFactor() const override;
+ void start() override;
virtual void init();
private:
diff --git a/src/plugins/sensors/sensorfw/sensorfwals.h b/src/plugins/sensors/sensorfw/sensorfwals.h
index d0062a0..9a71550 100644
--- a/src/plugins/sensors/sensorfw/sensorfwals.h
+++ b/src/plugins/sensors/sensorfw/sensorfwals.h
@@ -55,9 +55,9 @@ public:
static char const * const id;
Sensorfwals(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ void start() override;
virtual void init();
private:
diff --git a/src/plugins/sensors/sensorfw/sensorfwcompass.h b/src/plugins/sensors/sensorfw/sensorfwcompass.h
index d1ad60a..9afe9b4 100644
--- a/src/plugins/sensors/sensorfw/sensorfwcompass.h
+++ b/src/plugins/sensors/sensorfw/sensorfwcompass.h
@@ -55,9 +55,9 @@ public:
static char const * const id;
SensorfwCompass(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ void start() override;
virtual void init();
private:
QCompassReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwgyroscope.h b/src/plugins/sensors/sensorfw/sensorfwgyroscope.h
index 817ef51..d9346a9 100644
--- a/src/plugins/sensors/sensorfw/sensorfwgyroscope.h
+++ b/src/plugins/sensors/sensorfw/sensorfwgyroscope.h
@@ -57,10 +57,10 @@ public:
static char const * const id;
SensorfwGyroscope(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- qreal correctionFactor() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ qreal correctionFactor() const override;
+ void start() override;
virtual void init();
private:
diff --git a/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h b/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h
index b772e53..ece68a5 100644
--- a/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h
@@ -54,9 +54,9 @@ public:
SensorfwIrProximitySensor(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ void start() override;
virtual void init();
private:
QIRProximityReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwlightsensor.h b/src/plugins/sensors/sensorfw/sensorfwlightsensor.h
index c1aa27d..9d8faa6 100644
--- a/src/plugins/sensors/sensorfw/sensorfwlightsensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwlightsensor.h
@@ -55,9 +55,9 @@ public:
static char const * const id;
SensorfwLightSensor(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ void start() override;
virtual void init();
private:
QLightReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h
index 8f6f80b..03f2955 100644
--- a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h
+++ b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h
@@ -56,10 +56,10 @@ public:
static char const * const id;
SensorfwMagnetometer(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- qreal correctionFactor() const Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ void start() override;
+ QString sensorName() const override;
+ qreal correctionFactor() const override;
virtual void init();
private:
diff --git a/src/plugins/sensors/sensorfw/sensorfworientationsensor.h b/src/plugins/sensors/sensorfw/sensorfworientationsensor.h
index 1828b0a..fac59fe 100644
--- a/src/plugins/sensors/sensorfw/sensorfworientationsensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfworientationsensor.h
@@ -55,9 +55,9 @@ public:
static char const * const id;
SensorfwOrientationSensor(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ void start() override;
virtual void init();
private:
QOrientationReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h
index 16702da..d8b9664 100644
--- a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h
@@ -55,9 +55,9 @@ public:
static char const * const id;
SensorfwProximitySensor(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ void start() override;
virtual void init();
private:
diff --git a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h
index a4e1d08..f9150f6 100644
--- a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h
@@ -57,9 +57,9 @@ public:
static char const * const id;
SensorfwRotationSensor(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ void start() override;
virtual void init();
private:
QRotationReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h
index 3e5e053..7e7f5c3 100644
--- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h
+++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h
@@ -60,8 +60,8 @@ public:
protected:
virtual bool doConnect()=0;
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
static const float GRAVITY_EARTH;
static const float GRAVITY_EARTH_THOUSANDTH; //for speed
diff --git a/src/plugins/sensors/sensorfw/sensorfwtapsensor.h b/src/plugins/sensors/sensorfw/sensorfwtapsensor.h
index d725159..7e9edb4 100644
--- a/src/plugins/sensors/sensorfw/sensorfwtapsensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwtapsensor.h
@@ -55,9 +55,9 @@ public:
static char const * const id;
SensorfwTapSensor(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ void start() override;
+ QString sensorName() const override;
virtual void init();
private:
QTapReading m_reading;
diff --git a/src/plugins/sensors/simulator/simulatoraccelerometer.h b/src/plugins/sensors/simulator/simulatoraccelerometer.h
index 12605c3..a420586 100644
--- a/src/plugins/sensors/simulator/simulatoraccelerometer.h
+++ b/src/plugins/sensors/simulator/simulatoraccelerometer.h
@@ -50,7 +50,7 @@ public:
SimulatorAccelerometer(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QAccelerometerReading m_reading;
};
diff --git a/src/plugins/sensors/simulator/simulatorambientlightsensor.h b/src/plugins/sensors/simulator/simulatorambientlightsensor.h
index ecac5be..0aadffe 100644
--- a/src/plugins/sensors/simulator/simulatorambientlightsensor.h
+++ b/src/plugins/sensors/simulator/simulatorambientlightsensor.h
@@ -50,7 +50,7 @@ public:
SimulatorAmbientLightSensor(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QAmbientLightReading m_reading;
};
diff --git a/src/plugins/sensors/simulator/simulatorcommon.h b/src/plugins/sensors/simulator/simulatorcommon.h
index 084b10d..e47f24d 100644
--- a/src/plugins/sensors/simulator/simulatorcommon.h
+++ b/src/plugins/sensors/simulator/simulatorcommon.h
@@ -92,10 +92,10 @@ class SimulatorCommon : public QSensorBackend
public:
SimulatorCommon(QSensor *sensor);
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
virtual void poll() = 0;
- void timerEvent(QTimerEvent * /*event*/) Q_DECL_OVERRIDE;
+ void timerEvent(QTimerEvent * /*event*/) override;
private:
int m_timerid;
diff --git a/src/plugins/sensors/simulator/simulatorcompass.h b/src/plugins/sensors/simulator/simulatorcompass.h
index a9e6475..69162c6 100644
--- a/src/plugins/sensors/simulator/simulatorcompass.h
+++ b/src/plugins/sensors/simulator/simulatorcompass.h
@@ -50,7 +50,7 @@ public:
SimulatorCompass(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QCompassReading m_reading;
};
diff --git a/src/plugins/sensors/simulator/simulatorirproximitysensor.h b/src/plugins/sensors/simulator/simulatorirproximitysensor.h
index 6173631..db20968 100644
--- a/src/plugins/sensors/simulator/simulatorirproximitysensor.h
+++ b/src/plugins/sensors/simulator/simulatorirproximitysensor.h
@@ -50,7 +50,7 @@ public:
SimulatorIRProximitySensor(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QIRProximityReading m_reading;
};
diff --git a/src/plugins/sensors/simulator/simulatorlightsensor.h b/src/plugins/sensors/simulator/simulatorlightsensor.h
index 78d8f84..3af3a52 100644
--- a/src/plugins/sensors/simulator/simulatorlightsensor.h
+++ b/src/plugins/sensors/simulator/simulatorlightsensor.h
@@ -50,7 +50,7 @@ public:
SimulatorLightSensor(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QLightReading m_reading;
};
diff --git a/src/plugins/sensors/simulator/simulatormagnetometer.h b/src/plugins/sensors/simulator/simulatormagnetometer.h
index f602d46..facbad4 100644
--- a/src/plugins/sensors/simulator/simulatormagnetometer.h
+++ b/src/plugins/sensors/simulator/simulatormagnetometer.h
@@ -50,7 +50,7 @@ public:
SimulatorMagnetometer(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QMagnetometerReading m_reading;
};
diff --git a/src/plugins/sensors/simulator/simulatorproximitysensor.h b/src/plugins/sensors/simulator/simulatorproximitysensor.h
index 22b7287..16e6f6b 100644
--- a/src/plugins/sensors/simulator/simulatorproximitysensor.h
+++ b/src/plugins/sensors/simulator/simulatorproximitysensor.h
@@ -50,7 +50,7 @@ public:
SimulatorProximitySensor(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QProximityReading m_reading;
};
diff --git a/src/plugins/sensors/winrt/winrtaccelerometer.h b/src/plugins/sensors/winrt/winrtaccelerometer.h
index c81de28..1d51735 100644
--- a/src/plugins/sensors/winrt/winrtaccelerometer.h
+++ b/src/plugins/sensors/winrt/winrtaccelerometer.h
@@ -50,8 +50,8 @@ public:
WinRtAccelerometer(QSensor *sensor);
~WinRtAccelerometer();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
QScopedPointer<WinRtAccelerometerPrivate> d_ptr;
diff --git a/src/plugins/sensors/winrt/winrtambientlightsensor.h b/src/plugins/sensors/winrt/winrtambientlightsensor.h
index 092b36e..7522bae 100644
--- a/src/plugins/sensors/winrt/winrtambientlightsensor.h
+++ b/src/plugins/sensors/winrt/winrtambientlightsensor.h
@@ -50,8 +50,8 @@ public:
WinRtAmbientLightSensor(QSensor *sensor);
~WinRtAmbientLightSensor();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
QScopedPointer<WinRtAmbientLightSensorPrivate> d_ptr;
diff --git a/src/plugins/sensors/winrt/winrtcompass.h b/src/plugins/sensors/winrt/winrtcompass.h
index 625417f..fd2ce11 100644
--- a/src/plugins/sensors/winrt/winrtcompass.h
+++ b/src/plugins/sensors/winrt/winrtcompass.h
@@ -50,8 +50,8 @@ public:
WinRtCompass(QSensor *sensor);
~WinRtCompass();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
QScopedPointer<WinRtCompassPrivate> d_ptr;
diff --git a/src/plugins/sensors/winrt/winrtgyroscope.h b/src/plugins/sensors/winrt/winrtgyroscope.h
index 74fb9cd..2448b00 100644
--- a/src/plugins/sensors/winrt/winrtgyroscope.h
+++ b/src/plugins/sensors/winrt/winrtgyroscope.h
@@ -50,15 +50,15 @@ public:
WinRtGyroscope(QSensor *sensor);
~WinRtGyroscope();
- bool isFeatureSupported(QSensor::Feature feature) const Q_DECL_OVERRIDE
+ bool isFeatureSupported(QSensor::Feature feature) const override
{
if (feature == QSensor::AxesOrientation || feature == QSensor::AccelerationMode)
return true;
return false;
}
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
QScopedPointer<WinRtGyroscopePrivate> d_ptr;
diff --git a/src/plugins/sensors/winrt/winrtorientationsensor.h b/src/plugins/sensors/winrt/winrtorientationsensor.h
index 4f56bf0..dc4abf8 100644
--- a/src/plugins/sensors/winrt/winrtorientationsensor.h
+++ b/src/plugins/sensors/winrt/winrtorientationsensor.h
@@ -50,8 +50,8 @@ public:
WinRtOrientationSensor(QSensor *sensor);
~WinRtOrientationSensor();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
QScopedPointer<WinRtOrientationSensorPrivate> d_ptr;
diff --git a/src/plugins/sensors/winrt/winrtrotationsensor.h b/src/plugins/sensors/winrt/winrtrotationsensor.h
index 47c3991..ef2a922 100644
--- a/src/plugins/sensors/winrt/winrtrotationsensor.h
+++ b/src/plugins/sensors/winrt/winrtrotationsensor.h
@@ -50,15 +50,15 @@ public:
WinRtRotationSensor(QSensor *sensor);
~WinRtRotationSensor();
- bool isFeatureSupported(QSensor::Feature feature) const Q_DECL_OVERRIDE
+ bool isFeatureSupported(QSensor::Feature feature) const override
{
if (feature == QSensor::AxesOrientation || feature == QSensor::AccelerationMode)
return true;
return false;
}
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
QScopedPointer<WinRtRotationSensorPrivate> d_ptr;
diff --git a/src/sensors/make_sensor.pl b/src/sensors/make_sensor.pl
index 6f36923..bfa8147 100755
--- a/src/sensors/make_sensor.pl
+++ b/src/sensors/make_sensor.pl
@@ -107,8 +107,8 @@ public:
~'.$qmlsensor.'();
private:
- QSensor *sensor() const Q_DECL_OVERRIDE;
- QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+ QSensor *sensor() const override;
+ QmlSensorReading *createReading() const override;
'.$sensor.' *m_sensor;
};
@@ -127,8 +127,8 @@ Q_SIGNALS:
void prop1Changed();
private:
- QSensorReading *reading() const Q_DECL_OVERRIDE;
- void readingUpdate() Q_DECL_OVERRIDE;
+ QSensorReading *reading() const override;
+ void readingUpdate() override;
'.$sensor.' *m_sensor;
qreal m_prop1;
@@ -313,7 +313,7 @@ class Q_SENSORS_EXPORT '.$filter.' : public QSensorFilter
public:
virtual bool filter('.$reading.' *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT '.$sensor.' : public QSensor
diff --git a/src/sensors/qaltimeter.h b/src/sensors/qaltimeter.h
index 0d609b4..50c9e83 100644
--- a/src/sensors/qaltimeter.h
+++ b/src/sensors/qaltimeter.h
@@ -60,7 +60,7 @@ class Q_SENSORS_EXPORT QAltimeterFilter : public QSensorFilter
public:
virtual bool filter(QAltimeterReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT QAltimeter : public QSensor
diff --git a/src/sensors/qambienttemperaturesensor.h b/src/sensors/qambienttemperaturesensor.h
index 181c611..4198b15 100644
--- a/src/sensors/qambienttemperaturesensor.h
+++ b/src/sensors/qambienttemperaturesensor.h
@@ -60,7 +60,7 @@ class Q_SENSORS_EXPORT QAmbientTemperatureFilter : public QSensorFilter
public:
virtual bool filter(QAmbientTemperatureReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT QAmbientTemperatureSensor : public QSensor
diff --git a/src/sensors/qcompass.h b/src/sensors/qcompass.h
index 169f38c..0d22c74 100644
--- a/src/sensors/qcompass.h
+++ b/src/sensors/qcompass.h
@@ -65,7 +65,7 @@ class Q_SENSORS_EXPORT QCompassFilter : public QSensorFilter
public:
virtual bool filter(QCompassReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT QCompass : public QSensor
diff --git a/src/sensors/qdistancesensor.h b/src/sensors/qdistancesensor.h
index 499a695..a6aef94 100644
--- a/src/sensors/qdistancesensor.h
+++ b/src/sensors/qdistancesensor.h
@@ -61,7 +61,7 @@ class Q_SENSORS_EXPORT QDistanceFilter : public QSensorFilter
public:
virtual bool filter(QDistanceReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT QDistanceSensor : public QSensor
diff --git a/src/sensors/qgyroscope.h b/src/sensors/qgyroscope.h
index dc54179..7d7e287 100644
--- a/src/sensors/qgyroscope.h
+++ b/src/sensors/qgyroscope.h
@@ -69,7 +69,7 @@ class Q_SENSORS_EXPORT QGyroscopeFilter : public QSensorFilter
public:
virtual bool filter(QGyroscopeReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT QGyroscope : public QSensor
diff --git a/src/sensors/qholstersensor.h b/src/sensors/qholstersensor.h
index 253e05b..43d0289 100644
--- a/src/sensors/qholstersensor.h
+++ b/src/sensors/qholstersensor.h
@@ -60,7 +60,7 @@ class Q_SENSORS_EXPORT QHolsterFilter : public QSensorFilter
public:
virtual bool filter(QHolsterReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT QHolsterSensor : public QSensor
diff --git a/src/sensors/qirproximitysensor.h b/src/sensors/qirproximitysensor.h
index 153741c..2941d6e 100644
--- a/src/sensors/qirproximitysensor.h
+++ b/src/sensors/qirproximitysensor.h
@@ -61,7 +61,7 @@ class Q_SENSORS_EXPORT QIRProximityFilter : public QSensorFilter
public:
virtual bool filter(QIRProximityReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT QIRProximitySensor : public QSensor
diff --git a/src/sensors/qlightsensor.h b/src/sensors/qlightsensor.h
index 0b16b46..03f1871 100644
--- a/src/sensors/qlightsensor.h
+++ b/src/sensors/qlightsensor.h
@@ -61,7 +61,7 @@ class Q_SENSORS_EXPORT QLightFilter : public QSensorFilter
public:
virtual bool filter(QLightReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class QLightSensorPrivate;
diff --git a/src/sensors/qmagnetometer.h b/src/sensors/qmagnetometer.h
index 25ad040..f8b0fbf 100644
--- a/src/sensors/qmagnetometer.h
+++ b/src/sensors/qmagnetometer.h
@@ -73,7 +73,7 @@ class Q_SENSORS_EXPORT QMagnetometerFilter : public QSensorFilter
public:
virtual bool filter(QMagnetometerReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class QMagnetometerPrivate;
diff --git a/src/sensors/qorientationsensor.h b/src/sensors/qorientationsensor.h
index 703abb3..89823ca 100644
--- a/src/sensors/qorientationsensor.h
+++ b/src/sensors/qorientationsensor.h
@@ -72,7 +72,7 @@ class Q_SENSORS_EXPORT QOrientationFilter : public QSensorFilter
public:
virtual bool filter(QOrientationReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT QOrientationSensor : public QSensor
diff --git a/src/sensors/qpressuresensor.h b/src/sensors/qpressuresensor.h
index 5deb16b..29ac235 100644
--- a/src/sensors/qpressuresensor.h
+++ b/src/sensors/qpressuresensor.h
@@ -64,7 +64,7 @@ class Q_SENSORS_EXPORT QPressureFilter : public QSensorFilter
public:
virtual bool filter(QPressureReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT QPressureSensor : public QSensor
diff --git a/src/sensors/qproximitysensor.h b/src/sensors/qproximitysensor.h
index 33cd4b2..46a8b21 100644
--- a/src/sensors/qproximitysensor.h
+++ b/src/sensors/qproximitysensor.h
@@ -61,7 +61,7 @@ class Q_SENSORS_EXPORT QProximityFilter : public QSensorFilter
public:
virtual bool filter(QProximityReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT QProximitySensor : public QSensor
diff --git a/src/sensors/qrotationsensor.h b/src/sensors/qrotationsensor.h
index de2053b..d6c43ac 100644
--- a/src/sensors/qrotationsensor.h
+++ b/src/sensors/qrotationsensor.h
@@ -66,7 +66,7 @@ class Q_SENSORS_EXPORT QRotationFilter : public QSensorFilter
public:
virtual bool filter(QRotationReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class QRotationSensorPrivate;
diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h
index d6207a1..31ba67f 100644
--- a/src/sensors/qtapsensor.h
+++ b/src/sensors/qtapsensor.h
@@ -82,7 +82,7 @@ class Q_SENSORS_EXPORT QTapFilter : public QSensorFilter
public:
virtual bool filter(QTapReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class QTapSensorPrivate;
diff --git a/src/sensors/qtiltsensor.h b/src/sensors/qtiltsensor.h
index 6f83a34..2e0d0a7 100644
--- a/src/sensors/qtiltsensor.h
+++ b/src/sensors/qtiltsensor.h
@@ -67,7 +67,7 @@ class Q_SENSORS_EXPORT QTiltFilter : public QSensorFilter
public:
virtual bool filter(QTiltReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT QTiltSensor : public QSensor
diff --git a/tests/auto/qsensor/test_sensorimpl.h b/tests/auto/qsensor/test_sensorimpl.h
index 4e4df08..9587731 100644
--- a/tests/auto/qsensor/test_sensorimpl.h
+++ b/tests/auto/qsensor/test_sensorimpl.h
@@ -43,7 +43,7 @@ public:
void start();
void stop();
- bool isFeatureSupported(QSensor::Feature feature) const Q_DECL_OVERRIDE;
+ bool isFeatureSupported(QSensor::Feature feature) const override;
signals:
void emitBusyChanged();