summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qshake2recognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h6
-rw-r--r--src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/shake/qshakerecognizer.h10
-rw-r--r--src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h6
-rw-r--r--src/plugins/sensors/android/src/androidaccelerometer.h4
-rw-r--r--src/plugins/sensors/android/src/androidcommonsensor.h4
-rw-r--r--src/plugins/sensors/android/src/androidcompass.cpp8
-rw-r--r--src/plugins/sensors/android/src/androidcompass.h4
-rw-r--r--src/plugins/sensors/android/src/androidgyroscope.h4
-rw-r--r--src/plugins/sensors/android/src/androidlight.h4
-rw-r--r--src/plugins/sensors/android/src/androidmagnetometer.h4
-rw-r--r--src/plugins/sensors/android/src/androidproximity.h4
-rw-r--r--src/plugins/sensors/android/src/androidrotation.h4
-rw-r--r--src/plugins/sensors/android/src/androidtemperature.h4
-rw-r--r--src/plugins/sensors/dummy/dummyaccelerometer.h2
-rw-r--r--src/plugins/sensors/dummy/dummycommon.h6
-rw-r--r--src/plugins/sensors/dummy/dummylightsensor.h2
-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
-rw-r--r--src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h6
-rw-r--r--src/plugins/sensors/iio-sensor-proxy/iiosensorproxylightsensor.h6
-rw-r--r--src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h6
-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
-rw-r--r--src/plugins/sensors/linux/linuxsysaccelerometer.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwaccelerometer.h8
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwals.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwcompass.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwgyroscope.h8
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwlightsensor.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwmagnetometer.h8
-rw-r--r--src/plugins/sensors/sensorfw/sensorfworientationsensor.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwproximitysensor.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwrotationsensor.h6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwsensorbase.h4
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwtapsensor.h6
-rw-r--r--src/plugins/sensors/simulator/simulatoraccelerometer.h2
-rw-r--r--src/plugins/sensors/simulator/simulatorambientlightsensor.h2
-rw-r--r--src/plugins/sensors/simulator/simulatorcommon.h6
-rw-r--r--src/plugins/sensors/simulator/simulatorcompass.h2
-rw-r--r--src/plugins/sensors/simulator/simulatorirproximitysensor.h2
-rw-r--r--src/plugins/sensors/simulator/simulatorlightsensor.h2
-rw-r--r--src/plugins/sensors/simulator/simulatormagnetometer.h2
-rw-r--r--src/plugins/sensors/simulator/simulatorproximitysensor.h2
-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
65 files changed, 188 insertions, 188 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
index 1478e70d..d9c57e80 100644
--- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
@@ -55,12 +55,12 @@ public:
explicit QCoverSensorGestureRecognizer(QObject *parent = 0);
~QCoverSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void cover();
diff --git a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h
index 6522882e..73d7db56 100644
--- a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h
@@ -56,12 +56,12 @@ public:
explicit QDoubleTapSensorGestureRecognizer(QObject *parent = 0);
~QDoubleTapSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void doubletap();
diff --git a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
index 89fdb4d8..124475ad 100644
--- a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
@@ -55,12 +55,12 @@ public:
explicit QFreefallSensorGestureRecognizer(QObject *parent = 0);
~QFreefallSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void freefall();
diff --git a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h
index 072f8402..d0c8f706 100644
--- a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h
@@ -55,12 +55,12 @@ public:
explicit QHoverSensorGestureRecognizer(QObject *parent = 0);
~QHoverSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void hover();
diff --git a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h
index 28e511c3..fdc0a6fe 100644
--- a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h
@@ -53,12 +53,12 @@ public:
explicit QPickupSensorGestureRecognizer(QObject *parent = 0);
~QPickupSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void pickup();
diff --git a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h
index 3b8c5ecd..9e402cf6 100644
--- a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h
@@ -71,12 +71,12 @@ public:
QShake2SensorGestureRecognizer(QObject *parent = 0);
~QShake2SensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
int timerTimeout;
diff --git a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
index c2a1fc66..4217eec3 100644
--- a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
@@ -55,12 +55,12 @@ public:
explicit QSlamSensorGestureRecognizer(QObject *parent = 0);
~QSlamSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void slam();
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
index 79b6cf4d..87a93f16 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
+++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
@@ -56,11 +56,11 @@ class QtSensorGesturePlugin : public QObject, public QSensorGesturePluginInterfa
public:
explicit QtSensorGesturePlugin();
~QtSensorGesturePlugin();
- QList <QSensorGestureRecognizer *> createRecognizers() Q_DECL_OVERRIDE;
+ QList <QSensorGestureRecognizer *> createRecognizers() override;
QStringList gestureSignals() const;
- QStringList supportedIds() const Q_DECL_OVERRIDE;
- QString name() const Q_DECL_OVERRIDE { return "QtSensorGestures"; }
+ QStringList supportedIds() const override;
+ QString name() const override { return "QtSensorGestures"; }
};
diff --git a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h
index 679a4430..295cb5f7 100644
--- a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h
@@ -52,12 +52,12 @@ public:
explicit QTurnoverSensorGestureRecognizer(QObject *parent = 0);
~QTurnoverSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void turnover();
diff --git a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
index a12845cb..3080e2a6 100644
--- a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
@@ -61,12 +61,12 @@ public:
explicit QTwistSensorGestureRecognizer(QObject *parent = 0);
~QTwistSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void twistLeft();
diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h
index 8e143459..6d674ab5 100644
--- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h
@@ -54,12 +54,12 @@ public:
explicit QWhipSensorGestureRecognizer(QObject *parent = 0);
~QWhipSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
void whip();
diff --git a/src/plugins/sensorgestures/shake/qshakerecognizer.h b/src/plugins/sensorgestures/shake/qshakerecognizer.h
index 46d16326..21c85664 100644
--- a/src/plugins/sensorgestures/shake/qshakerecognizer.h
+++ b/src/plugins/sensorgestures/shake/qshakerecognizer.h
@@ -64,12 +64,12 @@ public:
QShakeSensorGestureRecognizer(QObject *parent = 0);
~QShakeSensorGestureRecognizer();
- void create() Q_DECL_OVERRIDE;
+ void create() override;
- QString id() const Q_DECL_OVERRIDE;
- bool start() Q_DECL_OVERRIDE;
- bool stop() Q_DECL_OVERRIDE;
- bool isActive() Q_DECL_OVERRIDE;
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
QTimer *timer;
int timerTimeout;
diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
index 397ae071..96814eb8 100644
--- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
+++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
@@ -55,11 +55,11 @@ public:
explicit QShakeSensorGesturePlugin();
~QShakeSensorGesturePlugin();
- QList <QSensorGestureRecognizer *> createRecognizers() Q_DECL_OVERRIDE;
+ QList <QSensorGestureRecognizer *> createRecognizers() override;
QStringList gestureSignals() const;
- QStringList supportedIds() const Q_DECL_OVERRIDE;
- QString name() const Q_DECL_OVERRIDE { return "ShakeGestures"; }
+ QStringList supportedIds() const override;
+ QString name() const override { return "ShakeGestures"; }
};
#endif // QSHAKESENSORGESTUREPLUGIN_H
diff --git a/src/plugins/sensors/android/src/androidaccelerometer.h b/src/plugins/sensors/android/src/androidaccelerometer.h
index b13e5f90..9b8bf0b4 100644
--- a/src/plugins/sensors/android/src/androidaccelerometer.h
+++ b/src/plugins/sensors/android/src/androidaccelerometer.h
@@ -51,8 +51,8 @@ public:
AndroidAccelerometer(AndroidSensors::AndroidSensorType type, QSensor *sensor);
static AndroidSensors::AndroidSensorType modeToSensor(QAccelerometer::AccelerationMode mode);
private:
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
- void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+ void onAccuracyChanged(jint accuracy) override;
+ void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
private Q_SLOTS:
void applyAccelerationMode();
diff --git a/src/plugins/sensors/android/src/androidcommonsensor.h b/src/plugins/sensors/android/src/androidcommonsensor.h
index 739501db..bfd36db0 100644
--- a/src/plugins/sensors/android/src/androidcommonsensor.h
+++ b/src/plugins/sensors/android/src/androidcommonsensor.h
@@ -61,13 +61,13 @@ public:
if (m_isStarted)
stop();
}
- void start() Q_DECL_OVERRIDE
+ void start() override
{
if (AndroidSensors::registerListener(m_type, this, sensor()->dataRate()))
m_isStarted = true;
}
- void stop() Q_DECL_OVERRIDE
+ void stop() override
{
if (m_isStarted) {
m_isStarted = false;
diff --git a/src/plugins/sensors/android/src/androidcompass.cpp b/src/plugins/sensors/android/src/androidcompass.cpp
index 462695bc..e98f0484 100644
--- a/src/plugins/sensors/android/src/androidcompass.cpp
+++ b/src/plugins/sensors/android/src/androidcompass.cpp
@@ -64,12 +64,12 @@ public:
AndroidSensors::unregisterListener(AndroidSensors::TYPE_ACCELEROMETER, this);
}
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE
+ void onAccuracyChanged(jint accuracy) override
{
Q_UNUSED(accuracy);
}
- void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) Q_DECL_OVERRIDE
+ void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) override
{
if (size < 3)
return;
@@ -104,12 +104,12 @@ public:
AndroidSensors::unregisterListener(AndroidSensors::TYPE_MAGNETIC_FIELD, this);
}
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE
+ void onAccuracyChanged(jint accuracy) override
{
Q_UNUSED(accuracy);
}
- void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) Q_DECL_OVERRIDE
+ void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) override
{
if (size < 3)
return;
diff --git a/src/plugins/sensors/android/src/androidcompass.h b/src/plugins/sensors/android/src/androidcompass.h
index e8083398..16a7c41b 100644
--- a/src/plugins/sensors/android/src/androidcompass.h
+++ b/src/plugins/sensors/android/src/androidcompass.h
@@ -56,8 +56,8 @@ public:
AndroidCompass(QSensor *sensor);
~AndroidCompass();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
private:
AndroidAccelerometerListener *m_accelerometerListener;
diff --git a/src/plugins/sensors/android/src/androidgyroscope.h b/src/plugins/sensors/android/src/androidgyroscope.h
index 14ac986b..9dd5629d 100644
--- a/src/plugins/sensors/android/src/androidgyroscope.h
+++ b/src/plugins/sensors/android/src/androidgyroscope.h
@@ -48,8 +48,8 @@ class AndroidGyroscope : public AndroidCommonSensor<QGyroscopeReading>
public:
AndroidGyroscope(AndroidSensors::AndroidSensorType type, QSensor *sensor);
private:
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
- void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+ void onAccuracyChanged(jint accuracy) override;
+ void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
};
#endif // ANDROIDGYROSCOPE_H
diff --git a/src/plugins/sensors/android/src/androidlight.h b/src/plugins/sensors/android/src/androidlight.h
index 1f708fa3..3c94c138 100644
--- a/src/plugins/sensors/android/src/androidlight.h
+++ b/src/plugins/sensors/android/src/androidlight.h
@@ -48,8 +48,8 @@ class AndroidLight : public AndroidCommonSensor<QLightReading>
public:
AndroidLight(AndroidSensors::AndroidSensorType type, QSensor *sensor);
private:
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
- void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+ void onAccuracyChanged(jint accuracy) override;
+ void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
};
#endif // ANDROIDLIGHT_H
diff --git a/src/plugins/sensors/android/src/androidmagnetometer.h b/src/plugins/sensors/android/src/androidmagnetometer.h
index 5cceccc4..1b6a4359 100644
--- a/src/plugins/sensors/android/src/androidmagnetometer.h
+++ b/src/plugins/sensors/android/src/androidmagnetometer.h
@@ -48,8 +48,8 @@ class AndroidMagnetometer : public AndroidCommonSensor<QMagnetometerReading>
public:
AndroidMagnetometer(AndroidSensors::AndroidSensorType type, QSensor *sensor);
private:
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
- void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+ void onAccuracyChanged(jint accuracy) override;
+ void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
};
#endif // ANDROIDMAGNETOMETER_H
diff --git a/src/plugins/sensors/android/src/androidproximity.h b/src/plugins/sensors/android/src/androidproximity.h
index a007f3c4..5a3110c2 100644
--- a/src/plugins/sensors/android/src/androidproximity.h
+++ b/src/plugins/sensors/android/src/androidproximity.h
@@ -49,8 +49,8 @@ class AndroidProximity : public AndroidCommonSensor<QProximityReading>
public:
AndroidProximity(AndroidSensors::AndroidSensorType type, QSensor *sensor);
private:
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
- void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+ void onAccuracyChanged(jint accuracy) override;
+ void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
qreal m_maximumRange;
};
diff --git a/src/plugins/sensors/android/src/androidrotation.h b/src/plugins/sensors/android/src/androidrotation.h
index ae6aeaf3..0fe90a61 100644
--- a/src/plugins/sensors/android/src/androidrotation.h
+++ b/src/plugins/sensors/android/src/androidrotation.h
@@ -47,8 +47,8 @@ class AndroidRotation : public AndroidCommonSensor<QRotationReading>
public:
AndroidRotation(AndroidSensors::AndroidSensorType type, QSensor *sensor);
private:
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
- void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+ void onAccuracyChanged(jint accuracy) override;
+ void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
};
#endif // ANDROIDROTATION_H
diff --git a/src/plugins/sensors/android/src/androidtemperature.h b/src/plugins/sensors/android/src/androidtemperature.h
index 78a93380..1640033b 100644
--- a/src/plugins/sensors/android/src/androidtemperature.h
+++ b/src/plugins/sensors/android/src/androidtemperature.h
@@ -49,8 +49,8 @@ class AndroidTemperature : public AndroidCommonSensor<QAmbientTemperatureReading
public:
AndroidTemperature(AndroidSensors::AndroidSensorType type, QSensor *sensor);
private:
- void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
- void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
+ void onAccuracyChanged(jint accuracy) override;
+ void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override;
};
#endif // ANDROIDTEMPERATURE_H
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;
};
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;
diff --git a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h
index 60b201ee..30d79e37 100644
--- a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h
+++ b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h
@@ -56,11 +56,11 @@ public:
IIOSensorProxyCompass(QSensor *sensor);
~IIOSensorProxyCompass();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
protected:
- void updateProperties(const QVariantMap &changedProperties) Q_DECL_OVERRIDE;
+ void updateProperties(const QVariantMap &changedProperties) override;
private:
void updateAzimuth(double azimuth);
diff --git a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxylightsensor.h b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxylightsensor.h
index e1acd239..14c07d66 100644
--- a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxylightsensor.h
+++ b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxylightsensor.h
@@ -56,11 +56,11 @@ public:
IIOSensorProxyLightSensor(QSensor *sensor);
~IIOSensorProxyLightSensor();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
protected:
- void updateProperties(const QVariantMap &changedProperties) Q_DECL_OVERRIDE;
+ void updateProperties(const QVariantMap &changedProperties) override;
private:
void updateLightLevel(double lux);
diff --git a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h
index b62aad9e..959113f1 100644
--- a/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h
+++ b/src/plugins/sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h
@@ -56,11 +56,11 @@ public:
IIOSensorProxyOrientationSensor(QSensor *sensor);
~IIOSensorProxyOrientationSensor();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
protected:
- void updateProperties(const QVariantMap &changedProperties) Q_DECL_OVERRIDE;
+ void updateProperties(const QVariantMap &changedProperties) override;
private:
void updateOrientation(const QString &orientation);
diff --git a/src/plugins/sensors/ios/iosaccelerometer.h b/src/plugins/sensors/ios/iosaccelerometer.h
index 14b6cc03..4ac73a97 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 997b1dfa..2babc92a 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 3969bb1a..0d7fea49 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 f4ab34a5..2c55eac3 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 4cff4fce..0d69391f 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();
diff --git a/src/plugins/sensors/linux/linuxsysaccelerometer.h b/src/plugins/sensors/linux/linuxsysaccelerometer.h
index fbcc82e9..af89bf77 100644
--- a/src/plugins/sensors/linux/linuxsysaccelerometer.h
+++ b/src/plugins/sensors/linux/linuxsysaccelerometer.h
@@ -53,10 +53,10 @@ public:
LinuxSysAccelerometer(QSensor *sensor);
~LinuxSysAccelerometer();
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
void poll();
- void timerEvent(QTimerEvent * /*event*/) Q_DECL_OVERRIDE;
+ void timerEvent(QTimerEvent * /*event*/) override;
private:
QAccelerometerReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h
index 23be816b..89d7bf78 100644
--- a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h
+++ b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h
@@ -55,10 +55,10 @@ public:
static char const * const id;
sensorfwaccelerometer(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- qreal correctionFactor() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ qreal correctionFactor() const override;
+ void start() override;
virtual void init();
private:
diff --git a/src/plugins/sensors/sensorfw/sensorfwals.h b/src/plugins/sensors/sensorfw/sensorfwals.h
index d0062a0b..9a71550e 100644
--- a/src/plugins/sensors/sensorfw/sensorfwals.h
+++ b/src/plugins/sensors/sensorfw/sensorfwals.h
@@ -55,9 +55,9 @@ public:
static char const * const id;
Sensorfwals(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ void start() override;
virtual void init();
private:
diff --git a/src/plugins/sensors/sensorfw/sensorfwcompass.h b/src/plugins/sensors/sensorfw/sensorfwcompass.h
index d1ad60a2..9afe9b41 100644
--- a/src/plugins/sensors/sensorfw/sensorfwcompass.h
+++ b/src/plugins/sensors/sensorfw/sensorfwcompass.h
@@ -55,9 +55,9 @@ public:
static char const * const id;
SensorfwCompass(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ void start() override;
virtual void init();
private:
QCompassReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwgyroscope.h b/src/plugins/sensors/sensorfw/sensorfwgyroscope.h
index 817ef519..d9346a94 100644
--- a/src/plugins/sensors/sensorfw/sensorfwgyroscope.h
+++ b/src/plugins/sensors/sensorfw/sensorfwgyroscope.h
@@ -57,10 +57,10 @@ public:
static char const * const id;
SensorfwGyroscope(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- qreal correctionFactor() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ qreal correctionFactor() const override;
+ void start() override;
virtual void init();
private:
diff --git a/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h b/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h
index b772e537..ece68a58 100644
--- a/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h
@@ -54,9 +54,9 @@ public:
SensorfwIrProximitySensor(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ void start() override;
virtual void init();
private:
QIRProximityReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwlightsensor.h b/src/plugins/sensors/sensorfw/sensorfwlightsensor.h
index c1aa27da..9d8faa6c 100644
--- a/src/plugins/sensors/sensorfw/sensorfwlightsensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwlightsensor.h
@@ -55,9 +55,9 @@ public:
static char const * const id;
SensorfwLightSensor(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ void start() override;
virtual void init();
private:
QLightReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h
index 8f6f80b8..03f29556 100644
--- a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h
+++ b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h
@@ -56,10 +56,10 @@ public:
static char const * const id;
SensorfwMagnetometer(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- qreal correctionFactor() const Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ void start() override;
+ QString sensorName() const override;
+ qreal correctionFactor() const override;
virtual void init();
private:
diff --git a/src/plugins/sensors/sensorfw/sensorfworientationsensor.h b/src/plugins/sensors/sensorfw/sensorfworientationsensor.h
index 1828b0a6..fac59fe8 100644
--- a/src/plugins/sensors/sensorfw/sensorfworientationsensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfworientationsensor.h
@@ -55,9 +55,9 @@ public:
static char const * const id;
SensorfwOrientationSensor(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ void start() override;
virtual void init();
private:
QOrientationReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h
index 16702da3..d8b96640 100644
--- a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h
@@ -55,9 +55,9 @@ public:
static char const * const id;
SensorfwProximitySensor(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ void start() override;
virtual void init();
private:
diff --git a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h
index a4e1d08a..f9150f6d 100644
--- a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h
@@ -57,9 +57,9 @@ public:
static char const * const id;
SensorfwRotationSensor(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ QString sensorName() const override;
+ void start() override;
virtual void init();
private:
QRotationReading m_reading;
diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h
index 3e5e0538..7e7f5c33 100644
--- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h
+++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h
@@ -60,8 +60,8 @@ public:
protected:
virtual bool doConnect()=0;
- void start() Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
+ void start() override;
+ void stop() override;
static const float GRAVITY_EARTH;
static const float GRAVITY_EARTH_THOUSANDTH; //for speed
diff --git a/src/plugins/sensors/sensorfw/sensorfwtapsensor.h b/src/plugins/sensors/sensorfw/sensorfwtapsensor.h
index d7251591..7e9edb4c 100644
--- a/src/plugins/sensors/sensorfw/sensorfwtapsensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwtapsensor.h
@@ -55,9 +55,9 @@ public:
static char const * const id;
SensorfwTapSensor(QSensor *sensor);
protected:
- bool doConnect() Q_DECL_OVERRIDE;
- void start() Q_DECL_OVERRIDE;
- QString sensorName() const Q_DECL_OVERRIDE;
+ bool doConnect() override;
+ void start() override;
+ QString sensorName() const override;
virtual void init();
private:
QTapReading m_reading;
diff --git a/src/plugins/sensors/simulator/simulatoraccelerometer.h b/src/plugins/sensors/simulator/simulatoraccelerometer.h
index 12605c39..a4205867 100644
--- a/src/plugins/sensors/simulator/simulatoraccelerometer.h
+++ b/src/plugins/sensors/simulator/simulatoraccelerometer.h
@@ -50,7 +50,7 @@ public:
SimulatorAccelerometer(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QAccelerometerReading m_reading;
};
diff --git a/src/plugins/sensors/simulator/simulatorambientlightsensor.h b/src/plugins/sensors/simulator/simulatorambientlightsensor.h
index ecac5be4..0aadffe6 100644
--- a/src/plugins/sensors/simulator/simulatorambientlightsensor.h
+++ b/src/plugins/sensors/simulator/simulatorambientlightsensor.h
@@ -50,7 +50,7 @@ public:
SimulatorAmbientLightSensor(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QAmbientLightReading m_reading;
};
diff --git a/src/plugins/sensors/simulator/simulatorcommon.h b/src/plugins/sensors/simulator/simulatorcommon.h
index 084b10d1..e47f24d0 100644
--- a/src/plugins/sensors/simulator/simulatorcommon.h
+++ b/src/plugins/sensors/simulator/simulatorcommon.h
@@ -92,10 +92,10 @@ class SimulatorCommon : public QSensorBackend
public:
SimulatorCommon(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;
private:
int m_timerid;
diff --git a/src/plugins/sensors/simulator/simulatorcompass.h b/src/plugins/sensors/simulator/simulatorcompass.h
index a9e64754..69162c69 100644
--- a/src/plugins/sensors/simulator/simulatorcompass.h
+++ b/src/plugins/sensors/simulator/simulatorcompass.h
@@ -50,7 +50,7 @@ public:
SimulatorCompass(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QCompassReading m_reading;
};
diff --git a/src/plugins/sensors/simulator/simulatorirproximitysensor.h b/src/plugins/sensors/simulator/simulatorirproximitysensor.h
index 6173631d..db20968b 100644
--- a/src/plugins/sensors/simulator/simulatorirproximitysensor.h
+++ b/src/plugins/sensors/simulator/simulatorirproximitysensor.h
@@ -50,7 +50,7 @@ public:
SimulatorIRProximitySensor(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QIRProximityReading m_reading;
};
diff --git a/src/plugins/sensors/simulator/simulatorlightsensor.h b/src/plugins/sensors/simulator/simulatorlightsensor.h
index 78d8f846..3af3a526 100644
--- a/src/plugins/sensors/simulator/simulatorlightsensor.h
+++ b/src/plugins/sensors/simulator/simulatorlightsensor.h
@@ -50,7 +50,7 @@ public:
SimulatorLightSensor(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QLightReading m_reading;
};
diff --git a/src/plugins/sensors/simulator/simulatormagnetometer.h b/src/plugins/sensors/simulator/simulatormagnetometer.h
index f602d464..facbad41 100644
--- a/src/plugins/sensors/simulator/simulatormagnetometer.h
+++ b/src/plugins/sensors/simulator/simulatormagnetometer.h
@@ -50,7 +50,7 @@ public:
SimulatorMagnetometer(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QMagnetometerReading m_reading;
};
diff --git a/src/plugins/sensors/simulator/simulatorproximitysensor.h b/src/plugins/sensors/simulator/simulatorproximitysensor.h
index 22b72873..16e6f6bb 100644
--- a/src/plugins/sensors/simulator/simulatorproximitysensor.h
+++ b/src/plugins/sensors/simulator/simulatorproximitysensor.h
@@ -50,7 +50,7 @@ public:
SimulatorProximitySensor(QSensor *sensor);
- void poll() Q_DECL_OVERRIDE;
+ void poll() override;
private:
QProximityReading m_reading;
};
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;