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 | |
parent | a840cbffba476205eba81f56f40ec32cea6097cc (diff) | |
download | qtsensors-400ad25d72b8b2d9a10057953a88d7d64b9bc0a9.tar.gz qtsensors-400ad25d72b8b2d9a10057953a88d7d64b9bc0a9.tar.bz2 qtsensors-400ad25d72b8b2d9a10057953a88d7d64b9bc0a9.zip |
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>
64 files changed, 177 insertions, 173 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h index 8df8e65..5df98cc 100644 --- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h @@ -57,12 +57,12 @@ public: explicit QCoverSensorGestureRecognizer(QObject *parent = 0); ~QCoverSensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void cover(); diff --git a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h index a4e74cc..e1e660b 100644 --- a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h @@ -58,11 +58,12 @@ public: explicit QDoubleTapSensorGestureRecognizer(QObject *parent = 0); ~QDoubleTapSensorGestureRecognizer(); - void create(); - QString id() const; - bool start(); - bool stop(); - bool isActive(); + void create() Q_DECL_OVERRIDE; + + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void doubletap(); diff --git a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h index 094d0c6..9f72582 100644 --- a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h @@ -57,12 +57,12 @@ public: explicit QFreefallSensorGestureRecognizer(QObject *parent = 0); ~QFreefallSensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void freefall(); diff --git a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h index cb9d81a..d8dc009 100644 --- a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h @@ -57,11 +57,12 @@ public: explicit QHoverSensorGestureRecognizer(QObject *parent = 0); ~QHoverSensorGestureRecognizer(); - void create(); - QString id() const; - bool start(); - bool stop(); - bool isActive(); + void create() Q_DECL_OVERRIDE; + + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void hover(); diff --git a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h index 2fd249f..37f6605 100644 --- a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h @@ -55,12 +55,12 @@ public: explicit QPickupSensorGestureRecognizer(QObject *parent = 0); ~QPickupSensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void pickup(); diff --git a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h index 232d2ad..647b713 100644 --- a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h @@ -73,12 +73,12 @@ public: QShake2SensorGestureRecognizer(QObject *parent = 0); ~QShake2SensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; int timerTimeout; diff --git a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h index 4945033..5dba87a 100644 --- a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h @@ -56,12 +56,12 @@ public: explicit QSlamSensorGestureRecognizer(QObject *parent = 0); ~QSlamSensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void slam(); diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h index 848a4f0..34455ac 100644 --- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h +++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h @@ -58,11 +58,11 @@ class QtSensorGesturePlugin : public QObject, public QSensorGesturePluginInterfa public: explicit QtSensorGesturePlugin(); ~QtSensorGesturePlugin(); - QList <QSensorGestureRecognizer *> createRecognizers(); + QList <QSensorGestureRecognizer *> createRecognizers() Q_DECL_OVERRIDE; QStringList gestureSignals() const; - QStringList supportedIds() const; - QString name() const { return "QtSensorGestures"; } + QStringList supportedIds() const Q_DECL_OVERRIDE; + QString name() const Q_DECL_OVERRIDE { return "QtSensorGestures"; } }; diff --git a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h index 3319ac5..1729f3e 100644 --- a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h @@ -53,11 +53,13 @@ class QTurnoverSensorGestureRecognizer : public QSensorGestureRecognizer public: explicit QTurnoverSensorGestureRecognizer(QObject *parent = 0); ~QTurnoverSensorGestureRecognizer(); - void create(); - QString id() const; - bool start(); - bool stop(); - bool isActive(); + + void create() Q_DECL_OVERRIDE; + + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void turnover(); diff --git a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h index a4b9ceb..5db192a 100644 --- a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h @@ -63,12 +63,12 @@ public: explicit QTwistSensorGestureRecognizer(QObject *parent = 0); ~QTwistSensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void twistLeft(); diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h index e3ad7a0..a8aef52 100644 --- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h @@ -56,12 +56,12 @@ public: explicit QWhipSensorGestureRecognizer(QObject *parent = 0); ~QWhipSensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; Q_SIGNALS: void whip(); diff --git a/src/plugins/sensorgestures/shake/qshakerecognizer.h b/src/plugins/sensorgestures/shake/qshakerecognizer.h index f34a377..e7478b6 100644 --- a/src/plugins/sensorgestures/shake/qshakerecognizer.h +++ b/src/plugins/sensorgestures/shake/qshakerecognizer.h @@ -66,12 +66,12 @@ public: QShakeSensorGestureRecognizer(QObject *parent = 0); ~QShakeSensorGestureRecognizer(); - void create(); + void create() Q_DECL_OVERRIDE; - QString id() const; - bool start(); - bool stop(); - bool isActive(); + QString id() const Q_DECL_OVERRIDE; + bool start() Q_DECL_OVERRIDE; + bool stop() Q_DECL_OVERRIDE; + bool isActive() Q_DECL_OVERRIDE; QTimer *timer; int timerTimeout; diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h index ea69dd0..939b2a9 100644 --- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h +++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h @@ -57,11 +57,11 @@ public: explicit QShakeSensorGesturePlugin(); ~QShakeSensorGesturePlugin(); - QList <QSensorGestureRecognizer *> createRecognizers(); + QList <QSensorGestureRecognizer *> createRecognizers() Q_DECL_OVERRIDE; QStringList gestureSignals() const; - QStringList supportedIds() const; - QString name() const { return "ShakeGestures"; } + QStringList supportedIds() const Q_DECL_OVERRIDE; + QString name() const Q_DECL_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 6c95fdb..3136301 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 40f118e..396f410 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 3b633b7..15e1ebb 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 fdea3ed..5cf4428 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 57d9f36..3f1a59c 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 1911798..b036d89 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 cd2c4d6..63a8e0f 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 667169c..6725093 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 diff --git a/src/plugins/sensors/dummy/dummyaccelerometer.h b/src/plugins/sensors/dummy/dummyaccelerometer.h index a469e39..ae48dd0 100644 --- a/src/plugins/sensors/dummy/dummyaccelerometer.h +++ b/src/plugins/sensors/dummy/dummyaccelerometer.h @@ -52,7 +52,7 @@ public: dummyaccelerometer(QSensor *sensor); - void poll(); + void poll() Q_DECL_OVERRIDE; private: QAccelerometerReading m_reading; }; diff --git a/src/plugins/sensors/dummy/dummycommon.h b/src/plugins/sensors/dummy/dummycommon.h index a17bd9d..5816e89 100644 --- a/src/plugins/sensors/dummy/dummycommon.h +++ b/src/plugins/sensors/dummy/dummycommon.h @@ -50,10 +50,10 @@ class dummycommon : public QSensorBackend public: dummycommon(QSensor *sensor); - void start(); - void stop(); + void start() Q_DECL_OVERRIDE; + void stop() Q_DECL_OVERRIDE; virtual void poll() = 0; - void timerEvent(QTimerEvent * /*event*/); + void timerEvent(QTimerEvent * /*event*/) Q_DECL_OVERRIDE; protected: quint64 getTimestamp(); diff --git a/src/plugins/sensors/dummy/dummylightsensor.h b/src/plugins/sensors/dummy/dummylightsensor.h index edd95a3..7279ea2 100644 --- a/src/plugins/sensors/dummy/dummylightsensor.h +++ b/src/plugins/sensors/dummy/dummylightsensor.h @@ -52,7 +52,7 @@ public: dummylightsensor(QSensor *sensor); - void poll(); + void poll() Q_DECL_OVERRIDE; private: QAmbientLightReading m_reading; }; diff --git a/src/plugins/sensors/generic/genericalssensor.h b/src/plugins/sensors/generic/genericalssensor.h index 9665745..1ed6e76 100644 --- a/src/plugins/sensors/generic/genericalssensor.h +++ b/src/plugins/sensors/generic/genericalssensor.h @@ -53,10 +53,10 @@ public: genericalssensor(QSensor *sensor); - void start(); - void stop(); + void start() Q_DECL_OVERRIDE; + void stop() Q_DECL_OVERRIDE; - bool filter(QLightReading *reading); + bool filter(QLightReading *reading) Q_DECL_OVERRIDE; private: QAmbientLightReading m_reading; diff --git a/src/plugins/sensors/generic/genericorientationsensor.h b/src/plugins/sensors/generic/genericorientationsensor.h index c212c1b..d1e7d34 100644 --- a/src/plugins/sensors/generic/genericorientationsensor.h +++ b/src/plugins/sensors/generic/genericorientationsensor.h @@ -53,10 +53,10 @@ public: genericorientationsensor(QSensor *sensor); - void start(); - void stop(); + void start() Q_DECL_OVERRIDE; + void stop() Q_DECL_OVERRIDE; - bool filter(QAccelerometerReading *reading); + bool filter(QAccelerometerReading *reading) Q_DECL_OVERRIDE; private: QOrientationReading m_reading; diff --git a/src/plugins/sensors/generic/genericrotationsensor.h b/src/plugins/sensors/generic/genericrotationsensor.h index ffa48ea..693528f 100644 --- a/src/plugins/sensors/generic/genericrotationsensor.h +++ b/src/plugins/sensors/generic/genericrotationsensor.h @@ -54,10 +54,10 @@ public: genericrotationsensor(QSensor *sensor); - void start(); - void stop(); + void start() Q_DECL_OVERRIDE; + void stop() Q_DECL_OVERRIDE; - bool filter(QSensorReading *reading); + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; private: QRotationReading m_reading; diff --git a/src/plugins/sensors/generic/generictiltsensor.h b/src/plugins/sensors/generic/generictiltsensor.h index 0f84ca6..f62c1f5 100644 --- a/src/plugins/sensors/generic/generictiltsensor.h +++ b/src/plugins/sensors/generic/generictiltsensor.h @@ -56,12 +56,12 @@ public: GenericTiltSensor(QSensor *sensor); - void start(); - void stop(); + void start() Q_DECL_OVERRIDE; + void stop() Q_DECL_OVERRIDE; void calibrate(); - bool filter(QAccelerometerReading *reading); + bool filter(QAccelerometerReading *reading) Q_DECL_OVERRIDE; bool isFeatureSupported(QSensor::Feature feature) const Q_DECL_OVERRIDE; diff --git a/src/plugins/sensors/ios/iosaccelerometer.h b/src/plugins/sensors/ios/iosaccelerometer.h index 1a6560b..ba6235f 100644 --- a/src/plugins/sensors/ios/iosaccelerometer.h +++ b/src/plugins/sensors/ios/iosaccelerometer.h @@ -55,10 +55,10 @@ public: static char const * const id; explicit IOSAccelerometer(QSensor *sensor); - void timerEvent(QTimerEvent *); + void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; - void start(); - void stop(); + void start() Q_DECL_OVERRIDE; + void stop() Q_DECL_OVERRIDE; private: CMMotionManager *m_motionManager; diff --git a/src/plugins/sensors/ios/ioscompass.h b/src/plugins/sensors/ios/ioscompass.h index c33cf1f..849da9f 100644 --- a/src/plugins/sensors/ios/ioscompass.h +++ b/src/plugins/sensors/ios/ioscompass.h @@ -57,8 +57,8 @@ public: explicit IOSCompass(QSensor *sensor); ~IOSCompass(); - void start(); - void stop(); + void start() Q_DECL_OVERRIDE; + void stop() Q_DECL_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 4f4c399..31f89e3 100644 --- a/src/plugins/sensors/ios/iosgyroscope.h +++ b/src/plugins/sensors/ios/iosgyroscope.h @@ -55,10 +55,10 @@ public: static char const * const id; explicit IOSGyroscope(QSensor *sensor); - void timerEvent(QTimerEvent *); + void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; - void start(); - void stop(); + void start() Q_DECL_OVERRIDE; + void stop() Q_DECL_OVERRIDE; private: CMMotionManager *m_motionManager; diff --git a/src/plugins/sensors/ios/iosmagnetometer.h b/src/plugins/sensors/ios/iosmagnetometer.h index b0dc848..7f95faf 100644 --- a/src/plugins/sensors/ios/iosmagnetometer.h +++ b/src/plugins/sensors/ios/iosmagnetometer.h @@ -55,10 +55,10 @@ public: static char const * const id; explicit IOSMagnetometer(QSensor *sensor); - void timerEvent(QTimerEvent *); + void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; - void start(); - void stop(); + void start() Q_DECL_OVERRIDE; + void stop() Q_DECL_OVERRIDE; void startMagnetometer(); void startDeviceMotion(); diff --git a/src/plugins/sensors/ios/iosproximitysensor.h b/src/plugins/sensors/ios/iosproximitysensor.h index 6788512..52da8d2 100644 --- a/src/plugins/sensors/ios/iosproximitysensor.h +++ b/src/plugins/sensors/ios/iosproximitysensor.h @@ -57,8 +57,8 @@ public: explicit IOSProximitySensor(QSensor *sensor); ~IOSProximitySensor(); - void start(); - void stop(); + void start() Q_DECL_OVERRIDE; + void stop() Q_DECL_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 8ffc28f..76dfe3b 100644 --- a/src/plugins/sensors/linux/linuxsysaccelerometer.h +++ b/src/plugins/sensors/linux/linuxsysaccelerometer.h @@ -55,10 +55,10 @@ public: LinuxSysAccelerometer(QSensor *sensor); ~LinuxSysAccelerometer(); - void start(); - void stop(); + void start() Q_DECL_OVERRIDE; + void stop() Q_DECL_OVERRIDE; void poll(); - void timerEvent(QTimerEvent * /*event*/); + void timerEvent(QTimerEvent * /*event*/) Q_DECL_OVERRIDE; private: QAccelerometerReading m_reading; diff --git a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h index 25ef144..e0e84cc 100644 --- a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h +++ b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h @@ -57,10 +57,10 @@ public: static char const * const id; sensorfwaccelerometer(QSensor *sensor); protected: - virtual bool doConnect(); - virtual QString sensorName() const; - virtual qreal correctionFactor() const; - virtual void init() Q_DECL_OVERRIDE; + bool doConnect() Q_DECL_OVERRIDE; + QString sensorName() const Q_DECL_OVERRIDE; + qreal correctionFactor() const Q_DECL_OVERRIDE; + virtual void init(); private: QAccelerometerReading m_reading; diff --git a/src/plugins/sensors/sensorfw/sensorfwals.h b/src/plugins/sensors/sensorfw/sensorfwals.h index f0b91a9..b3325f0 100644 --- a/src/plugins/sensors/sensorfw/sensorfwals.h +++ b/src/plugins/sensors/sensorfw/sensorfwals.h @@ -57,10 +57,10 @@ public: static char const * const id; Sensorfwals(QSensor *sensor); protected: - virtual bool doConnect(); - virtual QString sensorName() const; - virtual void start(); - virtual void init() Q_DECL_OVERRIDE; + bool doConnect() Q_DECL_OVERRIDE; + QString sensorName() const Q_DECL_OVERRIDE; + void start() Q_DECL_OVERRIDE; + virtual void init(); private: QAmbientLightReading m_reading; diff --git a/src/plugins/sensors/sensorfw/sensorfwcompass.h b/src/plugins/sensors/sensorfw/sensorfwcompass.h index 1bb7e6e..951435c 100644 --- a/src/plugins/sensors/sensorfw/sensorfwcompass.h +++ b/src/plugins/sensors/sensorfw/sensorfwcompass.h @@ -57,9 +57,9 @@ public: static char const * const id; SensorfwCompass(QSensor *sensor); protected: - virtual bool doConnect(); - virtual QString sensorName() const; - virtual void init() Q_DECL_OVERRIDE; + bool doConnect() Q_DECL_OVERRIDE; + QString sensorName() const Q_DECL_OVERRIDE; + virtual void init(); private: QCompassReading m_reading; bool m_initDone; diff --git a/src/plugins/sensors/sensorfw/sensorfwgyroscope.h b/src/plugins/sensors/sensorfw/sensorfwgyroscope.h index 30b9579..f489bf6 100644 --- a/src/plugins/sensors/sensorfw/sensorfwgyroscope.h +++ b/src/plugins/sensors/sensorfw/sensorfwgyroscope.h @@ -59,10 +59,10 @@ public: static char const * const id; SensorfwGyroscope(QSensor *sensor); protected: - virtual bool doConnect(); - virtual QString sensorName() const; - virtual qreal correctionFactor() const; - virtual void init() Q_DECL_OVERRIDE; + bool doConnect() Q_DECL_OVERRIDE; + QString sensorName() const Q_DECL_OVERRIDE; + qreal correctionFactor() const Q_DECL_OVERRIDE; + virtual void init(); private: QGyroscopeReading m_reading; diff --git a/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h b/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h index fce0234..642570d 100644 --- a/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h @@ -56,9 +56,9 @@ public: SensorfwIrProximitySensor(QSensor *sensor); protected: - virtual bool doConnect(); - virtual QString sensorName() const; - virtual void init() Q_DECL_OVERRIDE; + bool doConnect() Q_DECL_OVERRIDE; + QString sensorName() const Q_DECL_OVERRIDE; + virtual void init(); private: QIRProximityReading m_reading; bool m_initDone; diff --git a/src/plugins/sensors/sensorfw/sensorfwlightsensor.h b/src/plugins/sensors/sensorfw/sensorfwlightsensor.h index f9394c3..244f795 100644 --- a/src/plugins/sensors/sensorfw/sensorfwlightsensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwlightsensor.h @@ -57,9 +57,9 @@ public: static char const * const id; SensorfwLightSensor(QSensor *sensor); protected: - virtual bool doConnect(); - virtual QString sensorName() const; - virtual void init() Q_DECL_OVERRIDE; + bool doConnect() Q_DECL_OVERRIDE; + QString sensorName() const Q_DECL_OVERRIDE; + virtual void init(); private: QLightReading m_reading; bool m_initDone; diff --git a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h index d86bd04..162fa06 100644 --- a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h +++ b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h @@ -58,11 +58,11 @@ public: static char const * const id; SensorfwMagnetometer(QSensor *sensor); protected: - virtual bool doConnect(); - virtual void start(); - virtual QString sensorName() const; - virtual qreal correctionFactor() const; - virtual void init() Q_DECL_OVERRIDE; + bool doConnect() Q_DECL_OVERRIDE; + void start() Q_DECL_OVERRIDE; + QString sensorName() const Q_DECL_OVERRIDE; + qreal correctionFactor() const Q_DECL_OVERRIDE; + virtual void init(); private: static const float NANO; diff --git a/src/plugins/sensors/sensorfw/sensorfworientationsensor.h b/src/plugins/sensors/sensorfw/sensorfworientationsensor.h index 139761a..9e55ff3 100644 --- a/src/plugins/sensors/sensorfw/sensorfworientationsensor.h +++ b/src/plugins/sensors/sensorfw/sensorfworientationsensor.h @@ -57,10 +57,10 @@ public: static char const * const id; SensorfwOrientationSensor(QSensor *sensor); protected: - virtual bool doConnect(); - virtual QString sensorName() const; - virtual void start(); - virtual void init() Q_DECL_OVERRIDE; + bool doConnect() Q_DECL_OVERRIDE; + QString sensorName() const Q_DECL_OVERRIDE; + void start() Q_DECL_OVERRIDE; + virtual void init(); private: QOrientationReading m_reading; static QOrientationReading::Orientation getOrientation(int orientation); diff --git a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h index 6558447..caaa9b9 100644 --- a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h @@ -57,10 +57,10 @@ public: static char const * const id; SensorfwProximitySensor(QSensor *sensor); protected: - virtual bool doConnect(); - virtual QString sensorName() const; - virtual void start(); - virtual void init() Q_DECL_OVERRIDE; + bool doConnect() Q_DECL_OVERRIDE; + QString sensorName() const Q_DECL_OVERRIDE; + void start() Q_DECL_OVERRIDE; + virtual void init(); private: QProximityReading m_reading; diff --git a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h index 1f237cf..dd41520 100644 --- a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h @@ -59,9 +59,9 @@ public: static char const * const id; SensorfwRotationSensor(QSensor *sensor); protected: - virtual bool doConnect(); - virtual QString sensorName() const; - virtual void init() Q_DECL_OVERRIDE; + bool doConnect() Q_DECL_OVERRIDE; + QString sensorName() const Q_DECL_OVERRIDE; + virtual void init(); private: QRotationReading m_reading; bool m_initDone; diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h index 2fc8238..769a8cb 100644 --- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h +++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h @@ -62,8 +62,8 @@ public: protected: virtual bool doConnect()=0; - virtual void start(); - virtual void stop(); + void start() Q_DECL_OVERRIDE; + void stop() Q_DECL_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 c829876..4373385 100644 --- a/src/plugins/sensors/sensorfw/sensorfwtapsensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwtapsensor.h @@ -57,10 +57,10 @@ public: static char const * const id; SensorfwTapSensor(QSensor *sensor); protected: - virtual bool doConnect(); - virtual void start(); - virtual QString sensorName() const; - virtual void init() Q_DECL_OVERRIDE; + bool doConnect() Q_DECL_OVERRIDE; + void start() Q_DECL_OVERRIDE; + QString sensorName() const Q_DECL_OVERRIDE; + virtual void init(); private: QTapReading m_reading; bool m_initDone; diff --git a/src/plugins/sensors/simulator/simulatoraccelerometer.h b/src/plugins/sensors/simulator/simulatoraccelerometer.h index 2658e9b..00aacb8 100644 --- a/src/plugins/sensors/simulator/simulatoraccelerometer.h +++ b/src/plugins/sensors/simulator/simulatoraccelerometer.h @@ -52,7 +52,7 @@ public: SimulatorAccelerometer(QSensor *sensor); - void poll(); + void poll() Q_DECL_OVERRIDE; private: QAccelerometerReading m_reading; }; diff --git a/src/plugins/sensors/simulator/simulatorambientlightsensor.h b/src/plugins/sensors/simulator/simulatorambientlightsensor.h index 3f4dca4..6154fdc 100644 --- a/src/plugins/sensors/simulator/simulatorambientlightsensor.h +++ b/src/plugins/sensors/simulator/simulatorambientlightsensor.h @@ -52,7 +52,7 @@ public: SimulatorAmbientLightSensor(QSensor *sensor); - void poll(); + void poll() Q_DECL_OVERRIDE; private: QAmbientLightReading m_reading; }; diff --git a/src/plugins/sensors/simulator/simulatorcommon.h b/src/plugins/sensors/simulator/simulatorcommon.h index 96ef69a..a1c1399 100644 --- a/src/plugins/sensors/simulator/simulatorcommon.h +++ b/src/plugins/sensors/simulator/simulatorcommon.h @@ -94,10 +94,10 @@ class SimulatorCommon : public QSensorBackend public: SimulatorCommon(QSensor *sensor); - void start(); - void stop(); + void start() Q_DECL_OVERRIDE; + void stop() Q_DECL_OVERRIDE; virtual void poll() = 0; - void timerEvent(QTimerEvent * /*event*/); + void timerEvent(QTimerEvent * /*event*/) Q_DECL_OVERRIDE; private: int m_timerid; diff --git a/src/plugins/sensors/simulator/simulatorcompass.h b/src/plugins/sensors/simulator/simulatorcompass.h index 9dfea0c..d10ce98 100644 --- a/src/plugins/sensors/simulator/simulatorcompass.h +++ b/src/plugins/sensors/simulator/simulatorcompass.h @@ -52,7 +52,7 @@ public: SimulatorCompass(QSensor *sensor); - void poll(); + void poll() Q_DECL_OVERRIDE; private: QCompassReading m_reading; }; diff --git a/src/plugins/sensors/simulator/simulatorirproximitysensor.h b/src/plugins/sensors/simulator/simulatorirproximitysensor.h index 25af146..c810747 100644 --- a/src/plugins/sensors/simulator/simulatorirproximitysensor.h +++ b/src/plugins/sensors/simulator/simulatorirproximitysensor.h @@ -52,7 +52,7 @@ public: SimulatorIRProximitySensor(QSensor *sensor); - void poll(); + void poll() Q_DECL_OVERRIDE; private: QIRProximityReading m_reading; }; diff --git a/src/plugins/sensors/simulator/simulatorlightsensor.h b/src/plugins/sensors/simulator/simulatorlightsensor.h index e9cd359..68a5095 100644 --- a/src/plugins/sensors/simulator/simulatorlightsensor.h +++ b/src/plugins/sensors/simulator/simulatorlightsensor.h @@ -52,7 +52,7 @@ public: SimulatorLightSensor(QSensor *sensor); - void poll(); + void poll() Q_DECL_OVERRIDE; private: QLightReading m_reading; }; diff --git a/src/plugins/sensors/simulator/simulatormagnetometer.h b/src/plugins/sensors/simulator/simulatormagnetometer.h index d1188ed..9d8c3fb 100644 --- a/src/plugins/sensors/simulator/simulatormagnetometer.h +++ b/src/plugins/sensors/simulator/simulatormagnetometer.h @@ -52,7 +52,7 @@ public: SimulatorMagnetometer(QSensor *sensor); - void poll(); + void poll() Q_DECL_OVERRIDE; private: QMagnetometerReading m_reading; }; diff --git a/src/plugins/sensors/simulator/simulatorproximitysensor.h b/src/plugins/sensors/simulator/simulatorproximitysensor.h index a06e64d..d7a9e74 100644 --- a/src/plugins/sensors/simulator/simulatorproximitysensor.h +++ b/src/plugins/sensors/simulator/simulatorproximitysensor.h @@ -52,7 +52,7 @@ public: SimulatorProximitySensor(QSensor *sensor); - void poll(); + void poll() Q_DECL_OVERRIDE; private: QProximityReading m_reading; }; diff --git a/src/sensors/qcompass.h b/src/sensors/qcompass.h index 75b6869..5351062 100644 --- a/src/sensors/qcompass.h +++ b/src/sensors/qcompass.h @@ -67,7 +67,7 @@ class Q_SENSORS_EXPORT QCompassFilter : public QSensorFilter public: virtual bool filter(QCompassReading *reading) = 0; private: - bool filter(QSensorReading *reading); + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; }; class Q_SENSORS_EXPORT QCompass : public QSensor diff --git a/src/sensors/qgyroscope.h b/src/sensors/qgyroscope.h index 31ed23b..95d751b 100644 --- a/src/sensors/qgyroscope.h +++ b/src/sensors/qgyroscope.h @@ -71,7 +71,7 @@ class Q_SENSORS_EXPORT QGyroscopeFilter : public QSensorFilter public: virtual bool filter(QGyroscopeReading *reading) = 0; private: - bool filter(QSensorReading *reading); + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; }; class Q_SENSORS_EXPORT QGyroscope : public QSensor diff --git a/src/sensors/qirproximitysensor.h b/src/sensors/qirproximitysensor.h index c4ecba4..04ad191 100644 --- a/src/sensors/qirproximitysensor.h +++ b/src/sensors/qirproximitysensor.h @@ -63,7 +63,7 @@ class Q_SENSORS_EXPORT QIRProximityFilter : public QSensorFilter public: virtual bool filter(QIRProximityReading *reading) = 0; private: - bool filter(QSensorReading *reading); + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; }; class Q_SENSORS_EXPORT QIRProximitySensor : public QSensor diff --git a/src/sensors/qlightsensor.h b/src/sensors/qlightsensor.h index 26240b4..f54b986 100644 --- a/src/sensors/qlightsensor.h +++ b/src/sensors/qlightsensor.h @@ -63,7 +63,7 @@ class Q_SENSORS_EXPORT QLightFilter : public QSensorFilter public: virtual bool filter(QLightReading *reading) = 0; private: - bool filter(QSensorReading *reading); + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; }; class QLightSensorPrivate; diff --git a/src/sensors/qmagnetometer.h b/src/sensors/qmagnetometer.h index 9d754fc..6af8bfa 100644 --- a/src/sensors/qmagnetometer.h +++ b/src/sensors/qmagnetometer.h @@ -75,7 +75,7 @@ class Q_SENSORS_EXPORT QMagnetometerFilter : public QSensorFilter public: virtual bool filter(QMagnetometerReading *reading) = 0; private: - bool filter(QSensorReading *reading); + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; }; class QMagnetometerPrivate; diff --git a/src/sensors/qorientationsensor.h b/src/sensors/qorientationsensor.h index a6fccb8..dccf6ca 100644 --- a/src/sensors/qorientationsensor.h +++ b/src/sensors/qorientationsensor.h @@ -74,7 +74,7 @@ class Q_SENSORS_EXPORT QOrientationFilter : public QSensorFilter public: virtual bool filter(QOrientationReading *reading) = 0; private: - bool filter(QSensorReading *reading); + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; }; class Q_SENSORS_EXPORT QOrientationSensor : public QSensor diff --git a/src/sensors/qproximitysensor.h b/src/sensors/qproximitysensor.h index 162334f..1b974a7 100644 --- a/src/sensors/qproximitysensor.h +++ b/src/sensors/qproximitysensor.h @@ -63,7 +63,7 @@ class Q_SENSORS_EXPORT QProximityFilter : public QSensorFilter public: virtual bool filter(QProximityReading *reading) = 0; private: - bool filter(QSensorReading *reading); + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; }; class Q_SENSORS_EXPORT QProximitySensor : public QSensor diff --git a/src/sensors/qrotationsensor.h b/src/sensors/qrotationsensor.h index e7d0e2e..e1fd94e 100644 --- a/src/sensors/qrotationsensor.h +++ b/src/sensors/qrotationsensor.h @@ -68,7 +68,7 @@ class Q_SENSORS_EXPORT QRotationFilter : public QSensorFilter public: virtual bool filter(QRotationReading *reading) = 0; private: - bool filter(QSensorReading *reading); + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; }; class QRotationSensorPrivate; diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h index 688781e..5170eeb 100644 --- a/src/sensors/qtapsensor.h +++ b/src/sensors/qtapsensor.h @@ -84,7 +84,7 @@ class Q_SENSORS_EXPORT QTapFilter : public QSensorFilter public: virtual bool filter(QTapReading *reading) = 0; private: - bool filter(QSensorReading *reading); + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; }; class QTapSensorPrivate; diff --git a/src/sensors/qtiltsensor.h b/src/sensors/qtiltsensor.h index 4d7e4c7..64b7fff 100644 --- a/src/sensors/qtiltsensor.h +++ b/src/sensors/qtiltsensor.h @@ -69,7 +69,7 @@ class Q_SENSORS_EXPORT QTiltFilter : public QSensorFilter public: virtual bool filter(QTiltReading *reading) = 0; private: - bool filter(QSensorReading *reading); + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; }; class Q_SENSORS_EXPORT QTiltSensor : public QSensor |