Browse Source

Use QSharedPointer objects as list elements.

Sascha Zelzer 13 years ago
parent
commit
7c7215f716
2 changed files with 4 additions and 4 deletions
  1. 3 3
      Libs/PluginFramework/ctkPlugins.cpp
  2. 1 1
      Libs/PluginFramework/ctkPlugins_p.h

+ 3 - 3
Libs/PluginFramework/ctkPlugins.cpp

@@ -265,11 +265,11 @@ QList<ctkPlugin*> ctkPlugins::getPlugins(const QString& name, const ctkVersionRa
 }
 
 //----------------------------------------------------------------------------
-QList<ctkPlugin*> ctkPlugins::getActivePlugins() const
+QList<QSharedPointer<ctkPlugin> > ctkPlugins::getActivePlugins() const
 {
   checkIllegalState();
 
-  QList<ctkPlugin*> slist;
+  QList<QSharedPointer<ctkPlugin> > slist;
   {
     QReadLocker lock(&pluginsLock);
     QHashIterator<QString, QSharedPointer<ctkPlugin> > it(plugins);
@@ -278,7 +278,7 @@ QList<ctkPlugin*> ctkPlugins::getActivePlugins() const
       QSharedPointer<ctkPlugin> plugin = it.next().value();
       ctkPlugin::State s = plugin->getState();
       if (s == ctkPlugin::ACTIVE || s == ctkPlugin::STARTING) {
-        slist.push_back(plugin.data());
+        slist.push_back(plugin);
       }
     }
   }

+ 1 - 1
Libs/PluginFramework/ctkPlugins_p.h

@@ -159,7 +159,7 @@ public:
    *
    * @return A List of ctkPlugins.
    */
-  QList<ctkPlugin*> getActivePlugins() const;
+  QList<QSharedPointer<ctkPlugin> > getActivePlugins() const;
 
 
   /**