diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-12-02 02:09:24 +0300 |
---|---|---|
committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-12-02 08:46:51 +0000 |
commit | 2c595c382c50a5632b14eda00d85a9b7fcb09b5d (patch) | |
tree | f8e070d11537c794ee99a977a7de91c460d5ebc7 /src/plugins/sensors/sensorfw | |
parent | 07bf3002fecd493a47bfb97420d3c3fbe6ee1458 (diff) | |
download | qtsensors-2c595c382c50a5632b14eda00d85a9b7fcb09b5d.tar.gz |
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>
Diffstat (limited to 'src/plugins/sensors/sensorfw')
12 files changed, 38 insertions, 38 deletions
diff --git a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h index 23be816..89d7bf7 100644 --- a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h +++ b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h @@ -55,10 +55,10 @@ public: static char const * const id; sensorfwaccelerometer(QSensor *sensor); protected: - bool doConnect() Q_DECL_OVERRIDE; - QString sensorName() const Q_DECL_OVERRIDE; - qreal correctionFactor() const Q_DECL_OVERRIDE; - void start() Q_DECL_OVERRIDE; + bool doConnect() override; + QString sensorName() const override; + qreal correctionFactor() const override; + void start() override; virtual void init(); private: diff --git a/src/plugins/sensors/sensorfw/sensorfwals.h b/src/plugins/sensors/sensorfw/sensorfwals.h index d0062a0..9a71550 100644 --- a/src/plugins/sensors/sensorfw/sensorfwals.h +++ b/src/plugins/sensors/sensorfw/sensorfwals.h @@ -55,9 +55,9 @@ public: static char const * const id; Sensorfwals(QSensor *sensor); protected: - bool doConnect() Q_DECL_OVERRIDE; - QString sensorName() const Q_DECL_OVERRIDE; - void start() Q_DECL_OVERRIDE; + bool doConnect() override; + QString sensorName() const override; + void start() override; virtual void init(); private: diff --git a/src/plugins/sensors/sensorfw/sensorfwcompass.h b/src/plugins/sensors/sensorfw/sensorfwcompass.h index d1ad60a..9afe9b4 100644 --- a/src/plugins/sensors/sensorfw/sensorfwcompass.h +++ b/src/plugins/sensors/sensorfw/sensorfwcompass.h @@ -55,9 +55,9 @@ public: static char const * const id; SensorfwCompass(QSensor *sensor); protected: - bool doConnect() Q_DECL_OVERRIDE; - QString sensorName() const Q_DECL_OVERRIDE; - void start() Q_DECL_OVERRIDE; + bool doConnect() override; + QString sensorName() const override; + void start() override; virtual void init(); private: QCompassReading m_reading; diff --git a/src/plugins/sensors/sensorfw/sensorfwgyroscope.h b/src/plugins/sensors/sensorfw/sensorfwgyroscope.h index 817ef51..d9346a9 100644 --- a/src/plugins/sensors/sensorfw/sensorfwgyroscope.h +++ b/src/plugins/sensors/sensorfw/sensorfwgyroscope.h @@ -57,10 +57,10 @@ public: static char const * const id; SensorfwGyroscope(QSensor *sensor); protected: - bool doConnect() Q_DECL_OVERRIDE; - QString sensorName() const Q_DECL_OVERRIDE; - qreal correctionFactor() const Q_DECL_OVERRIDE; - void start() Q_DECL_OVERRIDE; + bool doConnect() override; + QString sensorName() const override; + qreal correctionFactor() const override; + void start() override; virtual void init(); private: diff --git a/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h b/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h index b772e53..ece68a5 100644 --- a/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h @@ -54,9 +54,9 @@ public: SensorfwIrProximitySensor(QSensor *sensor); protected: - bool doConnect() Q_DECL_OVERRIDE; - QString sensorName() const Q_DECL_OVERRIDE; - void start() Q_DECL_OVERRIDE; + bool doConnect() override; + QString sensorName() const override; + void start() override; virtual void init(); private: QIRProximityReading m_reading; diff --git a/src/plugins/sensors/sensorfw/sensorfwlightsensor.h b/src/plugins/sensors/sensorfw/sensorfwlightsensor.h index c1aa27d..9d8faa6 100644 --- a/src/plugins/sensors/sensorfw/sensorfwlightsensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwlightsensor.h @@ -55,9 +55,9 @@ public: static char const * const id; SensorfwLightSensor(QSensor *sensor); protected: - bool doConnect() Q_DECL_OVERRIDE; - QString sensorName() const Q_DECL_OVERRIDE; - void start() Q_DECL_OVERRIDE; + bool doConnect() override; + QString sensorName() const override; + void start() override; virtual void init(); private: QLightReading m_reading; diff --git a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h index 8f6f80b..03f2955 100644 --- a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h +++ b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h @@ -56,10 +56,10 @@ public: static char const * const id; SensorfwMagnetometer(QSensor *sensor); protected: - bool doConnect() Q_DECL_OVERRIDE; - void start() Q_DECL_OVERRIDE; - QString sensorName() const Q_DECL_OVERRIDE; - qreal correctionFactor() const Q_DECL_OVERRIDE; + bool doConnect() override; + void start() override; + QString sensorName() const override; + qreal correctionFactor() const override; virtual void init(); private: diff --git a/src/plugins/sensors/sensorfw/sensorfworientationsensor.h b/src/plugins/sensors/sensorfw/sensorfworientationsensor.h index 1828b0a..fac59fe 100644 --- a/src/plugins/sensors/sensorfw/sensorfworientationsensor.h +++ b/src/plugins/sensors/sensorfw/sensorfworientationsensor.h @@ -55,9 +55,9 @@ public: static char const * const id; SensorfwOrientationSensor(QSensor *sensor); protected: - bool doConnect() Q_DECL_OVERRIDE; - QString sensorName() const Q_DECL_OVERRIDE; - void start() Q_DECL_OVERRIDE; + bool doConnect() override; + QString sensorName() const override; + void start() override; virtual void init(); private: QOrientationReading m_reading; diff --git a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h index 16702da..d8b9664 100644 --- a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h @@ -55,9 +55,9 @@ public: static char const * const id; SensorfwProximitySensor(QSensor *sensor); protected: - bool doConnect() Q_DECL_OVERRIDE; - QString sensorName() const Q_DECL_OVERRIDE; - void start() Q_DECL_OVERRIDE; + bool doConnect() override; + QString sensorName() const override; + void start() override; virtual void init(); private: diff --git a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h index a4e1d08..f9150f6 100644 --- a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h @@ -57,9 +57,9 @@ public: static char const * const id; SensorfwRotationSensor(QSensor *sensor); protected: - bool doConnect() Q_DECL_OVERRIDE; - QString sensorName() const Q_DECL_OVERRIDE; - void start() Q_DECL_OVERRIDE; + bool doConnect() override; + QString sensorName() const override; + void start() override; virtual void init(); private: QRotationReading m_reading; diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h index 3e5e053..7e7f5c3 100644 --- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h +++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h @@ -60,8 +60,8 @@ public: protected: virtual bool doConnect()=0; - void start() Q_DECL_OVERRIDE; - void stop() Q_DECL_OVERRIDE; + void start() override; + void stop() 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 d725159..7e9edb4 100644 --- a/src/plugins/sensors/sensorfw/sensorfwtapsensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwtapsensor.h @@ -55,9 +55,9 @@ public: static char const * const id; SensorfwTapSensor(QSensor *sensor); protected: - bool doConnect() Q_DECL_OVERRIDE; - void start() Q_DECL_OVERRIDE; - QString sensorName() const Q_DECL_OVERRIDE; + bool doConnect() override; + void start() override; + QString sensorName() const override; virtual void init(); private: QTapReading m_reading; |