From 4c011aad53026775e25668e0fc1c2fedf2f181d8 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 1 Apr 2013 23:08:54 -0700 Subject: Fix warnings in qtsensors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qtapsensor.h:110:34: error: extra ";" [-pedantic] qsensor.cpp:147:12: error: ‘qrange_id’ defined but not used [-Werror=unused-variable] dummycommon.cpp:151:9: error: variable ‘ok’ set but not used [-Werror=unused-but-set-variable] Change-Id: Ief3b4841bae7c255a40ad8f19f3f8733a613db48 Reviewed-by: Paul Olav Tvete --- src/sensors/qsensor.cpp | 11 +++++++---- src/sensors/qtapsensor.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src/sensors') diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp index 01a4f7b7..c0589646 100644 --- a/src/sensors/qsensor.cpp +++ b/src/sensors/qsensor.cpp @@ -143,10 +143,13 @@ QT_BEGIN_NAMESPACE \sa QList, qoutputrange, QSensor::outputRanges */ -// A bit of a hack to call qRegisterMetaType when the library is loaded. -static int qrange_id = qRegisterMetaType("qrange"); -static int qrangelist_id = qRegisterMetaType("qrangelist"); -static int qoutputrangelist_id = qRegisterMetaType("qoutputrangelist"); +static void registerTypes() +{ + qRegisterMetaType("qrange"); + qRegisterMetaType("qrangelist"); + qRegisterMetaType("qoutputrangelist"); +} +Q_CONSTRUCTOR_FUNCTION(registerTypes) // ===================================================================== diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h index 74ca40c2..b8704114 100644 --- a/src/sensors/qtapsensor.h +++ b/src/sensors/qtapsensor.h @@ -107,7 +107,7 @@ Q_SIGNALS: void returnDoubleTapEventsChanged(bool returnDoubleTapEvents); private: - Q_DECLARE_PRIVATE(QTapSensor); + Q_DECLARE_PRIVATE(QTapSensor) Q_DISABLE_COPY(QTapSensor) }; -- cgit v1.2.3 From 517180c32cea6b38b24ce8b977c743276e1e98ae Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Thu, 14 Mar 2013 13:23:38 +0100 Subject: iOS: implement gyroscope for iOS Change-Id: I4a46908a4b4e166c489dce4a034ef68698288419 Reviewed-by: Thomas McGuire Reviewed-by: Lorn Potter --- src/sensors/doc/src/compatmap.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sensors') diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc index 62f94de0..9bb21fea 100644 --- a/src/sensors/doc/src/compatmap.qdoc +++ b/src/sensors/doc/src/compatmap.qdoc @@ -110,7 +110,7 @@ - + -- cgit v1.2.3 From 5725577a0cde3ca1efb7194dd79375c503fb83ed Mon Sep 17 00:00:00 2001 From: Thomas McGuire Date: Tue, 9 Apr 2013 16:02:03 +0200 Subject: Remove TODO comments With sensorfw we actually have a backend that uses these now. Change-Id: Iba088dc356a54ae43f29e8b5f77349a9a98c4d09 Reviewed-by: Lorn Potter --- src/sensors/qsensor.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/sensors') diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp index c0589646..80a1ce44 100644 --- a/src/sensors/qsensor.cpp +++ b/src/sensors/qsensor.cpp @@ -1038,7 +1038,6 @@ int QSensor::maxBufferSize() const */ void QSensor::setMaxBufferSize(int maxBufferSize) { - // ### Qt 6: Remove the entire maxBufferSize property, no backend really uses it Q_D(QSensor); if (d->maxBufferSize != maxBufferSize) { d->maxBufferSize = maxBufferSize; @@ -1069,7 +1068,6 @@ int QSensor::efficientBufferSize() const */ void QSensor::setEfficientBufferSize(int efficientBufferSize) { - // ### Qt 6: Remove the entire efficientBufferSize property, no backend really uses it Q_D(QSensor); if (d->efficientBufferSize != efficientBufferSize) { d->efficientBufferSize = efficientBufferSize; @@ -1120,8 +1118,6 @@ int QSensor::bufferSize() const void QSensor::setBufferSize(int bufferSize) { - // ### Qt 6: Currently only the Blackberry backend supports this, but only as an on/off switch. - // We should consider changing this to a more appropriate API. Q_D(QSensor); if (d->bufferSize != bufferSize) { d->bufferSize = bufferSize; -- cgit v1.2.3 From 8c9b27b1d01aab98ed5e283499654a74a1551d92 Mon Sep 17 00:00:00 2001 From: Thomas McGuire Date: Wed, 10 Apr 2013 08:58:06 +0200 Subject: Remove REVISION 1 from alwaysOn property. This is a leftover from QtMobility and has been available since Qt 5.0. Change-Id: I68300b402aa04f2ca9e9b609cc859327c26e1a8f Reviewed-by: Bernd Weimer Reviewed-by: Lorn Potter --- src/sensors/qsensor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sensors') diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h index 2314fb94..2b602488 100644 --- a/src/sensors/qsensor.h +++ b/src/sensors/qsensor.h @@ -90,7 +90,7 @@ class Q_SENSORS_EXPORT QSensor : public QObject Q_PROPERTY(int outputRange READ outputRange WRITE setOutputRange) Q_PROPERTY(QString description READ description) Q_PROPERTY(int error READ error NOTIFY sensorError) - Q_PROPERTY(bool alwaysOn READ isAlwaysOn WRITE setAlwaysOn NOTIFY alwaysOnChanged REVISION 1) + Q_PROPERTY(bool alwaysOn READ isAlwaysOn WRITE setAlwaysOn NOTIFY alwaysOnChanged) Q_PROPERTY(bool skipDuplicates READ skipDuplicates WRITE setSkipDuplicates NOTIFY skipDuplicatesChanged) Q_PROPERTY(AxesOrientationMode axesOrientationMode READ axesOrientationMode WRITE setAxesOrientationMode NOTIFY axesOrientationModeChanged) Q_PROPERTY(int currentOrientation READ currentOrientation NOTIFY currentOrientationChanged) -- cgit v1.2.3 From a16f81a365b7d9a6629b04bd298a3b45fc1b7628 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Wed, 20 Mar 2013 12:50:04 +0100 Subject: iOS: implement magnetometer Change-Id: I611e1ccafb0362b78737785e9cc7f4f48278063a Reviewed-by: Lorn Potter --- src/sensors/doc/src/compatmap.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sensors') diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc index 9bb21fea..7fbe3bb5 100644 --- a/src/sensors/doc/src/compatmap.qdoc +++ b/src/sensors/doc/src/compatmap.qdoc @@ -146,7 +146,7 @@ - + -- cgit v1.2.3