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>

10 files changed, 22 insertions, 22 deletions

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