summaryrefslogtreecommitdiff
path: root/src/plugins/sensors/ios
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/ios
parent07bf3002fecd493a47bfb97420d3c3fbe6ee1458 (diff)
downloadqtsensors-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/ios')
-rw-r--r--src/plugins/sensors/ios/iosaccelerometer.h6
-rw-r--r--src/plugins/sensors/ios/ioscompass.h4
-rw-r--r--src/plugins/sensors/ios/iosgyroscope.h6
-rw-r--r--src/plugins/sensors/ios/iosmagnetometer.h6
-rw-r--r--src/plugins/sensors/ios/iosproximitysensor.h4
5 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/sensors/ios/iosaccelerometer.h b/src/plugins/sensors/ios/iosaccelerometer.h
index 14b6cc0..4ac73a9 100644
--- a/src/plugins/sensors/ios/iosaccelerometer.h
+++ b/src/plugins/sensors/ios/iosaccelerometer.h
@@ -53,10 +53,10 @@ public:
static char const * const id;
explicit IOSAccelerometer(QSensor *sensor);
- void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+ void timerEvent(QTimerEvent *) override;
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
CMMotionManager *m_motionManager;
diff --git a/src/plugins/sensors/ios/ioscompass.h b/src/plugins/sensors/ios/ioscompass.h
index 997b1df..2babc92 100644
--- a/src/plugins/sensors/ios/ioscompass.h
+++ b/src/plugins/sensors/ios/ioscompass.h
@@ -55,8 +55,8 @@ public:
explicit IOSCompass(QSensor *sensor);
~IOSCompass();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
void headingChanged(qreal heading, quint64 timestamp, qreal calibrationLevel);
diff --git a/src/plugins/sensors/ios/iosgyroscope.h b/src/plugins/sensors/ios/iosgyroscope.h
index 3969bb1..0d7fea4 100644
--- a/src/plugins/sensors/ios/iosgyroscope.h
+++ b/src/plugins/sensors/ios/iosgyroscope.h
@@ -53,10 +53,10 @@ public:
static char const * const id;
explicit IOSGyroscope(QSensor *sensor);
- void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+ void timerEvent(QTimerEvent *) override;
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
CMMotionManager *m_motionManager;
diff --git a/src/plugins/sensors/ios/iosmagnetometer.h b/src/plugins/sensors/ios/iosmagnetometer.h
index f4ab34a..2c55eac 100644
--- a/src/plugins/sensors/ios/iosmagnetometer.h
+++ b/src/plugins/sensors/ios/iosmagnetometer.h
@@ -53,10 +53,10 @@ public:
static char const * const id;
explicit IOSMagnetometer(QSensor *sensor);
- void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+ void timerEvent(QTimerEvent *) override;
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
void startMagnetometer();
void startDeviceMotion();
diff --git a/src/plugins/sensors/ios/iosproximitysensor.h b/src/plugins/sensors/ios/iosproximitysensor.h
index 4cff4fc..0d69391 100644
--- a/src/plugins/sensors/ios/iosproximitysensor.h
+++ b/src/plugins/sensors/ios/iosproximitysensor.h
@@ -55,8 +55,8 @@ public:
explicit IOSProximitySensor(QSensor *sensor);
~IOSProximitySensor();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
void proximityChanged(bool close);
static bool available();