diff options
author | Lorn Potter <lorn.potter@jollamobile.com> | 2013-01-20 19:40:59 +1000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-07 19:34:26 +0100 |
commit | f7f1d56c1626f5b8eab5b4d5cac9fa06ee886e59 (patch) | |
tree | 3b5237dfff65083a69abe7f4df613458e2849436 /src/plugins | |
parent | 6fbba82a7b5d1ae47b376a2d27bc0fed78f280e0 (diff) | |
download | qtsensors-f7f1d56c1626f5b8eab5b4d5cac9fa06ee886e59.tar.gz |
remove nokia and replace with qt-project in plugins
Change-Id: I63fa985991653e4b8465a7fb88acab647d8546e8
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp | 2 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/sensors/dummy/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/sensors/generic/generictiltsensor.cpp | 4 | ||||
-rw-r--r-- | src/plugins/sensors/generic/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/sensors/linux/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/sensors/sensors.pro | 1 | ||||
-rw-r--r-- | src/plugins/sensors/simulator/main.cpp | 2 |
8 files changed, 8 insertions, 9 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp index db0e900..074746e 100644 --- a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp @@ -160,7 +160,7 @@ void QTwistSensorGestureRecognizer::accelChanged(QAccelerometerReading *reading) qreal angle = qAtan(x / qSqrt(y*y + z*z)) * RADIANS_TO_DEGREES; if (qAbs(angle) > 2) { - if (detecting){ + if (detecting) { if ((angle > 0 && angle < lastAngle) || (angle < 0 && angle > lastAngle)) { decreaseCount++; diff --git a/src/plugins/sensors/blackberry/main.cpp b/src/plugins/sensors/blackberry/main.cpp index 54e4163..7c2d5db 100644 --- a/src/plugins/sensors/blackberry/main.cpp +++ b/src/plugins/sensors/blackberry/main.cpp @@ -73,7 +73,7 @@ static const char *bbTemperatureSensorId = "bbTemperatureSensor"; class BbSensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") Q_INTERFACES(QSensorPluginInterface) public: diff --git a/src/plugins/sensors/dummy/main.cpp b/src/plugins/sensors/dummy/main.cpp index 7da65fe..89f07fc 100644 --- a/src/plugins/sensors/dummy/main.cpp +++ b/src/plugins/sensors/dummy/main.cpp @@ -50,7 +50,7 @@ class dummySensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") Q_INTERFACES(QSensorPluginInterface) public: void registerSensors() diff --git a/src/plugins/sensors/generic/generictiltsensor.cpp b/src/plugins/sensors/generic/generictiltsensor.cpp index df07355..6aefb57 100644 --- a/src/plugins/sensors/generic/generictiltsensor.cpp +++ b/src/plugins/sensors/generic/generictiltsensor.cpp @@ -160,11 +160,11 @@ bool GenericTiltSensor::filter(QAccelerometerReading *reading) if (dyrot < 0) dyrot = -dyrot; bool change = false; - if (dxrot >= radAccuracy){ + if (dxrot >= radAccuracy) { xRotation = xrot; change = true; } - if (dyrot >= radAccuracy){ + if (dyrot >= radAccuracy) { yRotation = yrot; change = true; } diff --git a/src/plugins/sensors/generic/main.cpp b/src/plugins/sensors/generic/main.cpp index c455489..15507b6 100644 --- a/src/plugins/sensors/generic/main.cpp +++ b/src/plugins/sensors/generic/main.cpp @@ -51,7 +51,7 @@ class genericSensorPlugin : public QObject, public QSensorPluginInterface, public QSensorChangesInterface, public QSensorBackendFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") Q_INTERFACES(QSensorPluginInterface QSensorChangesInterface) public: void registerSensors() diff --git a/src/plugins/sensors/linux/main.cpp b/src/plugins/sensors/linux/main.cpp index 9069880..7e9ece5 100644 --- a/src/plugins/sensors/linux/main.cpp +++ b/src/plugins/sensors/linux/main.cpp @@ -51,7 +51,7 @@ class LinuxSensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") Q_INTERFACES(QSensorPluginInterface) public: void registerSensors() diff --git a/src/plugins/sensors/sensors.pro b/src/plugins/sensors/sensors.pro index 41fc6fd..df63f36 100644 --- a/src/plugins/sensors/sensors.pro +++ b/src/plugins/sensors/sensors.pro @@ -5,7 +5,6 @@ TEMPLATE = subdirs blackberry { isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = blackberry } - isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, dummy):SUBDIRS += dummy isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, generic):SUBDIRS += generic isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, simulator):simulator:SUBDIRS += simulator diff --git a/src/plugins/sensors/simulator/main.cpp b/src/plugins/sensors/simulator/main.cpp index 1e40408..5e15568 100644 --- a/src/plugins/sensors/simulator/main.cpp +++ b/src/plugins/sensors/simulator/main.cpp @@ -53,7 +53,7 @@ class SimulatorSensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") Q_INTERFACES(QSensorPluginInterface) public: SimulatorSensorPlugin() |