summaryrefslogtreecommitdiffstats
path: root/src/plugins/sensors
diff options
context:
space:
mode:
authorSamuel Gaist <samuel.gaist@edeltech.ch>2013-11-18 23:07:09 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-19 13:28:36 +0100
commit400ad25d72b8b2d9a10057953a88d7d64b9bc0a9 (patch)
treec3f14ba845cc331c744d5623d5abe5b90814fc91 /src/plugins/sensors
parenta840cbffba476205eba81f56f40ec32cea6097cc (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')
-rw-r--r--src/plugins/sensors/android/src/androidaccelerometer.h4
-rw-r--r--src/plugins/sensors/android/src/androidcommonsensor.h4
-rw-r--r--src/plugins/sensors/android/src/androidgyroscope.h4
-rw-r--r--src/plugins/sensors/android/src/androidlight.h4
-rw-r--r--src/plugins/sensors/android/src/androidmagnetometer.h4
-rw-r--r--src/plugins/sensors/android/src/androidproximity.h4
-rw-r--r--src/plugins/sensors/android/src/androidrotation.h4
-rw-r--r--src/plugins/sensors/android/src/androidtemperature.h4
-rw-r--r--src/plugins/sensors/dummy/dummyaccelerometer.h2
-rw-r--r--src/plugins/sensors/dummy/dummycommon.h6
-rw-r--r--src/plugins/sensors/dummy/dummylightsensor.h2
-rw-r--r--src/plugins/sensors/generic/genericalssensor.h6
-rw-r--r--src/plugins/sensors/generic/genericorientationsensor.h6
-rw-r--r--src/plugins/sensors/generic/genericrotationsensor.h6
-rw-r--r--src/plugins/sensors/generic/generictiltsensor.h6
-rw-r--r--src/plugins/sensors/ios/iosaccelerometer.h6
-rw-r--r--src/plugins/sensors/ios/ioscompass.h4
-rw-r--r--src/plugins/sensors/ios/iosgyroscope.h6
-rw-r--r--src/plugins/sensors/ios/iosmagnetometer.h6
-rw-r--r--src/plugins/sensors/ios/iosproximitysensor.h4
-rw-r--r--src/plugins/sensors/linux/linuxsysaccelerometer.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwaccelerometer.h8
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwals.h8
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwcompass.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwgyroscope.h8
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwlightsensor.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwmagnetometer.h10
-rw-r--r--src/plugins/sensors/sensorfw/sensorfworientationsensor.h8
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwproximitysensor.h8
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwrotationsensor.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwsensorbase.h4
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwtapsensor.h8
-rw-r--r--src/plugins/sensors/simulator/simulatoraccelerometer.h2
-rw-r--r--src/plugins/sensors/simulator/simulatorambientlightsensor.h2
-rw-r--r--src/plugins/sensors/simulator/simulatorcommon.h6
-rw-r--r--src/plugins/sensors/simulator/simulatorcompass.h2
-rw-r--r--src/plugins/sensors/simulator/simulatorirproximitysensor.h2
-rw-r--r--src/plugins/sensors/simulator/simulatorlightsensor.h2
-rw-r--r--src/plugins/sensors/simulator/simulatormagnetometer.h2
-rw-r--r--src/plugins/sensors/simulator/simulatorproximitysensor.h2
41 files changed, 102 insertions, 102 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
diff --git a/src/plugins/sensors/dummy/dummyaccelerometer.h b/src/plugins/sensors/dummy/dummyaccelerometer.h
index a469e395..ae48dd0e 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 a17bd9dd..5816e895 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 edd95a3a..7279ea29 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 9665745f..1ed6e76e 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 c212c1be..d1e7d343 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 ffa48ea3..693528fa 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 0f84ca6f..f62c1f58 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 1a6560b1..ba6235f3 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 c33cf1fd..849da9fb 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 4f4c399a..31f89e3a 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 b0dc848a..7f95faf8 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 67885126..52da8d2b 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 8ffc28fa..76dfe3ba 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 25ef1443..e0e84cc3 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 f0b91a9a..b3325f03 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 1bb7e6ea..951435c8 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 30b95791..f489bf6b 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 fce0234b..642570d3 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 f9394c3d..244f795f 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 d86bd043..162fa065 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 139761a5..9e55ff34 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 6558447d..caaa9b97 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 1f237cf4..dd415201 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 2fc8238d..769a8cbb 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 c8298761..4373385a 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 2658e9b6..00aacb89 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 3f4dca49..6154fdce 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 96ef69a6..a1c13991 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 9dfea0ce..d10ce98b 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 25af1462..c8107473 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 e9cd3594..68a50952 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 d1188edc..9d8c3fb6 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 a06e64d2..d7a9e744 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;
};