diff options
author | Samuel Gaist <samuel.gaist@edeltech.ch> | 2013-11-18 23:07:09 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-19 13:28:36 +0100 |
commit | 400ad25d72b8b2d9a10057953a88d7d64b9bc0a9 (patch) | |
tree | c3f14ba845cc331c744d5623d5abe5b90814fc91 /src/plugins/sensors/android | |
parent | a840cbffba476205eba81f56f40ec32cea6097cc (diff) |
Make QtSensors use Q_DECL_OVERRIDE
This patch aims to make QtSensors uses Q_DECL_OVERRIDE uniformly across
the module
Task-number: QTBUG-27392
Change-Id: I5f814f93307159175f92e29a9990587c03cce96f
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Diffstat (limited to 'src/plugins/sensors/android')
8 files changed, 16 insertions, 16 deletions
diff --git a/src/plugins/sensors/android/src/androidaccelerometer.h b/src/plugins/sensors/android/src/androidaccelerometer.h index 6c95fdb3..31363014 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); private: - virtual void onAccuracyChanged(jint accuracy); - virtual void onSensorChanged(jlong timestamp, const jfloat *values, uint size); + void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE; + void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE; }; diff --git a/src/plugins/sensors/android/src/androidcommonsensor.h b/src/plugins/sensors/android/src/androidcommonsensor.h index 40f118ed..396f4105 100644 --- a/src/plugins/sensors/android/src/androidcommonsensor.h +++ b/src/plugins/sensors/android/src/androidcommonsensor.h @@ -63,13 +63,13 @@ public: if (m_isStarted) stop(); } - virtual void start() + void start() Q_DECL_OVERRIDE { if (AndroidSensors::registerListener(m_type, this, sensor()->dataRate())) m_isStarted = true; } - virtual void stop() + void stop() Q_DECL_OVERRIDE { if (m_isStarted) { m_isStarted = false; diff --git a/src/plugins/sensors/android/src/androidgyroscope.h b/src/plugins/sensors/android/src/androidgyroscope.h index 3b633b7c..15e1ebbd 100644 --- a/src/plugins/sensors/android/src/androidgyroscope.h +++ b/src/plugins/sensors/android/src/androidgyroscope.h @@ -50,8 +50,8 @@ class AndroidGyroscope : public AndroidCommonSensor<QGyroscopeReading> public: AndroidGyroscope(AndroidSensors::AndroidSensorType type, QSensor *sensor); private: - virtual void onAccuracyChanged(jint accuracy); - virtual void onSensorChanged(jlong timestamp, const jfloat *values, uint size); + void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE; + void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE; }; #endif // ANDROIDGYROSCOPE_H diff --git a/src/plugins/sensors/android/src/androidlight.h b/src/plugins/sensors/android/src/androidlight.h index fdea3edb..5cf44286 100644 --- a/src/plugins/sensors/android/src/androidlight.h +++ b/src/plugins/sensors/android/src/androidlight.h @@ -50,8 +50,8 @@ class AndroidLight : public AndroidCommonSensor<QLightReading> public: AndroidLight(AndroidSensors::AndroidSensorType type, QSensor *sensor); private: - virtual void onAccuracyChanged(jint accuracy); - virtual void onSensorChanged(jlong timestamp, const jfloat *values, uint size); + void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE; + void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE; }; #endif // ANDROIDLIGHT_H diff --git a/src/plugins/sensors/android/src/androidmagnetometer.h b/src/plugins/sensors/android/src/androidmagnetometer.h index 57d9f36d..3f1a59c2 100644 --- a/src/plugins/sensors/android/src/androidmagnetometer.h +++ b/src/plugins/sensors/android/src/androidmagnetometer.h @@ -50,8 +50,8 @@ class AndroidMagnetometer : public AndroidCommonSensor<QMagnetometerReading> public: AndroidMagnetometer(AndroidSensors::AndroidSensorType type, QSensor *sensor); private: - virtual void onAccuracyChanged(jint accuracy); - virtual void onSensorChanged(jlong timestamp, const jfloat *values, uint size); + void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE; + void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE; }; #endif // ANDROIDMAGNETOMETER_H diff --git a/src/plugins/sensors/android/src/androidproximity.h b/src/plugins/sensors/android/src/androidproximity.h index 1911798d..b036d896 100644 --- a/src/plugins/sensors/android/src/androidproximity.h +++ b/src/plugins/sensors/android/src/androidproximity.h @@ -51,8 +51,8 @@ class AndroidProximity : public AndroidCommonSensor<QProximityReading> public: AndroidProximity(AndroidSensors::AndroidSensorType type, QSensor *sensor); private: - virtual void onAccuracyChanged(jint accuracy); - virtual void onSensorChanged(jlong timestamp, const jfloat *values, uint size); + void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE; + void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE; qreal m_maximumRange; }; diff --git a/src/plugins/sensors/android/src/androidrotation.h b/src/plugins/sensors/android/src/androidrotation.h index cd2c4d65..63a8e0f1 100644 --- a/src/plugins/sensors/android/src/androidrotation.h +++ b/src/plugins/sensors/android/src/androidrotation.h @@ -49,8 +49,8 @@ class AndroidRotation : public AndroidCommonSensor<QRotationReading> public: AndroidRotation(AndroidSensors::AndroidSensorType type, QSensor *sensor); private: - virtual void onAccuracyChanged(jint accuracy); - virtual void onSensorChanged(jlong timestamp, const jfloat *values, uint size); + void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE; + void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE; }; #endif // ANDROIDROTATION_H diff --git a/src/plugins/sensors/android/src/androidtemperature.h b/src/plugins/sensors/android/src/androidtemperature.h index 667169cd..67250931 100644 --- a/src/plugins/sensors/android/src/androidtemperature.h +++ b/src/plugins/sensors/android/src/androidtemperature.h @@ -51,8 +51,8 @@ class AndroidTemperature : public AndroidCommonSensor<QAmbientTemperatureReading public: AndroidTemperature(AndroidSensors::AndroidSensorType type, QSensor *sensor); private: - virtual void onAccuracyChanged(jint accuracy); - virtual void onSensorChanged(jlong timestamp, const jfloat *values, uint size); + void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE; + void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE; }; #endif // ANDROIDTEMPERATURE_H |