From 2c595c382c50a5632b14eda00d85a9b7fcb09b5d Mon Sep 17 00:00:00 2001
From: Alexander Volkov <a.volkov@rusbitech.ru>
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 <lorn.potter@canonical.com>
---
 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 +-
 99 files changed, 279 insertions(+), 279 deletions(-)

(limited to 'src')

diff --git a/src/imports/sensors/qmlaccelerometer.h b/src/imports/sensors/qmlaccelerometer.h
index 4c759a83..e04b9712 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 e16f65aa..04938b53 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 5fc1a4e0..4de42f31 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 0171da40..31ec72fa 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 cd5de19d..ef4fd22f 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 a7635f53..e60e0e7e 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 9d3f5c79..010e4f04 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 8b6eef73..630d1d85 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 054451bc..8ba1d489 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 abc886b2..c77b4bfe 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 e55a3659..3c3c2bae 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 896279d0..bdb1b1e4 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 4a99b461..6304d69c 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 c785dd87..8bab8cfa 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 0c79c3dd..c0760ac9 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 ec50a463..7cd4acaa 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 c5f560ac..260cb2c2 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 548ff578..c922cb8c 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 1478e70d..d9c57e80 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 6522882e..73d7db56 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 89fdb4d8..124475ad 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 072f8402..d0c8f706 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 28e511c3..fdc0a6fe 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 3b8c5ecd..9e402cf6 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 c2a1fc66..4217eec3 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 79b6cf4d..87a93f16 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 679a4430..295cb5f7 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 a12845cb..3080e2a6 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 8e143459..6d674ab5 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 46d16326..21c85664 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 397ae071..96814eb8 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 b13e5f90..9b8bf0b4 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 739501db..bfd36db0 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 462695bc..e98f0484 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 e8083398..16a7c41b 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 14ac986b..9dd5629d 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 1f708fa3..3c94c138 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 5cceccc4..1b6a4359 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 a007f3c4..5a3110c2 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 ae6aeaf3..0fe90a61 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 78a93380..1640033b 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 73c674c1..6c890f64 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 816947e4..5e775b64 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 8d005fd3..3bcaf413 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 83950ea3..3d10b9a1 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 7afdc38a..01265a02 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 f1c9163f..98b8f974 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 9562acaf..71db69d3 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 60b201ee..30d79e37 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 e1acd239..14c07d66 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 b62aad9e..959113f1 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 14b6cc03..4ac73a97 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 997b1dfa..2babc92a 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 3969bb1a..0d7fea49 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 f4ab34a5..2c55eac3 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 4cff4fce..0d69391f 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 fbcc82e9..af89bf77 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 23be816b..89d7bf78 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 d0062a0b..9a71550e 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 d1ad60a2..9afe9b41 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 817ef519..d9346a94 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 b772e537..ece68a58 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 c1aa27da..9d8faa6c 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 8f6f80b8..03f29556 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 1828b0a6..fac59fe8 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 16702da3..d8b96640 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 a4e1d08a..f9150f6d 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 3e5e0538..7e7f5c33 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 d7251591..7e9edb4c 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 12605c39..a4205867 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 ecac5be4..0aadffe6 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 084b10d1..e47f24d0 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 a9e64754..69162c69 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 6173631d..db20968b 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 78d8f846..3af3a526 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 f602d464..facbad41 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 22b72873..16e6f6bb 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 c81de280..1d51735d 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 092b36e0..7522bae7 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 625417f5..fd2ce113 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 74fb9cdf..2448b00f 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 4f56bf0a..dc4abf85 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 47c39911..ef2a9226 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 6f36923a..bfa81472 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 0d609b4d..50c9e83b 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 181c6112..4198b15a 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 169f38c1..0d22c746 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 499a695f..a6aef947 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 dc541793..7d7e287e 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 253e05b4..43d02899 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 153741c4..2941d6e0 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 0b16b46f..03f1871e 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 25ad0405..f8b0fbfb 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 703abb3e..89823ca2 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 5deb16bf..29ac235f 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 33cd4b2b..46a8b218 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 de2053bb..d6c43acc 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 d6207a17..31ba67f6 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 6f83a347..2e0d0a78 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
-- 
cgit v1.2.3