From 1530ebcc019bf6c630e75ac3078586b70c6056e3 Mon Sep 17 00:00:00 2001
From: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Date: Wed, 14 Mar 2012 15:59:49 +1000
Subject: 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>
---
 src/sensors/qsensormanager.cpp | 30 ------------------------------
 src/sensors/qsensormanager.h   | 20 --------------------
 2 files changed, 50 deletions(-)

(limited to 'src')

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()) {
@@ -302,15 +293,6 @@ void QSensorManager::unregisterBackend(const QByteArray &type, const QByteArray
     d->emitSensorsChanged();
 }
 
-/*!
-    \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.
 */
@@ -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"
diff --git a/src/sensors/qsensormanager.h b/src/sensors/qsensormanager.h
index f23f9e7e..1a1306a8 100644
--- a/src/sensors/qsensormanager.h
+++ b/src/sensors/qsensormanager.h
@@ -51,8 +51,6 @@ class QSensorBackend;
 class QSensorBackendFactory;
 class QSensorPluginInterface;
 
-typedef QSensorPluginInterface *(*CreatePluginFunc)();
-
 class Q_SENSORS_EXPORT QSensorManager
 {
 public:
@@ -65,9 +63,6 @@ public:
     // Create a backend (uses the type and identifier set in the sensor)
     static QSensorBackend *createBackend(QSensor *sensor);
 
-    // For static plugins
-    static void registerStaticPlugin(CreatePluginFunc func);
-
     static void setDefaultBackend(const QByteArray &type, const QByteArray &identifier);
 };
 
@@ -79,21 +74,6 @@ protected:
     ~QSensorBackendFactory() {}
 };
 
-// Static plugins have their own registration methods.
-// They can only register types. They cannot use the changes interface.
-#define REGISTER_STATIC_PLUGIN(pluginname) \
-    static QSensorPluginInterface *create_static_plugin_ ## pluginname()\
-    {\
-        return new pluginname;\
-    }\
-    static bool side_effect_sensor_backend_ ## pluginname ()\
-    {\
-        QSensorManager::registerStaticPlugin(create_static_plugin_ ## pluginname);\
-        return false;\
-    }\
-    /* This assignment calls the function above */\
-    static bool dummy_sensor_backend_ ## pluginname = side_effect_sensor_backend_ ## pluginname();
-
 QT_END_NAMESPACE
 QT_END_HEADER
 
-- 
cgit v1.2.3