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.h | |
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.h')
-rw-r--r-- | src/sensors/qsensormanager.h | 20 |
1 files changed, 0 insertions, 20 deletions
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 |