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/simulator | |
| 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/simulator')
8 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/sensors/simulator/simulatoraccelerometer.h b/src/plugins/sensors/simulator/simulatoraccelerometer.h index 12605c3..a420586 100644 --- a/src/plugins/sensors/simulator/simulatoraccelerometer.h +++ b/src/plugins/sensors/simulator/simulatoraccelerometer.h @@ -50,7 +50,7 @@ public: SimulatorAccelerometer(QSensor *sensor); - void poll() Q_DECL_OVERRIDE; + void poll() override; private: QAccelerometerReading m_reading; }; diff --git a/src/plugins/sensors/simulator/simulatorambientlightsensor.h b/src/plugins/sensors/simulator/simulatorambientlightsensor.h index ecac5be..0aadffe 100644 --- a/src/plugins/sensors/simulator/simulatorambientlightsensor.h +++ b/src/plugins/sensors/simulator/simulatorambientlightsensor.h @@ -50,7 +50,7 @@ public: SimulatorAmbientLightSensor(QSensor *sensor); - void poll() Q_DECL_OVERRIDE; + void poll() override; private: QAmbientLightReading m_reading; }; diff --git a/src/plugins/sensors/simulator/simulatorcommon.h b/src/plugins/sensors/simulator/simulatorcommon.h index 084b10d..e47f24d 100644 --- a/src/plugins/sensors/simulator/simulatorcommon.h +++ b/src/plugins/sensors/simulator/simulatorcommon.h @@ -92,10 +92,10 @@ class SimulatorCommon : public QSensorBackend public: SimulatorCommon(QSensor *sensor); - void start() Q_DECL_OVERRIDE; - void stop() Q_DECL_OVERRIDE; + void start() override; + void stop() override; virtual void poll() = 0; - void timerEvent(QTimerEvent * /*event*/) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent * /*event*/) override; private: int m_timerid; diff --git a/src/plugins/sensors/simulator/simulatorcompass.h b/src/plugins/sensors/simulator/simulatorcompass.h index a9e6475..69162c6 100644 --- a/src/plugins/sensors/simulator/simulatorcompass.h +++ b/src/plugins/sensors/simulator/simulatorcompass.h @@ -50,7 +50,7 @@ public: SimulatorCompass(QSensor *sensor); - void poll() Q_DECL_OVERRIDE; + void poll() override; private: QCompassReading m_reading; }; diff --git a/src/plugins/sensors/simulator/simulatorirproximitysensor.h b/src/plugins/sensors/simulator/simulatorirproximitysensor.h index 6173631..db20968 100644 --- a/src/plugins/sensors/simulator/simulatorirproximitysensor.h +++ b/src/plugins/sensors/simulator/simulatorirproximitysensor.h @@ -50,7 +50,7 @@ public: SimulatorIRProximitySensor(QSensor *sensor); - void poll() Q_DECL_OVERRIDE; + void poll() override; private: QIRProximityReading m_reading; }; diff --git a/src/plugins/sensors/simulator/simulatorlightsensor.h b/src/plugins/sensors/simulator/simulatorlightsensor.h index 78d8f84..3af3a52 100644 --- a/src/plugins/sensors/simulator/simulatorlightsensor.h +++ b/src/plugins/sensors/simulator/simulatorlightsensor.h @@ -50,7 +50,7 @@ public: SimulatorLightSensor(QSensor *sensor); - void poll() Q_DECL_OVERRIDE; + void poll() override; private: QLightReading m_reading; }; diff --git a/src/plugins/sensors/simulator/simulatormagnetometer.h b/src/plugins/sensors/simulator/simulatormagnetometer.h index f602d46..facbad4 100644 --- a/src/plugins/sensors/simulator/simulatormagnetometer.h +++ b/src/plugins/sensors/simulator/simulatormagnetometer.h @@ -50,7 +50,7 @@ public: SimulatorMagnetometer(QSensor *sensor); - void poll() Q_DECL_OVERRIDE; + void poll() override; private: QMagnetometerReading m_reading; }; diff --git a/src/plugins/sensors/simulator/simulatorproximitysensor.h b/src/plugins/sensors/simulator/simulatorproximitysensor.h index 22b7287..16e6f6b 100644 --- a/src/plugins/sensors/simulator/simulatorproximitysensor.h +++ b/src/plugins/sensors/simulator/simulatorproximitysensor.h @@ -50,7 +50,7 @@ public: SimulatorProximitySensor(QSensor *sensor); - void poll() Q_DECL_OVERRIDE; + void poll() override; private: QProximityReading m_reading; }; |