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/dummy | |
parent | 07bf3002fecd493a47bfb97420d3c3fbe6ee1458 (diff) |
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/dummy')
-rw-r--r-- | src/plugins/sensors/dummy/dummyaccelerometer.h | 2 | ||||
-rw-r--r-- | src/plugins/sensors/dummy/dummycommon.h | 6 | ||||
-rw-r--r-- | src/plugins/sensors/dummy/dummylightsensor.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/sensors/dummy/dummyaccelerometer.h b/src/plugins/sensors/dummy/dummyaccelerometer.h index 73c674c1..6c890f64 100644 --- a/src/plugins/sensors/dummy/dummyaccelerometer.h +++ b/src/plugins/sensors/dummy/dummyaccelerometer.h @@ -50,7 +50,7 @@ public: dummyaccelerometer(QSensor *sensor); - void poll() Q_DECL_OVERRIDE; + void poll() override; private: QAccelerometerReading m_reading; }; diff --git a/src/plugins/sensors/dummy/dummycommon.h b/src/plugins/sensors/dummy/dummycommon.h index 816947e4..5e775b64 100644 --- a/src/plugins/sensors/dummy/dummycommon.h +++ b/src/plugins/sensors/dummy/dummycommon.h @@ -48,10 +48,10 @@ class dummycommon : public QSensorBackend public: dummycommon(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; protected: quint64 getTimestamp(); diff --git a/src/plugins/sensors/dummy/dummylightsensor.h b/src/plugins/sensors/dummy/dummylightsensor.h index 8d005fd3..3bcaf413 100644 --- a/src/plugins/sensors/dummy/dummylightsensor.h +++ b/src/plugins/sensors/dummy/dummylightsensor.h @@ -50,7 +50,7 @@ public: dummylightsensor(QSensor *sensor); - void poll() Q_DECL_OVERRIDE; + void poll() override; private: QAmbientLightReading m_reading; }; |