From 2c595c382c50a5632b14eda00d85a9b7fcb09b5d Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Fri, 2 Dec 2016 02:09:24 +0300 Subject: Replace Q_DECL_OVERRIDE by override 'override' keyword can be used directly since Qt 5.7. Change-Id: Ibf0fc590f7e247a310a833a22ece700ec75199bb Reviewed-by: Lorn Potter --- src/plugins/sensors/sensorfw/sensorfwaccelerometer.h | 8 ++++---- src/plugins/sensors/sensorfw/sensorfwals.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwcompass.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwgyroscope.h | 8 ++++---- src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwlightsensor.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwmagnetometer.h | 8 ++++---- src/plugins/sensors/sensorfw/sensorfworientationsensor.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwproximitysensor.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwrotationsensor.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwsensorbase.h | 4 ++-- src/plugins/sensors/sensorfw/sensorfwtapsensor.h | 6 +++--- 12 files changed, 38 insertions(+), 38 deletions(-) (limited to 'src/plugins/sensors/sensorfw') diff --git a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h index 23be816b..89d7bf78 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 d0062a0b..9a71550e 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 d1ad60a2..9afe9b41 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 817ef519..d9346a94 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 b772e537..ece68a58 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 c1aa27da..9d8faa6c 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 8f6f80b8..03f29556 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 1828b0a6..fac59fe8 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 16702da3..d8b96640 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 a4e1d08a..f9150f6d 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 3e5e0538..7e7f5c33 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 d7251591..7e9edb4c 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; -- cgit v1.2.3