From 2c595c382c50a5632b14eda00d85a9b7fcb09b5d Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Fri, 2 Dec 2016 02:09:24 +0300 Subject: Replace Q_DECL_OVERRIDE by override 'override' keyword can be used directly since Qt 5.7. Change-Id: Ibf0fc590f7e247a310a833a22ece700ec75199bb Reviewed-by: Lorn Potter --- src/imports/sensors/qmlaccelerometer.h | 8 ++++---- src/imports/sensors/qmlaltimeter.h | 8 ++++---- src/imports/sensors/qmlambientlightsensor.h | 8 ++++---- src/imports/sensors/qmlambienttemperaturesensor.h | 8 ++++---- src/imports/sensors/qmlcompass.h | 8 ++++---- src/imports/sensors/qmldistancesensor.h | 8 ++++---- src/imports/sensors/qmlgyroscope.h | 8 ++++---- src/imports/sensors/qmlholstersensor.h | 8 ++++---- src/imports/sensors/qmlirproximitysensor.h | 8 ++++---- src/imports/sensors/qmllightsensor.h | 8 ++++---- src/imports/sensors/qmlmagnetometer.h | 8 ++++---- src/imports/sensors/qmlorientationsensor.h | 8 ++++---- src/imports/sensors/qmlpressuresensor.h | 8 ++++---- src/imports/sensors/qmlproximitysensor.h | 8 ++++---- src/imports/sensors/qmlrotationsensor.h | 10 +++++----- src/imports/sensors/qmlsensorgesture.h | 4 ++-- src/imports/sensors/qmltapsensor.h | 8 ++++---- src/imports/sensors/qmltiltsensor.h | 8 ++++---- .../sensorgestures/qtsensors/qcoversensorgesturerecognizer.h | 10 +++++----- .../qtsensors/qdoubletapsensorgesturerecognizer.h | 10 +++++----- .../qtsensors/qfreefallsensorgesturerecognizer.h | 10 +++++----- .../sensorgestures/qtsensors/qhoversensorgesturerecognizer.h | 10 +++++----- .../sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h | 10 +++++----- src/plugins/sensorgestures/qtsensors/qshake2recognizer.h | 10 +++++----- src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h | 10 +++++----- src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h | 6 +++--- .../qtsensors/qturnoversensorgesturerecognizer.h | 10 +++++----- .../sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h | 10 +++++----- .../sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h | 10 +++++----- src/plugins/sensorgestures/shake/qshakerecognizer.h | 10 +++++----- src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h | 6 +++--- src/plugins/sensors/android/src/androidaccelerometer.h | 4 ++-- src/plugins/sensors/android/src/androidcommonsensor.h | 4 ++-- src/plugins/sensors/android/src/androidcompass.cpp | 8 ++++---- src/plugins/sensors/android/src/androidcompass.h | 4 ++-- src/plugins/sensors/android/src/androidgyroscope.h | 4 ++-- src/plugins/sensors/android/src/androidlight.h | 4 ++-- src/plugins/sensors/android/src/androidmagnetometer.h | 4 ++-- src/plugins/sensors/android/src/androidproximity.h | 4 ++-- src/plugins/sensors/android/src/androidrotation.h | 4 ++-- src/plugins/sensors/android/src/androidtemperature.h | 4 ++-- src/plugins/sensors/dummy/dummyaccelerometer.h | 2 +- src/plugins/sensors/dummy/dummycommon.h | 6 +++--- src/plugins/sensors/dummy/dummylightsensor.h | 2 +- src/plugins/sensors/generic/genericalssensor.h | 6 +++--- src/plugins/sensors/generic/genericorientationsensor.h | 6 +++--- src/plugins/sensors/generic/genericrotationsensor.h | 6 +++--- src/plugins/sensors/generic/generictiltsensor.h | 8 ++++---- src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h | 6 +++--- .../sensors/iio-sensor-proxy/iiosensorproxylightsensor.h | 6 +++--- .../sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h | 6 +++--- src/plugins/sensors/ios/iosaccelerometer.h | 6 +++--- src/plugins/sensors/ios/ioscompass.h | 4 ++-- src/plugins/sensors/ios/iosgyroscope.h | 6 +++--- src/plugins/sensors/ios/iosmagnetometer.h | 6 +++--- src/plugins/sensors/ios/iosproximitysensor.h | 4 ++-- src/plugins/sensors/linux/linuxsysaccelerometer.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwaccelerometer.h | 8 ++++---- src/plugins/sensors/sensorfw/sensorfwals.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwcompass.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwgyroscope.h | 8 ++++---- src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwlightsensor.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwmagnetometer.h | 8 ++++---- src/plugins/sensors/sensorfw/sensorfworientationsensor.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwproximitysensor.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwrotationsensor.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwsensorbase.h | 4 ++-- src/plugins/sensors/sensorfw/sensorfwtapsensor.h | 6 +++--- src/plugins/sensors/simulator/simulatoraccelerometer.h | 2 +- src/plugins/sensors/simulator/simulatorambientlightsensor.h | 2 +- src/plugins/sensors/simulator/simulatorcommon.h | 6 +++--- src/plugins/sensors/simulator/simulatorcompass.h | 2 +- src/plugins/sensors/simulator/simulatorirproximitysensor.h | 2 +- src/plugins/sensors/simulator/simulatorlightsensor.h | 2 +- src/plugins/sensors/simulator/simulatormagnetometer.h | 2 +- src/plugins/sensors/simulator/simulatorproximitysensor.h | 2 +- src/plugins/sensors/winrt/winrtaccelerometer.h | 4 ++-- src/plugins/sensors/winrt/winrtambientlightsensor.h | 4 ++-- src/plugins/sensors/winrt/winrtcompass.h | 4 ++-- src/plugins/sensors/winrt/winrtgyroscope.h | 6 +++--- src/plugins/sensors/winrt/winrtorientationsensor.h | 4 ++-- src/plugins/sensors/winrt/winrtrotationsensor.h | 6 +++--- src/sensors/make_sensor.pl | 10 +++++----- src/sensors/qaltimeter.h | 2 +- src/sensors/qambienttemperaturesensor.h | 2 +- src/sensors/qcompass.h | 2 +- src/sensors/qdistancesensor.h | 2 +- src/sensors/qgyroscope.h | 2 +- src/sensors/qholstersensor.h | 2 +- src/sensors/qirproximitysensor.h | 2 +- src/sensors/qlightsensor.h | 2 +- src/sensors/qmagnetometer.h | 2 +- src/sensors/qorientationsensor.h | 2 +- src/sensors/qpressuresensor.h | 2 +- src/sensors/qproximitysensor.h | 2 +- src/sensors/qrotationsensor.h | 2 +- src/sensors/qtapsensor.h | 2 +- src/sensors/qtiltsensor.h | 2 +- tests/auto/qsensor/test_sensorimpl.h | 2 +- 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 createRecognizers() Q_DECL_OVERRIDE; + QList 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 createRecognizers() Q_DECL_OVERRIDE; + QList 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 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 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 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 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 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 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 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 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 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 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 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(); -- cgit v1.2.1