From 8065e461421ea17a942ea09d67aaa053a136a54e Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 30 Sep 2016 18:33:12 -0700 Subject: Port the iOS sensors plugin to the other UIKit platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit watchOS supports accelerometer, gyroscope, and magnetometer. tvOS supports only the proximity sensor. No sensors are available on macOS yet, but the plugin is still built there because many of the underlying APIs are available cross platform and so some macOS sensors can appear here in the future. Change-Id: I1668d81f09c745e60c1906be621a74f969841566 Reviewed-by: Mike Krus Reviewed-by: Tor Arne Vestbø --- src/plugins/sensors/ios/ios.pro | 56 ++++++++++++++++++++-------- src/plugins/sensors/ios/iosaccelerometer.h | 4 +- src/plugins/sensors/ios/iosaccelerometer.mm | 4 +- src/plugins/sensors/ios/iosgyroscope.h | 4 +- src/plugins/sensors/ios/iosgyroscope.mm | 2 + src/plugins/sensors/ios/iosmagnetometer.h | 4 +- src/plugins/sensors/ios/iosmagnetometer.mm | 2 + src/plugins/sensors/ios/iosmotionmanager.h | 5 ++- src/plugins/sensors/ios/iosmotionmanager.mm | 2 + src/plugins/sensors/ios/iosproximitysensor.h | 4 +- src/plugins/sensors/ios/main.mm | 18 ++++++++- src/plugins/sensors/sensors.pro | 4 +- 12 files changed, 78 insertions(+), 31 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/sensors/ios/ios.pro b/src/plugins/sensors/ios/ios.pro index 17ff0095..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 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..14b6cc03 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 - #include #include +@class CMMotionManager; + QT_BEGIN_NAMESPACE class IOSAccelerometer : public QSensorBackend 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 - #include "iosaccelerometer.h" #include "iosmotionmanager.h" +#import + char const * const IOSAccelerometer::id("ios.accelerometer"); QT_BEGIN_NAMESPACE diff --git a/src/plugins/sensors/ios/iosgyroscope.h b/src/plugins/sensors/ios/iosgyroscope.h index d8ff04a1..3969bb1a 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 - #include #include +@class CMMotionManager; + QT_BEGIN_NAMESPACE class IOSGyroscope : public QSensorBackend 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 + 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..f4ab34a5 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 - #include #include +@class CMMotionManager; + QT_BEGIN_NAMESPACE class IOSMagnetometer : public QSensorBackend 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 + 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 -#import +#import + +@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 + static CMMotionManager *sharedManager = nil; @implementation QIOSMotionManager diff --git a/src/plugins/sensors/ios/iosproximitysensor.h b/src/plugins/sensors/ios/iosproximitysensor.h index 99f9564e..4cff4fce 100644 --- a/src/plugins/sensors/ios/iosproximitysensor.h +++ b/src/plugins/sensors/ios/iosproximitysensor.h @@ -43,10 +43,10 @@ #include #include -QT_BEGIN_NAMESPACE - @class ProximitySensorCallback; +QT_BEGIN_NAMESPACE + class IOSProximitySensor : public QSensorBackend { public: 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 +#ifdef HAVE_COREMOTION +#import +#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/sensors.pro b/src/plugins/sensors/sensors.pro index 5a860fdc..af2fae10 100644 --- a/src/plugins/sensors/sensors.pro +++ b/src/plugins/sensors/sensors.pro @@ -8,7 +8,7 @@ sensorfw { isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = sensorfw generic } -ios { +darwin { isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = ios generic } @@ -31,5 +31,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 -- cgit v1.2.3 From 5bf1bd00335d0c95c54de426a02da2a98257fedb Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 30 Sep 2016 18:33:12 -0700 Subject: Port qtsensors to the new configure framework Don't invoke pkg-config at build time, automatically check for sensorfw and compile the correct plugin if found. Change-Id: I30dcd41cdebd7cf082cec66f3122c24fbab5c893 Reviewed-by: Oswald Buddenhagen Reviewed-by: Robin Burchell --- src/plugins/sensors/sensorfw/sensorfw.pro | 6 ++---- src/plugins/sensors/sensors.pro | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/plugins') 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/sensors.pro b/src/plugins/sensors/sensors.pro index af2fae10..76989335 100644 --- a/src/plugins/sensors/sensors.pro +++ b/src/plugins/sensors/sensors.pro @@ -1,10 +1,11 @@ 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 } -- cgit v1.2.3 From 2ffee2623aac9245799a437ce4bbe0c8c198bb7f Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Thu, 10 Nov 2016 13:38:36 +1000 Subject: Fix lux value in sensorfw backend Make light sensor value consistent with timestamp Change-Id: If6d5f15e2c645e86852a5b66cf0894a1e2ca3f1c Reviewed-by: Alex Blasche --- src/plugins/sensors/sensorfw/sensorfwals.cpp | 2 +- src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins') 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/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(); } -- cgit v1.2.3 From c4f18f019ee3a72a752361c65904fa1a156e9eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Mon, 21 Nov 2016 14:09:58 +0100 Subject: Android: Fix incorrect accuracy levels Android reports accuracy in four different levels (0, 1, 2 and 3), these values were used directly in Qt, so the reported values would be outside Qt documented range, which is a floating point number between 0 and 1. Task-number: QTBUG-57184 Change-Id: I912a76bffd3e205689103b0352ea4c480d660d63 Reviewed-by: Lorn Potter --- src/plugins/sensors/android/src/androidmagnetometer.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/plugins') diff --git a/src/plugins/sensors/android/src/androidmagnetometer.cpp b/src/plugins/sensors/android/src/androidmagnetometer.cpp index 76cc8f42..62f540e7 100644 --- a/src/plugins/sensors/android/src/androidmagnetometer.cpp +++ b/src/plugins/sensors/android/src/androidmagnetometer.cpp @@ -33,13 +33,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(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) -- cgit v1.2.3 From 2c595c382c50a5632b14eda00d85a9b7fcb09b5d Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Fri, 2 Dec 2016 02:09:24 +0300 Subject: Replace Q_DECL_OVERRIDE by override 'override' keyword can be used directly since Qt 5.7. Change-Id: Ibf0fc590f7e247a310a833a22ece700ec75199bb Reviewed-by: Lorn Potter --- .../sensorgestures/qtsensors/qcoversensorgesturerecognizer.h | 10 +++++----- .../qtsensors/qdoubletapsensorgesturerecognizer.h | 10 +++++----- .../qtsensors/qfreefallsensorgesturerecognizer.h | 10 +++++----- .../sensorgestures/qtsensors/qhoversensorgesturerecognizer.h | 10 +++++----- .../sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h | 10 +++++----- src/plugins/sensorgestures/qtsensors/qshake2recognizer.h | 10 +++++----- src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h | 10 +++++----- src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h | 6 +++--- .../qtsensors/qturnoversensorgesturerecognizer.h | 10 +++++----- .../sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h | 10 +++++----- .../sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h | 10 +++++----- src/plugins/sensorgestures/shake/qshakerecognizer.h | 10 +++++----- src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h | 6 +++--- src/plugins/sensors/android/src/androidaccelerometer.h | 4 ++-- src/plugins/sensors/android/src/androidcommonsensor.h | 4 ++-- src/plugins/sensors/android/src/androidcompass.cpp | 8 ++++---- src/plugins/sensors/android/src/androidcompass.h | 4 ++-- src/plugins/sensors/android/src/androidgyroscope.h | 4 ++-- src/plugins/sensors/android/src/androidlight.h | 4 ++-- src/plugins/sensors/android/src/androidmagnetometer.h | 4 ++-- src/plugins/sensors/android/src/androidproximity.h | 4 ++-- src/plugins/sensors/android/src/androidrotation.h | 4 ++-- src/plugins/sensors/android/src/androidtemperature.h | 4 ++-- src/plugins/sensors/dummy/dummyaccelerometer.h | 2 +- src/plugins/sensors/dummy/dummycommon.h | 6 +++--- src/plugins/sensors/dummy/dummylightsensor.h | 2 +- src/plugins/sensors/generic/genericalssensor.h | 6 +++--- src/plugins/sensors/generic/genericorientationsensor.h | 6 +++--- src/plugins/sensors/generic/genericrotationsensor.h | 6 +++--- src/plugins/sensors/generic/generictiltsensor.h | 8 ++++---- src/plugins/sensors/iio-sensor-proxy/iiosensorproxycompass.h | 6 +++--- .../sensors/iio-sensor-proxy/iiosensorproxylightsensor.h | 6 +++--- .../sensors/iio-sensor-proxy/iiosensorproxyorientationsensor.h | 6 +++--- src/plugins/sensors/ios/iosaccelerometer.h | 6 +++--- src/plugins/sensors/ios/ioscompass.h | 4 ++-- src/plugins/sensors/ios/iosgyroscope.h | 6 +++--- src/plugins/sensors/ios/iosmagnetometer.h | 6 +++--- src/plugins/sensors/ios/iosproximitysensor.h | 4 ++-- src/plugins/sensors/linux/linuxsysaccelerometer.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwaccelerometer.h | 8 ++++---- src/plugins/sensors/sensorfw/sensorfwals.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwcompass.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwgyroscope.h | 8 ++++---- src/plugins/sensors/sensorfw/sensorfwirproximitysensor.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwlightsensor.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwmagnetometer.h | 8 ++++---- src/plugins/sensors/sensorfw/sensorfworientationsensor.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwproximitysensor.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwrotationsensor.h | 6 +++--- src/plugins/sensors/sensorfw/sensorfwsensorbase.h | 4 ++-- src/plugins/sensors/sensorfw/sensorfwtapsensor.h | 6 +++--- src/plugins/sensors/simulator/simulatoraccelerometer.h | 2 +- src/plugins/sensors/simulator/simulatorambientlightsensor.h | 2 +- src/plugins/sensors/simulator/simulatorcommon.h | 6 +++--- src/plugins/sensors/simulator/simulatorcompass.h | 2 +- src/plugins/sensors/simulator/simulatorirproximitysensor.h | 2 +- src/plugins/sensors/simulator/simulatorlightsensor.h | 2 +- src/plugins/sensors/simulator/simulatormagnetometer.h | 2 +- src/plugins/sensors/simulator/simulatorproximitysensor.h | 2 +- src/plugins/sensors/winrt/winrtaccelerometer.h | 4 ++-- src/plugins/sensors/winrt/winrtambientlightsensor.h | 4 ++-- src/plugins/sensors/winrt/winrtcompass.h | 4 ++-- src/plugins/sensors/winrt/winrtgyroscope.h | 6 +++--- src/plugins/sensors/winrt/winrtorientationsensor.h | 4 ++-- src/plugins/sensors/winrt/winrtrotationsensor.h | 6 +++--- 65 files changed, 188 insertions(+), 188 deletions(-) (limited to 'src/plugins') 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 createRecognizers() Q_DECL_OVERRIDE; + QList 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 createRecognizers() Q_DECL_OVERRIDE; + QList 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 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 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 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 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 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 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 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 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 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 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 d_ptr; -- cgit v1.2.3