diff options
author | Lorn Potter <lorn.potter@gmail.com> | 2012-11-29 07:10:26 +1000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-28 22:42:31 +0100 |
commit | 41f3b2cf4ef75352eebfff617f85d3a933eae1c1 (patch) | |
tree | 9eedb04a97d319ad848d8cdb265680d5a7bc4c06 /src/sensors | |
parent | 3f781ff537597bc548ad7ebbdc68c1b1a3e9bfeb (diff) | |
download | qtsensors-41f3b2cf4ef75352eebfff617f85d3a933eae1c1.tar.gz |
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>
Diffstat (limited to 'src/sensors')
-rw-r--r-- | src/sensors/doc/src/qtsensors-backend.qdoc | 2 | ||||
-rw-r--r-- | src/sensors/gestures/qsensorgesturemanagerprivate.cpp | 2 | ||||
-rw-r--r-- | src/sensors/gestures/qsensorgestureplugininterface.h | 2 | ||||
-rw-r--r-- | src/sensors/qsensormanager.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/sensors/doc/src/qtsensors-backend.qdoc b/src/sensors/doc/src/qtsensors-backend.qdoc index e26c05a..da384c3 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 7ae3a95..287c438 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 55ea6f4..9e997ed 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 ba0676f..b1b2e78 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); |