remove Nokia isms from plugin interface

As well as from documentation and usage of Sensors.conf location

Change-Id: I52d657d6799e44a94b3f37bae86445c73e176103
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

6 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
index 9a00ed5c..f037ab33 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
+++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 class QtSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "com.Nokia.QSensorGesturePluginInterface" FILE "plugin.json")
+    Q_PLUGIN_METADATA(IID "com.qt-project.QSensorGesturePluginInterface" FILE "plugin.json")
     Q_INTERFACES(QSensorGesturePluginInterface)
 
 public:
diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
index 3b519f00..e5a644e1 100644
--- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
+++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
@@ -50,7 +50,7 @@
 class QShakeSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "com.Nokia.QSensorGesturePluginInterface" FILE "plugin.json")
+    Q_PLUGIN_METADATA(IID "com.qt-project.QSensorGesturePluginInterface" FILE "plugin.json")
     Q_INTERFACES(QSensorGesturePluginInterface)
 
 public:
diff --git a/src/sensors/doc/src/qtsensors-backend.qdoc b/src/sensors/doc/src/qtsensors-backend.qdoc
index e26c05ad..da384c38 100644
--- a/src/sensors/doc/src/qtsensors-backend.qdoc
+++ b/src/sensors/doc/src/qtsensors-backend.qdoc
@@ -110,7 +110,7 @@ file to determine the default instead.
 \section1 Sensors.conf
 
 The config file that determines the default sensor for a type is called Sensors.conf. If present,
-it is located in /etc/xdg/Nokia. It has the standard formatting of an ini file.
+it is located in /etc/xdg/QtProject. It has the standard formatting of an ini file.
 
 The settings live in the Default group and the general format is:
 \code
diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp b/src/sensors/gestures/qsensorgesturemanagerprivate.cpp
index 7ae3a95e..287c4380 100644
--- a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp
+++ b/src/sensors/gestures/qsensorgesturemanagerprivate.cpp
@@ -71,7 +71,7 @@ QSensorGestureManagerPrivate::QSensorGestureManagerPrivate(QObject *parent) :
             connection,SLOT(removeSensorGestures(QStringList)));
 #endif
 
-    loader = new QFactoryLoader("com.Nokia.QSensorGesturePluginInterface", QLatin1String("/sensorgestures"));
+    loader = new QFactoryLoader("com.qt-project.QSensorGesturePluginInterface", QLatin1String("/sensorgestures"));
     loadPlugins();
 }
 
diff --git a/src/sensors/gestures/qsensorgestureplugininterface.h b/src/sensors/gestures/qsensorgestureplugininterface.h
index 55ea6f49..9e997ed0 100644
--- a/src/sensors/gestures/qsensorgestureplugininterface.h
+++ b/src/sensors/gestures/qsensorgestureplugininterface.h
@@ -65,7 +65,7 @@ public:
     virtual QString name() const = 0;
 };
 
-Q_DECLARE_INTERFACE(QSensorGesturePluginInterface, "com.Nokia.QSensorGesturePluginInterface");
+Q_DECLARE_INTERFACE(QSensorGesturePluginInterface, "com.qt-project.QSensorGesturePluginInterface");
 
 QT_END_NAMESPACE
 QT_END_HEADER
diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp
index ba0676f4..b1b2e780 100644
--- a/src/sensors/qsensormanager.cpp
+++ b/src/sensors/qsensormanager.cpp
@@ -99,7 +99,7 @@ public:
         if (configs.count() == 0) return; // QStandardPaths is broken?
         QString config = configs.at(configs.count()-1);
         if (config.isEmpty()) return; // QStandardPaths is broken?
-        config += QLatin1String("/Nokia/Sensors.conf");
+        config += QLatin1String("/QtProject/Sensors.conf");
 #endif
         if (!QFile::exists(config)) return;
         QFile cfgfile(config);