summaryrefslogtreecommitdiffstats
path: root/src/plugins/sensors/generic
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2016-12-02 02:09:24 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2016-12-02 08:46:51 +0000
commit2c595c382c50a5632b14eda00d85a9b7fcb09b5d (patch)
treef8e070d11537c794ee99a977a7de91c460d5ebc7 /src/plugins/sensors/generic
parent07bf3002fecd493a47bfb97420d3c3fbe6ee1458 (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/generic')
-rw-r--r--src/plugins/sensors/generic/genericalssensor.h6
-rw-r--r--src/plugins/sensors/generic/genericorientationsensor.h6
-rw-r--r--src/plugins/sensors/generic/genericrotationsensor.h6
-rw-r--r--src/plugins/sensors/generic/generictiltsensor.h8
4 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/sensors/generic/genericalssensor.h b/src/plugins/sensors/generic/genericalssensor.h
index 83950ea3..3d10b9a1 100644
--- a/src/plugins/sensors/generic/genericalssensor.h
+++ b/src/plugins/sensors/generic/genericalssensor.h
@@ -51,10 +51,10 @@ public:
genericalssensor(QSensor *sensor);
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
- bool filter(QLightReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QLightReading *reading) override;
private:
QAmbientLightReading m_reading;
diff --git a/src/plugins/sensors/generic/genericorientationsensor.h b/src/plugins/sensors/generic/genericorientationsensor.h
index 7afdc38a..01265a02 100644
--- a/src/plugins/sensors/generic/genericorientationsensor.h
+++ b/src/plugins/sensors/generic/genericorientationsensor.h
@@ -51,10 +51,10 @@ public:
genericorientationsensor(QSensor *sensor);
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
- bool filter(QAccelerometerReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QAccelerometerReading *reading) override;
private:
QOrientationReading m_reading;
diff --git a/src/plugins/sensors/generic/genericrotationsensor.h b/src/plugins/sensors/generic/genericrotationsensor.h
index f1c9163f..98b8f974 100644
--- a/src/plugins/sensors/generic/genericrotationsensor.h
+++ b/src/plugins/sensors/generic/genericrotationsensor.h
@@ -52,10 +52,10 @@ public:
genericrotationsensor(QSensor *sensor);
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
private:
QRotationReading m_reading;
diff --git a/src/plugins/sensors/generic/generictiltsensor.h b/src/plugins/sensors/generic/generictiltsensor.h
index 9562acaf..71db69d3 100644
--- a/src/plugins/sensors/generic/generictiltsensor.h
+++ b/src/plugins/sensors/generic/generictiltsensor.h
@@ -55,14 +55,14 @@ public:
GenericTiltSensor(QSensor *sensor);
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
Q_INVOKABLE void calibrate();
- bool filter(QAccelerometerReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QAccelerometerReading *reading) override;
- bool isFeatureSupported(QSensor::Feature feature) const Q_DECL_OVERRIDE;
+ bool isFeatureSupported(QSensor::Feature feature) const override;
private:
QTiltReading m_reading;