summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@jollamobile.com>2013-01-20 09:40:59 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-07 18:34:26 (GMT)
commitf7f1d56c1626f5b8eab5b4d5cac9fa06ee886e59 (patch)
tree3b5237dfff65083a69abe7f4df613458e2849436
parent6fbba82a7b5d1ae47b376a2d27bc0fed78f280e0 (diff)
downloadqtsensors-f7f1d56c1626f5b8eab5b4d5cac9fa06ee886e59.tar.gz
remove nokia and replace with qt-project in plugins
Change-Id: I63fa985991653e4b8465a7fb88acab647d8546e8 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
-rw-r--r--examples/sensors/grue/plugin/main.cpp2
-rw-r--r--src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp2
-rw-r--r--src/plugins/sensors/blackberry/main.cpp2
-rw-r--r--src/plugins/sensors/dummy/main.cpp2
-rw-r--r--src/plugins/sensors/generic/generictiltsensor.cpp4
-rw-r--r--src/plugins/sensors/generic/main.cpp2
-rw-r--r--src/plugins/sensors/linux/main.cpp2
-rw-r--r--src/plugins/sensors/sensors.pro1
-rw-r--r--src/plugins/sensors/simulator/main.cpp2
-rw-r--r--src/sensors/doc/snippets/sensors/plugin.cpp2
-rw-r--r--src/sensors/qsensormanager.cpp2
-rw-r--r--src/sensors/qsensorplugin.h4
-rw-r--r--tests/auto/qsensor/test_sensorplugin.cpp2
-rw-r--r--tests/auto/qsensorgestures_gestures/mockbackends.h2
14 files changed, 15 insertions, 16 deletions
diff --git a/examples/sensors/grue/plugin/main.cpp b/examples/sensors/grue/plugin/main.cpp
index 6ec2586..029e5d6 100644
--- a/examples/sensors/grue/plugin/main.cpp
+++ b/examples/sensors/grue/plugin/main.cpp
@@ -48,7 +48,7 @@
class GrueSensorPlugin : 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/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()
diff --git a/src/sensors/doc/snippets/sensors/plugin.cpp b/src/sensors/doc/snippets/sensors/plugin.cpp
index e467128..cad6378 100644
--- a/src/sensors/doc/snippets/sensors/plugin.cpp
+++ b/src/sensors/doc/snippets/sensors/plugin.cpp
@@ -48,7 +48,7 @@ const char *MyBackend::id = "mybackend";
class MyPluginClass : 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/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp
index b1b2e78..dbaf1eb 100644
--- a/src/sensors/qsensormanager.cpp
+++ b/src/sensors/qsensormanager.cpp
@@ -68,7 +68,7 @@ public:
QSensorManagerPrivate()
: loadExternalPlugins(true)
, pluginLoadingState(NotLoaded)
- , loader(new QFactoryLoader("com.nokia.Qt.QSensorPluginInterface/1.0", QLatin1String("/sensors")))
+ , loader(new QFactoryLoader("com.qt-project.Qt.QSensorPluginInterface/1.0", QLatin1String("/sensors")))
, defaultIdentifierForTypeLoaded(false)
, sensorsChanged(false)
{
diff --git a/src/sensors/qsensorplugin.h b/src/sensors/qsensorplugin.h
index b7de54f..5caef6f 100644
--- a/src/sensors/qsensorplugin.h
+++ b/src/sensors/qsensorplugin.h
@@ -67,8 +67,8 @@ protected:
~QSensorChangesInterface() {}
};
-Q_DECLARE_INTERFACE(QSensorPluginInterface, "com.nokia.Qt.QSensorPluginInterface/1.0")
-Q_DECLARE_INTERFACE(QSensorChangesInterface, "com.nokia.Qt.QSensorChangesInterface/5.0")
+Q_DECLARE_INTERFACE(QSensorPluginInterface, "com.qt-project.Qt.QSensorPluginInterface/1.0")
+Q_DECLARE_INTERFACE(QSensorChangesInterface, "com.qt-project.Qt.QSensorChangesInterface/5.0")
QT_END_NAMESPACE
QT_END_HEADER
diff --git a/tests/auto/qsensor/test_sensorplugin.cpp b/tests/auto/qsensor/test_sensorplugin.cpp
index 6aa27d9..d4cd90b 100644
--- a/tests/auto/qsensor/test_sensorplugin.cpp
+++ b/tests/auto/qsensor/test_sensorplugin.cpp
@@ -54,7 +54,7 @@ class TestSensorPlugin : public QObject,
public QSensorBackendFactory
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0")
+ Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0")
Q_INTERFACES(QSensorPluginInterface QSensorChangesInterface)
public:
void registerSensors()
diff --git a/tests/auto/qsensorgestures_gestures/mockbackends.h b/tests/auto/qsensorgestures_gestures/mockbackends.h
index dfd5525..9417466 100644
--- a/tests/auto/qsensorgestures_gestures/mockbackends.h
+++ b/tests/auto/qsensorgestures_gestures/mockbackends.h
@@ -63,7 +63,7 @@ class mockSensorPlugin : public QObject,
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:
QString m_filename;