Browse Source

Provide the plugin in ctkServices::get(...)

Sascha Zelzer 14 years ago
parent
commit
c52b2e9435

+ 1 - 1
Libs/PluginFramework/ctkPluginContext.cpp

@@ -129,7 +129,7 @@ QList<ctkServiceReference> ctkPluginContext::getServiceReferences(const QString&
 {
   Q_D(ctkPluginContext);
   d->isPluginContextValid();
-  return d->plugin->fwCtx->services->get(clazz, filter);
+  return d->plugin->fwCtx->services->get(clazz, filter, 0);
 }
 
 ctkServiceReference ctkPluginContext::getServiceReference(const QString& clazz)

+ 3 - 2
Libs/PluginFramework/ctkServices.cpp

@@ -160,7 +160,7 @@ ctkServiceReference ctkServices::get(ctkPluginPrivate* plugin, const QString& cl
 {
   QMutexLocker lock(&mutex);
   try {
-    QList<ctkServiceReference> srs = get(clazz, QString());
+    QList<ctkServiceReference> srs = get(clazz, QString(), plugin);
     qDebug() << "get service ref" << clazz << "for plugin"
              << plugin->location << " = " << srs.size() << "refs";
 
@@ -175,7 +175,8 @@ ctkServiceReference ctkServices::get(ctkPluginPrivate* plugin, const QString& cl
 }
 
 
-QList<ctkServiceReference> ctkServices::get(const QString& clazz, const QString& filter) const
+QList<ctkServiceReference> ctkServices::get(const QString& clazz, const QString& filter,
+                                            ctkPluginPrivate* plugin) const
 {
   QMutexLocker lock(&mutex);
 

+ 2 - 1
Libs/PluginFramework/ctkServices_p.h

@@ -151,7 +151,8 @@ public:
    * @param plugin The plugin requesting reference.
    * @return A list of {@link ctkServiceReference} object.
    */
-  QList<ctkServiceReference> get(const QString& clazz, const QString& filter) const;
+  QList<ctkServiceReference> get(const QString& clazz, const QString& filter,
+                                 ctkPluginPrivate* plugin) const;
 
 
   /**