diff options
author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-03-14 16:13:46 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-16 08:02:18 +0100 |
commit | b6d87d1b5141987452bc30e8b1d4115998ba6fd9 (patch) | |
tree | 46134634d89e907c011be2512cca33b0cd0850ab /src/sensors/qsensormanager.cpp | |
parent | 1530ebcc019bf6c630e75ac3078586b70c6056e3 (diff) | |
download | qtsensors-b6d87d1b5141987452bc30e8b1d4115998ba6fd9.tar.gz |
Remove QSensorPluginLoader
This class does virtually nothing except to hide the use of QFactoryLoader
from QSensorManager.
Change-Id: I70e791f9d842102204fd970e7806f409ae1eca65
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src/sensors/qsensormanager.cpp')
-rw-r--r-- | src/sensors/qsensormanager.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp index 401eeaa..ae023be 100644 --- a/src/sensors/qsensormanager.cpp +++ b/src/sensors/qsensormanager.cpp @@ -41,7 +41,8 @@ #include "qsensormanager.h" #include <QDebug> -#include "qsensorpluginloader_p.h" +#include <private/qfactoryloader_p.h> +#include <QPluginLoader> #include "qsensorplugin.h" #include <QStandardPaths> #include "sensorlog_p.h" @@ -50,8 +51,6 @@ QT_BEGIN_NAMESPACE -Q_GLOBAL_STATIC(QSensorPluginLoader, pluginLoader) - typedef QHash<QByteArray,QSensorBackendFactory*> FactoryForIdentifierMap; typedef QHash<QByteArray,FactoryForIdentifierMap> BackendIdentifiersForTypeMap; @@ -68,12 +67,14 @@ public: }; QSensorManagerPrivate() : pluginLoadingState(NotLoaded) + , loader(new QFactoryLoader(QSensorPluginInterface_iid, QLatin1String("/sensors"))) , defaultIdentifierForTypeLoaded(false) , sensorsChanged(false) { } PluginLoadingState pluginLoadingState; + QFactoryLoader *loader; void loadPlugins(); // Holds a mapping from type to available identifiers (and from there to the factory) @@ -145,7 +146,8 @@ Q_SENSORS_EXPORT void sensors_unit_test_hook(int index) Q_ASSERT(load_external_plugins == false); Q_ASSERT(d->pluginLoadingState == QSensorManagerPrivate::Loaded); SENSORLOG() << "initializing plugins"; - Q_FOREACH (QObject *plugin, pluginLoader()->plugins()) { + foreach (const QString &key, d->loader->keys()) { + QObject *plugin = d->loader->instance(key); initPlugin(plugin); } break; @@ -188,7 +190,8 @@ void QSensorManagerPrivate::loadPlugins() if (load_external_plugins) { SENSORLOG() << "initializing plugins"; - Q_FOREACH (QObject *plugin, pluginLoader()->plugins()) { + foreach (const QString &key, d->loader->keys()) { + QObject *plugin = d->loader->instance(key); initPlugin(plugin); } } |