summaryrefslogtreecommitdiffstats
path: root/src/plugins/sensors/winrt
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/winrt
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/winrt')
-rw-r--r--src/plugins/sensors/winrt/winrtaccelerometer.h4
-rw-r--r--src/plugins/sensors/winrt/winrtambientlightsensor.h4
-rw-r--r--src/plugins/sensors/winrt/winrtcompass.h4
-rw-r--r--src/plugins/sensors/winrt/winrtgyroscope.h6
-rw-r--r--src/plugins/sensors/winrt/winrtorientationsensor.h4
-rw-r--r--src/plugins/sensors/winrt/winrtrotationsensor.h6
6 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/sensors/winrt/winrtaccelerometer.h b/src/plugins/sensors/winrt/winrtaccelerometer.h
index c81de280..1d51735d 100644
--- a/src/plugins/sensors/winrt/winrtaccelerometer.h
+++ b/src/plugins/sensors/winrt/winrtaccelerometer.h
@@ -50,8 +50,8 @@ public:
WinRtAccelerometer(QSensor *sensor);
~WinRtAccelerometer();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
QScopedPointer<WinRtAccelerometerPrivate> d_ptr;
diff --git a/src/plugins/sensors/winrt/winrtambientlightsensor.h b/src/plugins/sensors/winrt/winrtambientlightsensor.h
index 092b36e0..7522bae7 100644
--- a/src/plugins/sensors/winrt/winrtambientlightsensor.h
+++ b/src/plugins/sensors/winrt/winrtambientlightsensor.h
@@ -50,8 +50,8 @@ public:
WinRtAmbientLightSensor(QSensor *sensor);
~WinRtAmbientLightSensor();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
QScopedPointer<WinRtAmbientLightSensorPrivate> d_ptr;
diff --git a/src/plugins/sensors/winrt/winrtcompass.h b/src/plugins/sensors/winrt/winrtcompass.h
index 625417f5..fd2ce113 100644
--- a/src/plugins/sensors/winrt/winrtcompass.h
+++ b/src/plugins/sensors/winrt/winrtcompass.h
@@ -50,8 +50,8 @@ public:
WinRtCompass(QSensor *sensor);
~WinRtCompass();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
QScopedPointer<WinRtCompassPrivate> d_ptr;
diff --git a/src/plugins/sensors/winrt/winrtgyroscope.h b/src/plugins/sensors/winrt/winrtgyroscope.h
index 74fb9cdf..2448b00f 100644
--- a/src/plugins/sensors/winrt/winrtgyroscope.h
+++ b/src/plugins/sensors/winrt/winrtgyroscope.h
@@ -50,15 +50,15 @@ public:
WinRtGyroscope(QSensor *sensor);
~WinRtGyroscope();
- bool isFeatureSupported(QSensor::Feature feature) const Q_DECL_OVERRIDE
+ bool isFeatureSupported(QSensor::Feature feature) const override
{
if (feature == QSensor::AxesOrientation || feature == QSensor::AccelerationMode)
return true;
return false;
}
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
QScopedPointer<WinRtGyroscopePrivate> d_ptr;
diff --git a/src/plugins/sensors/winrt/winrtorientationsensor.h b/src/plugins/sensors/winrt/winrtorientationsensor.h
index 4f56bf0a..dc4abf85 100644
--- a/src/plugins/sensors/winrt/winrtorientationsensor.h
+++ b/src/plugins/sensors/winrt/winrtorientationsensor.h
@@ -50,8 +50,8 @@ public:
WinRtOrientationSensor(QSensor *sensor);
~WinRtOrientationSensor();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
QScopedPointer<WinRtOrientationSensorPrivate> d_ptr;
diff --git a/src/plugins/sensors/winrt/winrtrotationsensor.h b/src/plugins/sensors/winrt/winrtrotationsensor.h
index 47c39911..ef2a9226 100644
--- a/src/plugins/sensors/winrt/winrtrotationsensor.h
+++ b/src/plugins/sensors/winrt/winrtrotationsensor.h
@@ -50,15 +50,15 @@ public:
WinRtRotationSensor(QSensor *sensor);
~WinRtRotationSensor();
- bool isFeatureSupported(QSensor::Feature feature) const Q_DECL_OVERRIDE
+ bool isFeatureSupported(QSensor::Feature feature) const override
{
if (feature == QSensor::AxesOrientation || feature == QSensor::AccelerationMode)
return true;
return false;
}
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
QScopedPointer<WinRtRotationSensorPrivate> d_ptr;