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>

52 files changed, 127 insertions, 127 deletions

diff --git a/src/plugins/sensors/android/src/androidaccelerometer.h b/src/plugins/sensors/android/src/androidaccelerometer.h
index b13e5f9..9b8bf0b 100644
--- a/src/plugins/sensors/android/src/androidaccelerometer.h
+++ b/src/plugins/sensors/android/src/androidaccelerometer.h
@@ -51,8 +51,8 @@ public:
     AndroidAccelerometer(AndroidSensors::AndroidSensorType type, QSensor *sensor);
     static AndroidSensors::AndroidSensorType modeToSensor(QAccelerometer::AccelerationMode mode);
 private:
-    void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
-    void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+    void onAccuracyChanged(jint accuracy) override;
+    void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
 
 private Q_SLOTS:
     void applyAccelerationMode();
diff --git a/src/plugins/sensors/android/src/androidcommonsensor.h b/src/plugins/sensors/android/src/androidcommonsensor.h
index 739501d..bfd36db 100644
--- a/src/plugins/sensors/android/src/androidcommonsensor.h
+++ b/src/plugins/sensors/android/src/androidcommonsensor.h
@@ -61,13 +61,13 @@ public:
         if (m_isStarted)
             stop();
     }
-    void start() Q_DECL_OVERRIDE
+    void start() override
     {
         if (AndroidSensors::registerListener(m_type, this, sensor()->dataRate()))
             m_isStarted = true;
     }
 
-    void stop() Q_DECL_OVERRIDE
+    void stop() override
     {
         if (m_isStarted) {
             m_isStarted = false;
diff --git a/src/plugins/sensors/android/src/androidcompass.cpp b/src/plugins/sensors/android/src/androidcompass.cpp
index 462695b..e98f048 100644
--- a/src/plugins/sensors/android/src/androidcompass.cpp
+++ b/src/plugins/sensors/android/src/androidcompass.cpp
@@ -64,12 +64,12 @@ public:
         AndroidSensors::unregisterListener(AndroidSensors::TYPE_ACCELEROMETER, this);
     }
 
-    void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE
+    void onAccuracyChanged(jint accuracy) override
     {
         Q_UNUSED(accuracy);
     }
 
-    void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) Q_DECL_OVERRIDE
+    void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) override
     {
         if (size < 3)
             return;
@@ -104,12 +104,12 @@ public:
         AndroidSensors::unregisterListener(AndroidSensors::TYPE_MAGNETIC_FIELD, this);
     }
 
-    void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE
+    void onAccuracyChanged(jint accuracy) override
     {
         Q_UNUSED(accuracy);
     }
 
-    void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) Q_DECL_OVERRIDE
+    void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) override
     {
         if (size < 3)
             return;
diff --git a/src/plugins/sensors/android/src/androidcompass.h b/src/plugins/sensors/android/src/androidcompass.h
index e808339..16a7c41 100644
--- a/src/plugins/sensors/android/src/androidcompass.h
+++ b/src/plugins/sensors/android/src/androidcompass.h
@@ -56,8 +56,8 @@ public:
     AndroidCompass(QSensor *sensor);
     ~AndroidCompass();
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
 private:
     AndroidAccelerometerListener *m_accelerometerListener;
diff --git a/src/plugins/sensors/android/src/androidgyroscope.h b/src/plugins/sensors/android/src/androidgyroscope.h
index 14ac986..9dd5629 100644
--- a/src/plugins/sensors/android/src/androidgyroscope.h
+++ b/src/plugins/sensors/android/src/androidgyroscope.h
@@ -48,8 +48,8 @@ class AndroidGyroscope : public AndroidCommonSensor<QGyroscopeReading>
 public:
     AndroidGyroscope(AndroidSensors::AndroidSensorType type, QSensor *sensor);
 private:
-    void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
-    void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+    void onAccuracyChanged(jint accuracy) override;
+    void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
 };
 
 #endif // ANDROIDGYROSCOPE_H
diff --git a/src/plugins/sensors/android/src/androidlight.h b/src/plugins/sensors/android/src/androidlight.h
index 1f708fa..3c94c13 100644
--- a/src/plugins/sensors/android/src/androidlight.h
+++ b/src/plugins/sensors/android/src/androidlight.h
@@ -48,8 +48,8 @@ class AndroidLight : public AndroidCommonSensor<QLightReading>
 public:
     AndroidLight(AndroidSensors::AndroidSensorType type, QSensor *sensor);
 private:
-    void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
-    void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+    void onAccuracyChanged(jint accuracy) override;
+    void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
 };
 
 #endif // ANDROIDLIGHT_H
diff --git a/src/plugins/sensors/android/src/androidmagnetometer.h b/src/plugins/sensors/android/src/androidmagnetometer.h
index 5cceccc..1b6a435 100644
--- a/src/plugins/sensors/android/src/androidmagnetometer.h
+++ b/src/plugins/sensors/android/src/androidmagnetometer.h
@@ -48,8 +48,8 @@ class AndroidMagnetometer : public AndroidCommonSensor<QMagnetometerReading>
 public:
     AndroidMagnetometer(AndroidSensors::AndroidSensorType type, QSensor *sensor);
 private:
-    void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
-    void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+    void onAccuracyChanged(jint accuracy) override;
+    void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
 };
 
 #endif // ANDROIDMAGNETOMETER_H
diff --git a/src/plugins/sensors/android/src/androidproximity.h b/src/plugins/sensors/android/src/androidproximity.h
index a007f3c..5a3110c 100644
--- a/src/plugins/sensors/android/src/androidproximity.h
+++ b/src/plugins/sensors/android/src/androidproximity.h
@@ -49,8 +49,8 @@ class AndroidProximity : public AndroidCommonSensor<QProximityReading>
 public:
     AndroidProximity(AndroidSensors::AndroidSensorType type, QSensor *sensor);
 private:
-    void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
-    void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+    void onAccuracyChanged(jint accuracy) override;
+    void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
     qreal m_maximumRange;
 };
 
diff --git a/src/plugins/sensors/android/src/androidrotation.h b/src/plugins/sensors/android/src/androidrotation.h
index ae6aeaf..0fe90a6 100644
--- a/src/plugins/sensors/android/src/androidrotation.h
+++ b/src/plugins/sensors/android/src/androidrotation.h
@@ -47,8 +47,8 @@ class AndroidRotation : public AndroidCommonSensor<QRotationReading>
 public:
     AndroidRotation(AndroidSensors::AndroidSensorType type, QSensor *sensor);
 private:
-    void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
-    void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+    void onAccuracyChanged(jint accuracy) override;
+    void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
 };
 
 #endif // ANDROIDROTATION_H
diff --git a/src/plugins/sensors/android/src/androidtemperature.h b/src/plugins/sensors/android/src/androidtemperature.h
index 78a9338..1640033 100644
--- a/src/plugins/sensors/android/src/androidtemperature.h
+++ b/src/plugins/sensors/android/src/androidtemperature.h
@@ -49,8 +49,8 @@ class AndroidTemperature : public AndroidCommonSensor<QAmbientTemperatureReading
 public:
     AndroidTemperature(AndroidSensors::AndroidSensorType type, QSensor *sensor);
 private:
-    void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
-    void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+    void onAccuracyChanged(jint accuracy) override;
+    void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
 };
 
 #endif // ANDROIDTEMPERATURE_H
diff --git a/src/plugins/sensors/dummy/dummyaccelerometer.h b/src/plugins/sensors/dummy/dummyaccelerometer.h
index 73c674c..6c890f6 100644
--- a/src/plugins/sensors/dummy/dummyaccelerometer.h
+++ b/src/plugins/sensors/dummy/dummyaccelerometer.h
@@ -50,7 +50,7 @@ public:
 
     dummyaccelerometer(QSensor *sensor);
 
-    void poll() Q_DECL_OVERRIDE;
+    void poll() override;
 private:
     QAccelerometerReading m_reading;
 };
diff --git a/src/plugins/sensors/dummy/dummycommon.h b/src/plugins/sensors/dummy/dummycommon.h
index 816947e..5e775b6 100644
--- a/src/plugins/sensors/dummy/dummycommon.h
+++ b/src/plugins/sensors/dummy/dummycommon.h
@@ -48,10 +48,10 @@ class dummycommon : public QSensorBackend
 public:
     dummycommon(QSensor *sensor);
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
     virtual void poll() = 0;
-    void timerEvent(QTimerEvent * /*event*/) Q_DECL_OVERRIDE;
+    void timerEvent(QTimerEvent * /*event*/) override;
 
 protected:
     quint64 getTimestamp();
diff --git a/src/plugins/sensors/dummy/dummylightsensor.h b/src/plugins/sensors/dummy/dummylightsensor.h
index 8d005fd..3bcaf41 100644
--- a/src/plugins/sensors/dummy/dummylightsensor.h
+++ b/src/plugins/sensors/dummy/dummylightsensor.h
@@ -50,7 +50,7 @@ public:
 
     dummylightsensor(QSensor *sensor);
 
-    void poll() Q_DECL_OVERRIDE;
+    void poll() override;
 private:
     QAmbientLightReading m_reading;
 };
diff --git a/src/plugins/sensors/generic/genericalssensor.h b/src/plugins/sensors/generic/genericalssensor.h
index 83950ea..3d10b9a 100644
--- a/src/plugins/sensors/generic/genericalssensor.h
+++ b/src/plugins/sensors/generic/genericalssensor.h
@@ -51,10 +51,10 @@ public:
 
     genericalssensor(QSensor *sensor);
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
-    bool filter(QLightReading *reading) Q_DECL_OVERRIDE;
+    bool filter(QLightReading *reading) override;
 
 private:
     QAmbientLightReading m_reading;
diff --git a/src/plugins/sensors/generic/genericorientationsensor.h b/src/plugins/sensors/generic/genericorientationsensor.h
index 7afdc38..01265a0 100644
--- a/src/plugins/sensors/generic/genericorientationsensor.h
+++ b/src/plugins/sensors/generic/genericorientationsensor.h
@@ -51,10 +51,10 @@ public:
 
     genericorientationsensor(QSensor *sensor);
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
-    bool filter(QAccelerometerReading *reading) Q_DECL_OVERRIDE;
+    bool filter(QAccelerometerReading *reading) override;
 
 private:
     QOrientationReading m_reading;
diff --git a/src/plugins/sensors/generic/genericrotationsensor.h b/src/plugins/sensors/generic/genericrotationsensor.h
index f1c9163..98b8f97 100644
--- a/src/plugins/sensors/generic/genericrotationsensor.h
+++ b/src/plugins/sensors/generic/genericrotationsensor.h
@@ -52,10 +52,10 @@ public:
 
     genericrotationsensor(QSensor *sensor);
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
-    bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+    bool filter(QSensorReading *reading) override;
 
 private:
     QRotationReading m_reading;
diff --git a/src/plugins/sensors/generic/generictiltsensor.h b/src/plugins/sensors/generic/generictiltsensor.h
index 9562aca..71db69d 100644
--- a/src/plugins/sensors/generic/generictiltsensor.h
+++ b/src/plugins/sensors/generic/generictiltsensor.h
@@ -55,14 +55,14 @@ public:
 
     GenericTiltSensor(QSensor *sensor);
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
     Q_INVOKABLE void calibrate();
 
-    bool filter(QAccelerometerReading *reading) Q_DECL_OVERRIDE;
+    bool filter(QAccelerometerReading *reading) override;
 
-    bool isFeatureSupported(QSensor::Feature feature) const Q_DECL_OVERRIDE;
+    bool isFeatureSupported(QSensor::Feature feature) const override;
 
 private:
     QTiltReading m_reading;
diff --git a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h
index 60b201e..30d79e3 100644
--- a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h
+++ b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h
@@ -56,11 +56,11 @@ public:
     IIOSensorProxyCompass(QSensor *sensor);
     ~IIOSensorProxyCompass();
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
 protected:
-    void updateProperties(const QVariantMap &changedProperties) Q_DECL_OVERRIDE;
+    void updateProperties(const QVariantMap &changedProperties) override;
 
 private:
     void updateAzimuth(double azimuth);
diff --git a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxylightsensor.h b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxylightsensor.h
index e1acd23..14c07d6 100644
--- a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxylightsensor.h
+++ b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxylightsensor.h
@@ -56,11 +56,11 @@ public:
     IIOSensorProxyLightSensor(QSensor *sensor);
     ~IIOSensorProxyLightSensor();
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
 protected:
-    void updateProperties(const QVariantMap &changedProperties) Q_DECL_OVERRIDE;
+    void updateProperties(const QVariantMap &changedProperties) override;
 
 private:
     void updateLightLevel(double lux);
diff --git a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h
index b62aad9..959113f 100644
--- a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h
+++ b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h
@@ -56,11 +56,11 @@ public:
     IIOSensorProxyOrientationSensor(QSensor *sensor);
     ~IIOSensorProxyOrientationSensor();
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
 protected:
-    void updateProperties(const QVariantMap &changedProperties) Q_DECL_OVERRIDE;
+    void updateProperties(const QVariantMap &changedProperties) override;
 
 private:
     void updateOrientation(const QString &orientation);
diff --git a/src/plugins/sensors/ios/iosaccelerometer.h b/src/plugins/sensors/ios/iosaccelerometer.h
index 14b6cc0..4ac73a9 100644
--- a/src/plugins/sensors/ios/iosaccelerometer.h
+++ b/src/plugins/sensors/ios/iosaccelerometer.h
@@ -53,10 +53,10 @@ public:
     static char const * const id;
 
     explicit IOSAccelerometer(QSensor *sensor);
-    void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+    void timerEvent(QTimerEvent *) override;
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
 private:
     CMMotionManager *m_motionManager;
diff --git a/src/plugins/sensors/ios/ioscompass.h b/src/plugins/sensors/ios/ioscompass.h
index 997b1df..2babc92 100644
--- a/src/plugins/sensors/ios/ioscompass.h
+++ b/src/plugins/sensors/ios/ioscompass.h
@@ -55,8 +55,8 @@ public:
     explicit IOSCompass(QSensor *sensor);
     ~IOSCompass();
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
     void headingChanged(qreal heading, quint64 timestamp, qreal calibrationLevel);
 
diff --git a/src/plugins/sensors/ios/iosgyroscope.h b/src/plugins/sensors/ios/iosgyroscope.h
index 3969bb1..0d7fea4 100644
--- a/src/plugins/sensors/ios/iosgyroscope.h
+++ b/src/plugins/sensors/ios/iosgyroscope.h
@@ -53,10 +53,10 @@ public:
     static char const * const id;
 
     explicit IOSGyroscope(QSensor *sensor);
-    void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+    void timerEvent(QTimerEvent *) override;
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
 private:
     CMMotionManager *m_motionManager;
diff --git a/src/plugins/sensors/ios/iosmagnetometer.h b/src/plugins/sensors/ios/iosmagnetometer.h
index f4ab34a..2c55eac 100644
--- a/src/plugins/sensors/ios/iosmagnetometer.h
+++ b/src/plugins/sensors/ios/iosmagnetometer.h
@@ -53,10 +53,10 @@ public:
     static char const * const id;
 
     explicit IOSMagnetometer(QSensor *sensor);
-    void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+    void timerEvent(QTimerEvent *) override;
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
     void startMagnetometer();
     void startDeviceMotion();
diff --git a/src/plugins/sensors/ios/iosproximitysensor.h b/src/plugins/sensors/ios/iosproximitysensor.h
index 4cff4fc..0d69391 100644
--- a/src/plugins/sensors/ios/iosproximitysensor.h
+++ b/src/plugins/sensors/ios/iosproximitysensor.h
@@ -55,8 +55,8 @@ public:
     explicit IOSProximitySensor(QSensor *sensor);
     ~IOSProximitySensor();
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
     void proximityChanged(bool close);
     static bool available();
diff --git a/src/plugins/sensors/linux/linuxsysaccelerometer.h b/src/plugins/sensors/linux/linuxsysaccelerometer.h
index fbcc82e..af89bf7 100644
--- a/src/plugins/sensors/linux/linuxsysaccelerometer.h
+++ b/src/plugins/sensors/linux/linuxsysaccelerometer.h
@@ -53,10 +53,10 @@ public:
     LinuxSysAccelerometer(QSensor *sensor);
     ~LinuxSysAccelerometer();
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
     void poll();
-    void timerEvent(QTimerEvent * /*event*/) Q_DECL_OVERRIDE;
+    void timerEvent(QTimerEvent * /*event*/) override;
 
 private:
     QAccelerometerReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h
index 23be816..89d7bf7 100644
--- a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h
+++ b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h
@@ -55,10 +55,10 @@ public:
     static char const * const id;
     sensorfwaccelerometer(QSensor *sensor);
 protected:
-    bool doConnect() Q_DECL_OVERRIDE;
-    QString sensorName() const Q_DECL_OVERRIDE;
-    qreal correctionFactor() const Q_DECL_OVERRIDE;
-    void start() Q_DECL_OVERRIDE;
+    bool doConnect() override;
+    QString sensorName() const override;
+    qreal correctionFactor() const override;
+    void start() override;
     virtual void init();
 
 private:
diff --git a/src/plugins/sensors/sensorfw/sensorfwals.h b/src/plugins/sensors/sensorfw/sensorfwals.h
index d0062a0..9a71550 100644
--- a/src/plugins/sensors/sensorfw/sensorfwals.h
+++ b/src/plugins/sensors/sensorfw/sensorfwals.h
@@ -55,9 +55,9 @@ public:
     static char const * const id;
     Sensorfwals(QSensor *sensor);
 protected:
-    bool doConnect() Q_DECL_OVERRIDE;
-    QString sensorName() const Q_DECL_OVERRIDE;
-    void start() Q_DECL_OVERRIDE;
+    bool doConnect() override;
+    QString sensorName() const override;
+    void start() override;
     virtual void init();
 
 private:
diff --git a/src/plugins/sensors/sensorfw/sensorfwcompass.h b/src/plugins/sensors/sensorfw/sensorfwcompass.h
index d1ad60a..9afe9b4 100644
--- a/src/plugins/sensors/sensorfw/sensorfwcompass.h
+++ b/src/plugins/sensors/sensorfw/sensorfwcompass.h
@@ -55,9 +55,9 @@ public:
     static char const * const id;
     SensorfwCompass(QSensor *sensor);
 protected:
-    bool doConnect() Q_DECL_OVERRIDE;
-    QString sensorName() const Q_DECL_OVERRIDE;
-    void start() Q_DECL_OVERRIDE;
+    bool doConnect() override;
+    QString sensorName() const override;
+    void start() override;
     virtual void init();
 private:
     QCompassReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwgyroscope.h b/src/plugins/sensors/sensorfw/sensorfwgyroscope.h
index 817ef51..d9346a9 100644
--- a/src/plugins/sensors/sensorfw/sensorfwgyroscope.h
+++ b/src/plugins/sensors/sensorfw/sensorfwgyroscope.h
@@ -57,10 +57,10 @@ public:
     static char const * const id;
     SensorfwGyroscope(QSensor *sensor);
 protected:
-    bool doConnect() Q_DECL_OVERRIDE;
-    QString sensorName() const Q_DECL_OVERRIDE;
-    qreal correctionFactor() const Q_DECL_OVERRIDE;
-    void start() Q_DECL_OVERRIDE;
+    bool doConnect() override;
+    QString sensorName() const override;
+    qreal correctionFactor() const override;
+    void start() override;
     virtual void init();
 
 private:
diff --git a/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h b/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h
index b772e53..ece68a5 100644
--- a/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h
@@ -54,9 +54,9 @@ public:
 
     SensorfwIrProximitySensor(QSensor *sensor);
 protected:
-    bool doConnect() Q_DECL_OVERRIDE;
-    QString sensorName() const Q_DECL_OVERRIDE;
-    void start() Q_DECL_OVERRIDE;
+    bool doConnect() override;
+    QString sensorName() const override;
+    void start() override;
     virtual void init();
 private:
     QIRProximityReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwlightsensor.h b/src/plugins/sensors/sensorfw/sensorfwlightsensor.h
index c1aa27d..9d8faa6 100644
--- a/src/plugins/sensors/sensorfw/sensorfwlightsensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwlightsensor.h
@@ -55,9 +55,9 @@ public:
     static char const * const id;
     SensorfwLightSensor(QSensor *sensor);
 protected:
-    bool doConnect() Q_DECL_OVERRIDE;
-    QString sensorName() const Q_DECL_OVERRIDE;
-    void start() Q_DECL_OVERRIDE;
+    bool doConnect() override;
+    QString sensorName() const override;
+    void start() override;
     virtual void init();
 private:
     QLightReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h
index 8f6f80b..03f2955 100644
--- a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h
+++ b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h
@@ -56,10 +56,10 @@ public:
     static char const * const id;
     SensorfwMagnetometer(QSensor *sensor);
 protected:
-    bool doConnect() Q_DECL_OVERRIDE;
-    void start() Q_DECL_OVERRIDE;
-    QString sensorName() const Q_DECL_OVERRIDE;
-    qreal correctionFactor() const Q_DECL_OVERRIDE;
+    bool doConnect() override;
+    void start() override;
+    QString sensorName() const override;
+    qreal correctionFactor() const override;
     virtual void init();
 
 private:
diff --git a/src/plugins/sensors/sensorfw/sensorfworientationsensor.h b/src/plugins/sensors/sensorfw/sensorfworientationsensor.h
index 1828b0a..fac59fe 100644
--- a/src/plugins/sensors/sensorfw/sensorfworientationsensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfworientationsensor.h
@@ -55,9 +55,9 @@ public:
     static char const * const id;
     SensorfwOrientationSensor(QSensor *sensor);
 protected:
-    bool doConnect() Q_DECL_OVERRIDE;
-    QString sensorName() const Q_DECL_OVERRIDE;
-    void start() Q_DECL_OVERRIDE;
+    bool doConnect() override;
+    QString sensorName() const override;
+    void start() override;
     virtual void init();
 private:
     QOrientationReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h
index 16702da..d8b9664 100644
--- a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h
@@ -55,9 +55,9 @@ public:
     static char const * const id;
     SensorfwProximitySensor(QSensor *sensor);
 protected:
-    bool doConnect() Q_DECL_OVERRIDE;
-    QString sensorName() const Q_DECL_OVERRIDE;
-    void start() Q_DECL_OVERRIDE;
+    bool doConnect() override;
+    QString sensorName() const override;
+    void start() override;
     virtual void init();
 
 private:
diff --git a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h
index a4e1d08..f9150f6 100644
--- a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h
@@ -57,9 +57,9 @@ public:
     static char const * const id;
     SensorfwRotationSensor(QSensor *sensor);
 protected:
-    bool doConnect() Q_DECL_OVERRIDE;
-    QString sensorName() const Q_DECL_OVERRIDE;
-    void start() Q_DECL_OVERRIDE;
+    bool doConnect() override;
+    QString sensorName() const override;
+    void start() override;
     virtual void init();
 private:
     QRotationReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h
index 3e5e053..7e7f5c3 100644
--- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h
+++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h
@@ -60,8 +60,8 @@ public:
 
 protected:
     virtual bool doConnect()=0;
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
     static const float GRAVITY_EARTH;
     static const float GRAVITY_EARTH_THOUSANDTH;    //for speed
diff --git a/src/plugins/sensors/sensorfw/sensorfwtapsensor.h b/src/plugins/sensors/sensorfw/sensorfwtapsensor.h
index d725159..7e9edb4 100644
--- a/src/plugins/sensors/sensorfw/sensorfwtapsensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwtapsensor.h
@@ -55,9 +55,9 @@ public:
     static char const * const id;
     SensorfwTapSensor(QSensor *sensor);
 protected:
-    bool doConnect() Q_DECL_OVERRIDE;
-    void start() Q_DECL_OVERRIDE;
-    QString sensorName() const Q_DECL_OVERRIDE;
+    bool doConnect() override;
+    void start() override;
+    QString sensorName() const override;
     virtual void init();
 private:
     QTapReading m_reading;
diff --git a/src/plugins/sensors/simulator/simulatoraccelerometer.h b/src/plugins/sensors/simulator/simulatoraccelerometer.h
index 12605c3..a420586 100644
--- a/src/plugins/sensors/simulator/simulatoraccelerometer.h
+++ b/src/plugins/sensors/simulator/simulatoraccelerometer.h
@@ -50,7 +50,7 @@ public:
 
     SimulatorAccelerometer(QSensor *sensor);
 
-    void poll() Q_DECL_OVERRIDE;
+    void poll() override;
 private:
     QAccelerometerReading m_reading;
 };
diff --git a/src/plugins/sensors/simulator/simulatorambientlightsensor.h b/src/plugins/sensors/simulator/simulatorambientlightsensor.h
index ecac5be..0aadffe 100644
--- a/src/plugins/sensors/simulator/simulatorambientlightsensor.h
+++ b/src/plugins/sensors/simulator/simulatorambientlightsensor.h
@@ -50,7 +50,7 @@ public:
 
     SimulatorAmbientLightSensor(QSensor *sensor);
 
-    void poll() Q_DECL_OVERRIDE;
+    void poll() override;
 private:
     QAmbientLightReading m_reading;
 };
diff --git a/src/plugins/sensors/simulator/simulatorcommon.h b/src/plugins/sensors/simulator/simulatorcommon.h
index 084b10d..e47f24d 100644
--- a/src/plugins/sensors/simulator/simulatorcommon.h
+++ b/src/plugins/sensors/simulator/simulatorcommon.h
@@ -92,10 +92,10 @@ class SimulatorCommon : public QSensorBackend
 public:
     SimulatorCommon(QSensor *sensor);
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
     virtual void poll() = 0;
-    void timerEvent(QTimerEvent * /*event*/) Q_DECL_OVERRIDE;
+    void timerEvent(QTimerEvent * /*event*/) override;
 
 private:
     int m_timerid;
diff --git a/src/plugins/sensors/simulator/simulatorcompass.h b/src/plugins/sensors/simulator/simulatorcompass.h
index a9e6475..69162c6 100644
--- a/src/plugins/sensors/simulator/simulatorcompass.h
+++ b/src/plugins/sensors/simulator/simulatorcompass.h
@@ -50,7 +50,7 @@ public:
 
     SimulatorCompass(QSensor *sensor);
 
-    void poll() Q_DECL_OVERRIDE;
+    void poll() override;
 private:
     QCompassReading m_reading;
 };
diff --git a/src/plugins/sensors/simulator/simulatorirproximitysensor.h b/src/plugins/sensors/simulator/simulatorirproximitysensor.h
index 6173631..db20968 100644
--- a/src/plugins/sensors/simulator/simulatorirproximitysensor.h
+++ b/src/plugins/sensors/simulator/simulatorirproximitysensor.h
@@ -50,7 +50,7 @@ public:
 
     SimulatorIRProximitySensor(QSensor *sensor);
 
-    void poll() Q_DECL_OVERRIDE;
+    void poll() override;
 private:
     QIRProximityReading m_reading;
 };
diff --git a/src/plugins/sensors/simulator/simulatorlightsensor.h b/src/plugins/sensors/simulator/simulatorlightsensor.h
index 78d8f84..3af3a52 100644
--- a/src/plugins/sensors/simulator/simulatorlightsensor.h
+++ b/src/plugins/sensors/simulator/simulatorlightsensor.h
@@ -50,7 +50,7 @@ public:
 
     SimulatorLightSensor(QSensor *sensor);
 
-    void poll() Q_DECL_OVERRIDE;
+    void poll() override;
 private:
     QLightReading m_reading;
 };
diff --git a/src/plugins/sensors/simulator/simulatormagnetometer.h b/src/plugins/sensors/simulator/simulatormagnetometer.h
index f602d46..facbad4 100644
--- a/src/plugins/sensors/simulator/simulatormagnetometer.h
+++ b/src/plugins/sensors/simulator/simulatormagnetometer.h
@@ -50,7 +50,7 @@ public:
 
     SimulatorMagnetometer(QSensor *sensor);
 
-    void poll() Q_DECL_OVERRIDE;
+    void poll() override;
 private:
     QMagnetometerReading m_reading;
 };
diff --git a/src/plugins/sensors/simulator/simulatorproximitysensor.h b/src/plugins/sensors/simulator/simulatorproximitysensor.h
index 22b7287..16e6f6b 100644
--- a/src/plugins/sensors/simulator/simulatorproximitysensor.h
+++ b/src/plugins/sensors/simulator/simulatorproximitysensor.h
@@ -50,7 +50,7 @@ public:
 
     SimulatorProximitySensor(QSensor *sensor);
 
-    void poll() Q_DECL_OVERRIDE;
+    void poll() override;
 private:
     QProximityReading m_reading;
 };
diff --git a/src/plugins/sensors/winrt/winrtaccelerometer.h b/src/plugins/sensors/winrt/winrtaccelerometer.h
index c81de28..1d51735 100644
--- a/src/plugins/sensors/winrt/winrtaccelerometer.h
+++ b/src/plugins/sensors/winrt/winrtaccelerometer.h
@@ -50,8 +50,8 @@ public:
     WinRtAccelerometer(QSensor *sensor);
     ~WinRtAccelerometer();
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
 private:
     QScopedPointer<WinRtAccelerometerPrivate> d_ptr;
diff --git a/src/plugins/sensors/winrt/winrtambientlightsensor.h b/src/plugins/sensors/winrt/winrtambientlightsensor.h
index 092b36e..7522bae 100644
--- a/src/plugins/sensors/winrt/winrtambientlightsensor.h
+++ b/src/plugins/sensors/winrt/winrtambientlightsensor.h
@@ -50,8 +50,8 @@ public:
     WinRtAmbientLightSensor(QSensor *sensor);
     ~WinRtAmbientLightSensor();
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
 private:
     QScopedPointer<WinRtAmbientLightSensorPrivate> d_ptr;
diff --git a/src/plugins/sensors/winrt/winrtcompass.h b/src/plugins/sensors/winrt/winrtcompass.h
index 625417f..fd2ce11 100644
--- a/src/plugins/sensors/winrt/winrtcompass.h
+++ b/src/plugins/sensors/winrt/winrtcompass.h
@@ -50,8 +50,8 @@ public:
     WinRtCompass(QSensor *sensor);
     ~WinRtCompass();
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
 private:
     QScopedPointer<WinRtCompassPrivate> d_ptr;
diff --git a/src/plugins/sensors/winrt/winrtgyroscope.h b/src/plugins/sensors/winrt/winrtgyroscope.h
index 74fb9cd..2448b00 100644
--- a/src/plugins/sensors/winrt/winrtgyroscope.h
+++ b/src/plugins/sensors/winrt/winrtgyroscope.h
@@ -50,15 +50,15 @@ public:
     WinRtGyroscope(QSensor *sensor);
     ~WinRtGyroscope();
 
-    bool isFeatureSupported(QSensor::Feature feature) const Q_DECL_OVERRIDE
+    bool isFeatureSupported(QSensor::Feature feature) const override
     {
         if (feature == QSensor::AxesOrientation || feature == QSensor::AccelerationMode)
             return true;
         return false;
     }
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
 private:
     QScopedPointer<WinRtGyroscopePrivate> d_ptr;
diff --git a/src/plugins/sensors/winrt/winrtorientationsensor.h b/src/plugins/sensors/winrt/winrtorientationsensor.h
index 4f56bf0..dc4abf8 100644
--- a/src/plugins/sensors/winrt/winrtorientationsensor.h
+++ b/src/plugins/sensors/winrt/winrtorientationsensor.h
@@ -50,8 +50,8 @@ public:
     WinRtOrientationSensor(QSensor *sensor);
     ~WinRtOrientationSensor();
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
 private:
     QScopedPointer<WinRtOrientationSensorPrivate> d_ptr;
diff --git a/src/plugins/sensors/winrt/winrtrotationsensor.h b/src/plugins/sensors/winrt/winrtrotationsensor.h
index 47c3991..ef2a922 100644
--- a/src/plugins/sensors/winrt/winrtrotationsensor.h
+++ b/src/plugins/sensors/winrt/winrtrotationsensor.h
@@ -50,15 +50,15 @@ public:
     WinRtRotationSensor(QSensor *sensor);
     ~WinRtRotationSensor();
 
-    bool isFeatureSupported(QSensor::Feature feature) const Q_DECL_OVERRIDE
+    bool isFeatureSupported(QSensor::Feature feature) const override
     {
         if (feature == QSensor::AxesOrientation || feature == QSensor::AccelerationMode)
             return true;
         return false;
     }
 
-    void start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void start() override;
+    void stop() override;
 
 private:
     QScopedPointer<WinRtRotationSensorPrivate> d_ptr;