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/dummy/dummyaccelerometer.h | 2 +- src/plugins/sensors/dummy/dummycommon.h | 6 +++--- src/plugins/sensors/dummy/dummylightsensor.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins/sensors/dummy') 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; }; -- cgit v1.2.3