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/sensorfw | |
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/sensorfw')
12 files changed, 43 insertions, 43 deletions
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; |