diff options
| author | Marja Hassinen <ext-marja.2.hassinen@nokia.com> | 2009-09-10 15:59:26 +0300 |
|---|---|---|
| committer | Marja Hassinen <ext-marja.2.hassinen@nokia.com> | 2009-09-10 15:59:26 +0300 |
| commit | 5cc2564bd4360d38e21eead4aca08167972eeb0f (patch) | |
| tree | 3d1152d0a42d7995f14c2d21e720e1a2113ab10a | |
| parent | 3c2707f61baf6e97f0fc5757f6c52673eb958b82 (diff) | |
bluez plugin: Renaming the factory function. Declaring the plugin .so name in the .context file.
| -rw-r--r-- | libcontextsubscriber/plugins/bluez/bluez.context | 4 | ||||
| -rw-r--r-- | libcontextsubscriber/plugins/bluez/bluezplugin.cpp | 3 | ||||
| -rw-r--r-- | libcontextsubscriber/plugins/bluez/bluezplugin.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libcontextsubscriber/plugins/bluez/bluez.context b/libcontextsubscriber/plugins/bluez/bluez.context index 5760b156..fc8ca0d6 100644 --- a/libcontextsubscriber/plugins/bluez/bluez.context +++ b/libcontextsubscriber/plugins/bluez/bluez.context @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<provider xmlns="http://contextkit.freedesktop.org/Provider" plugin="bluez" constructionString="bluez"> +<provider xmlns="http://contextkit.freedesktop.org/Provider" plugin="libcontextsubscriberbluez" constructionString="bluez"> <key name="Bluetooth.Enabled"/> <key name="Bluetooth.Visible"/> -</provider>
\ No newline at end of file +</provider> diff --git a/libcontextsubscriber/plugins/bluez/bluezplugin.cpp b/libcontextsubscriber/plugins/bluez/bluezplugin.cpp index 816c3396..59bd6ad6 100644 --- a/libcontextsubscriber/plugins/bluez/bluezplugin.cpp +++ b/libcontextsubscriber/plugins/bluez/bluezplugin.cpp @@ -21,10 +21,11 @@ #include "bluezplugin.h" #include "sconnect.h" + #include "logging.h" /// The factory method for constructing the IPropertyProvider instance. -IProviderPlugin* bluezPluginFactory(const QString& /*constructionString*/) +IProviderPlugin* pluginFactory(const QString& /*constructionString*/) { // Note: it's the caller's responsibility to delete the plugin if // needed. diff --git a/libcontextsubscriber/plugins/bluez/bluezplugin.h b/libcontextsubscriber/plugins/bluez/bluezplugin.h index b1311492..6fa9f9dc 100644 --- a/libcontextsubscriber/plugins/bluez/bluezplugin.h +++ b/libcontextsubscriber/plugins/bluez/bluezplugin.h @@ -28,7 +28,7 @@ using ContextSubscriber::IProviderPlugin; extern "C" { - IProviderPlugin* bluezPluginFactory(const QString& constructionString); + IProviderPlugin* pluginFactory(const QString& constructionString); } namespace ContextSubscriberBluez |