diff options
author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-03-14 15:59:49 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-16 08:02:10 +0100 |
commit | 1530ebcc019bf6c630e75ac3078586b70c6056e3 (patch) | |
tree | 4bb9cfc7f1be172dcc89b2c210434413debece57 /src/sensors/qsensormanager.cpp | |
parent | afefdd5df374d8cfeca4614f4d25397fa6c997fe (diff) |
Remove REGISTER_STATIC_PLUGIN
This API was never particularly reliable. It is somewhat incompatible
with the new-style Qt plugins.
Change-Id: Iaaa0e6282404ce5477abcc8b905b14b1fb58644c
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src/sensors/qsensormanager.cpp')
-rw-r--r-- | src/sensors/qsensormanager.cpp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp index 053e62e3..401eeaac 100644 --- a/src/sensors/qsensormanager.cpp +++ b/src/sensors/qsensormanager.cpp @@ -76,8 +76,6 @@ public: PluginLoadingState pluginLoadingState; void loadPlugins(); - QList<CreatePluginFunc> staticRegistrations; - // Holds a mapping from type to available identifiers (and from there to the factory) BackendIdentifiersForTypeMap backendsByType; @@ -182,13 +180,6 @@ void QSensorManagerPrivate::loadPlugins() if (d->pluginLoadingState != QSensorManagerPrivate::NotLoaded) return; d->pluginLoadingState = QSensorManagerPrivate::Loading; - SENSORLOG() << "initializing legacy static plugins"; - // Legacy static plugins - Q_FOREACH (CreatePluginFunc func, d->staticRegistrations) { - QSensorPluginInterface *plugin = func(); - plugin->registerSensors(); - } - SENSORLOG() << "initializing static plugins"; // Qt-style static plugins Q_FOREACH (QObject *plugin, QPluginLoader::staticInstances()) { @@ -303,15 +294,6 @@ void QSensorManager::unregisterBackend(const QByteArray &type, const QByteArray } /*! - \internal -*/ -void QSensorManager::registerStaticPlugin(CreatePluginFunc func) -{ - QSensorManagerPrivate *d = sensorManagerPrivate(); - d->staticRegistrations.append(func); -} - -/*! Create a backend for \a sensor. Returns null if no suitable backend exists. */ QSensorBackend *QSensorManager::createBackend(QSensor *sensor) @@ -532,18 +514,6 @@ void QSensor::registerInstance() If the factory cannot create a backend it should return 0. */ -/*! - \macro REGISTER_STATIC_PLUGIN(pluginname) - \relates QSensorManager - - Registers a static plugin, \a pluginname. - - Note that this macro relies on static initialization so it may not be appropriate - for use in a library and may not work on all platforms. - - \sa {Creating a sensor plugin} -*/ - QT_END_NAMESPACE #include "qsensormanager.moc" |