diff options
Diffstat (limited to 'src/plugins/sensors')
64 files changed, 226 insertions, 166 deletions
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.cpp b/src/plugins/sensors/android/src/androidmagnetometer.cpp index a729dddf..fcde4cf5 100644 --- a/src/plugins/sensors/android/src/androidmagnetometer.cpp +++ b/src/plugins/sensors/android/src/androidmagnetometer.cpp @@ -39,13 +39,27 @@ #include "androidmagnetometer.h" +enum AndroidSensorStatus +{ + SENSOR_STATUS_UNRELIABLE = 0, + SENSOR_STATUS_ACCURACY_LOW = 1, + SENSOR_STATUS_ACCURACY_MEDIUM = 2, + SENSOR_STATUS_ACCURACY_HIGH = 3, +}; + AndroidMagnetometer::AndroidMagnetometer(AndroidSensors::AndroidSensorType type, QSensor *sensor) :AndroidCommonSensor<QMagnetometerReading>(type, sensor) {} void AndroidMagnetometer::onAccuracyChanged(jint accuracy) { - m_reader.setCalibrationLevel(accuracy); + // Expected range is [0, 3] + if (accuracy < SENSOR_STATUS_UNRELIABLE || accuracy > SENSOR_STATUS_ACCURACY_HIGH) { + qWarning("Unable to get sensor accuracy. Unexpected value: %d", accuracy); + return; + } + + m_reader.setCalibrationLevel(accuracy / qreal(3.0)); } void AndroidMagnetometer::onSensorChanged(jlong timestamp, const jfloat *values, uint size) 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/ios.pro b/src/plugins/sensors/ios/ios.pro index b7ddb8fd..91ec3ae0 100644 --- a/src/plugins/sensors/ios/ios.pro +++ b/src/plugins/sensors/ios/ios.pro @@ -3,22 +3,46 @@ QT = core sensors OTHER_FILES = plugin.json -HEADERS += iosaccelerometer.h \ - iosmotionmanager.h \ - iosgyroscope.h \ - iosmagnetometer.h \ - ioscompass.h \ - iosproximitysensor.h - -OBJECTIVE_SOURCES += main.mm \ - iosaccelerometer.mm \ - iosmotionmanager.mm \ - iosgyroscope.mm \ - iosmagnetometer.mm \ - ioscompass.mm \ - iosproximitysensor.mm - -LIBS += -framework Foundation -framework UIKit -framework CoreMotion -framework CoreLocation +OBJECTIVE_SOURCES += main.mm +LIBS += -framework Foundation + +uikit { + ios { + HEADERS += \ + ioscompass.h + OBJECTIVE_SOURCES += \ + ioscompass.mm + + DEFINES += HAVE_COMPASS + LIBS += -framework CoreLocation + } + + !tvos { + HEADERS += \ + iosaccelerometer.h \ + iosgyroscope.h \ + iosmagnetometer.h \ + iosmotionmanager.h + OBJECTIVE_SOURCES += \ + iosaccelerometer.mm \ + iosgyroscope.mm \ + iosmagnetometer.mm \ + iosmotionmanager.mm + + DEFINES += HAVE_COREMOTION + LIBS += -framework CoreMotion + } + + !watchos { + HEADERS += \ + iosproximitysensor.h + OBJECTIVE_SOURCES += \ + iosproximitysensor.mm + + DEFINES += HAVE_UIDEVICE + LIBS += -framework UIKit + } +} PLUGIN_TYPE = sensors PLUGIN_CLASS_NAME = IOSSensorPlugin diff --git a/src/plugins/sensors/ios/iosaccelerometer.h b/src/plugins/sensors/ios/iosaccelerometer.h index 620015f2..4ac73a97 100644 --- a/src/plugins/sensors/ios/iosaccelerometer.h +++ b/src/plugins/sensors/ios/iosaccelerometer.h @@ -40,11 +40,11 @@ #ifndef IOSACCELEROMETER_H #define IOSACCELEROMETER_H -#include <CoreMotion/CMMotionManager.h> - #include <qsensorbackend.h> #include <qaccelerometer.h> +@class CMMotionManager; + QT_BEGIN_NAMESPACE class IOSAccelerometer : public QSensorBackend @@ -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/iosaccelerometer.mm b/src/plugins/sensors/ios/iosaccelerometer.mm index 2d2e27ae..d2d6e9fb 100644 --- a/src/plugins/sensors/ios/iosaccelerometer.mm +++ b/src/plugins/sensors/ios/iosaccelerometer.mm @@ -37,11 +37,11 @@ ** ****************************************************************************/ -#include <UIKit/UIAccelerometer.h> - #include "iosaccelerometer.h" #include "iosmotionmanager.h" +#import <CoreMotion/CoreMotion.h> + char const * const IOSAccelerometer::id("ios.accelerometer"); QT_BEGIN_NAMESPACE 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 d8ff04a1..0d7fea49 100644 --- a/src/plugins/sensors/ios/iosgyroscope.h +++ b/src/plugins/sensors/ios/iosgyroscope.h @@ -40,11 +40,11 @@ #ifndef IOSGYROSCOPE_H #define IOSGYROSCOPE_H -#include <CoreMotion/CMMotionManager.h> - #include <qsensorbackend.h> #include <qgyroscope.h> +@class CMMotionManager; + QT_BEGIN_NAMESPACE class IOSGyroscope : public QSensorBackend @@ -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/iosgyroscope.mm b/src/plugins/sensors/ios/iosgyroscope.mm index 19e65e57..0cd37aea 100644 --- a/src/plugins/sensors/ios/iosgyroscope.mm +++ b/src/plugins/sensors/ios/iosgyroscope.mm @@ -40,6 +40,8 @@ #include "iosmotionmanager.h" #include "iosgyroscope.h" +#import <CoreMotion/CoreMotion.h> + char const * const IOSGyroscope::id("ios.gyroscope"); QT_BEGIN_NAMESPACE diff --git a/src/plugins/sensors/ios/iosmagnetometer.h b/src/plugins/sensors/ios/iosmagnetometer.h index 00d921e8..2c55eac3 100644 --- a/src/plugins/sensors/ios/iosmagnetometer.h +++ b/src/plugins/sensors/ios/iosmagnetometer.h @@ -40,11 +40,11 @@ #ifndef IOSMAGNETOMETER_H #define IOSMAGNETOMETER_H -#include <CoreMotion/CMMotionManager.h> - #include <qsensorbackend.h> #include <qmagnetometer.h> +@class CMMotionManager; + QT_BEGIN_NAMESPACE class IOSMagnetometer : public QSensorBackend @@ -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/iosmagnetometer.mm b/src/plugins/sensors/ios/iosmagnetometer.mm index 98bef2dd..bfbe6e6d 100644 --- a/src/plugins/sensors/ios/iosmagnetometer.mm +++ b/src/plugins/sensors/ios/iosmagnetometer.mm @@ -40,6 +40,8 @@ #include "iosmotionmanager.h" #include "iosmagnetometer.h" +#import <CoreMotion/CoreMotion.h> + QT_BEGIN_NAMESPACE char const * const IOSMagnetometer::id("ios.magnetometer"); diff --git a/src/plugins/sensors/ios/iosmotionmanager.h b/src/plugins/sensors/ios/iosmotionmanager.h index 6e0cbd62..7c2a1b27 100644 --- a/src/plugins/sensors/ios/iosmotionmanager.h +++ b/src/plugins/sensors/ios/iosmotionmanager.h @@ -40,8 +40,9 @@ #ifndef IOSMOTIONMANAGER_H #define IOSMOTIONMANAGER_H -#import <UIKit/UIKit.h> -#import <CoreMotion/CoreMotion.h> +#import <Foundation/Foundation.h> + +@class CMMotionManager; @interface QIOSMotionManager : NSObject { } diff --git a/src/plugins/sensors/ios/iosmotionmanager.mm b/src/plugins/sensors/ios/iosmotionmanager.mm index 7db56a21..90741089 100644 --- a/src/plugins/sensors/ios/iosmotionmanager.mm +++ b/src/plugins/sensors/ios/iosmotionmanager.mm @@ -39,6 +39,8 @@ #include "iosmotionmanager.h" +#import <CoreMotion/CoreMotion.h> + static CMMotionManager *sharedManager = nil; @implementation QIOSMotionManager diff --git a/src/plugins/sensors/ios/iosproximitysensor.h b/src/plugins/sensors/ios/iosproximitysensor.h index 99f9564e..0d69391f 100644 --- a/src/plugins/sensors/ios/iosproximitysensor.h +++ b/src/plugins/sensors/ios/iosproximitysensor.h @@ -43,10 +43,10 @@ #include <qsensorbackend.h> #include <qproximitysensor.h> -QT_BEGIN_NAMESPACE - @class ProximitySensorCallback; +QT_BEGIN_NAMESPACE + class IOSProximitySensor : public QSensorBackend { public: @@ -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/ios/main.mm b/src/plugins/sensors/ios/main.mm index 40f84e9a..a4766c37 100644 --- a/src/plugins/sensors/ios/main.mm +++ b/src/plugins/sensors/ios/main.mm @@ -48,6 +48,11 @@ #include "ioscompass.h" #include "iosproximitysensor.h" +#import <CoreLocation/CoreLocation.h> +#ifdef HAVE_COREMOTION +#import <CoreMotion/CoreMotion.h> +#endif + class IOSSensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory { Q_OBJECT @@ -56,30 +61,41 @@ class IOSSensorPlugin : public QObject, public QSensorPluginInterface, public QS public: void registerSensors() { +#ifdef HAVE_COREMOTION QSensorManager::registerBackend(QAccelerometer::type, IOSAccelerometer::id, this); if ([QIOSMotionManager sharedManager].gyroAvailable) QSensorManager::registerBackend(QGyroscope::type, IOSGyroscope::id, this); if ([QIOSMotionManager sharedManager].magnetometerAvailable) QSensorManager::registerBackend(QMagnetometer::type, IOSMagnetometer::id, this); +#endif +#ifdef HAVE_COMPASS if ([CLLocationManager headingAvailable]) QSensorManager::registerBackend(QCompass::type, IOSCompass::id, this); +#endif +#ifdef HAVE_UIDEVICE if (IOSProximitySensor::available()) QSensorManager::registerBackend(QProximitySensor::type, IOSProximitySensor::id, this); +#endif } QSensorBackend *createBackend(QSensor *sensor) { +#ifdef HAVE_COREMOTION if (sensor->identifier() == IOSAccelerometer::id) return new IOSAccelerometer(sensor); if (sensor->identifier() == IOSGyroscope::id) return new IOSGyroscope(sensor); if (sensor->identifier() == IOSMagnetometer::id) return new IOSMagnetometer(sensor); +#endif +#ifdef HAVE_COMPASS if (sensor->identifier() == IOSCompass::id) return new IOSCompass(sensor); +#endif +#ifdef HAVE_UIDEVICE if (sensor->identifier() == IOSProximitySensor::id) return new IOSProximitySensor(sensor); - +#endif return 0; } }; 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/sensorfw.pro b/src/plugins/sensors/sensorfw/sensorfw.pro index b30b3624..63a66117 100644 --- a/src/plugins/sensors/sensorfw/sensorfw.pro +++ b/src/plugins/sensors/sensorfw/sensorfw.pro @@ -1,11 +1,9 @@ TARGET = qtsensors_sensorfw -QT = core sensors network dbus +QT = core sensors-private network dbus include(sensorfw.pri) - -CONFIG += link_pkgconfig -PKGCONFIG += sensord-qt5 +QMAKE_USE += sensorfw CONFIGFILES.files = Sensors.conf CONFIGFILES.path = /etc/xdg/QtProject/ 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.cpp b/src/plugins/sensors/sensorfw/sensorfwals.cpp index 89462014..c43f7648 100644 --- a/src/plugins/sensors/sensorfw/sensorfwals.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwals.cpp @@ -71,7 +71,7 @@ void Sensorfwals::start() void Sensorfwals::slotDataAvailable(const Unsigned& data) { - QAmbientLightReading::LightLevel level = getLightLevel(data.x()); + QAmbientLightReading::LightLevel level = getLightLevel(data.UnsignedData().value_); if (level != m_reading.lightLevel()) { m_reading.setLightLevel(level); m_reading.setTimestamp(data.UnsignedData().timestamp_); 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.cpp b/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp index babbf9ef..9fc5bef3 100644 --- a/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp @@ -52,7 +52,7 @@ SensorfwLightSensor::SensorfwLightSensor(QSensor *sensor) void SensorfwLightSensor::slotDataAvailable(const Unsigned& data) { - m_reading.setLux(data.x()); + m_reading.setLux(data.UnsignedData().value_); m_reading.setTimestamp(data.UnsignedData().timestamp_); newReadingAvailable(); } 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/sensors.pro b/src/plugins/sensors/sensors.pro index 5a860fdc..76989335 100644 --- a/src/plugins/sensors/sensors.pro +++ b/src/plugins/sensors/sensors.pro @@ -1,14 +1,15 @@ TEMPLATE = subdirs +QT_FOR_CONFIG += sensors-private android { isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = android generic } -sensorfw { +qtConfig(sensorfw) { isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = sensorfw generic } -ios { +darwin { isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = ios generic } @@ -31,5 +32,5 @@ isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, linux):linux:SUBDIRS += linux isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, iio-sensor-proxy):linux:qtHaveModule(dbus):SUBDIRS += iio-sensor-proxy isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, android):android:SUBDIRS += android isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, sensorfw):sensorfw:SUBDIRS += sensorfw -isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, ios):ios:SUBDIRS += ios +isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, ios):darwin:SUBDIRS += ios isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, winrt):winrt:SUBDIRS += winrt 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; |