Explorar el Código

Merge branch 'factory-expose-utility-functions-2'

* factory-expose-utility-functions-2:
  Deleting later the module might be too late.
Julien Finet hace 13 años
padre
commit
ce92618c92
Se han modificado 2 ficheros con 0 adiciones y 13 borrados
  1. 0 1
      Libs/Core/ctkAbstractPluginFactory.h
  2. 0 12
      Libs/Core/ctkAbstractPluginFactory.tpp

+ 0 - 1
Libs/Core/ctkAbstractPluginFactory.h

@@ -36,7 +36,6 @@ class ctkFactoryPluginItem : public ctkAbstractFactoryFileBasedItem<BaseClassTyp
 public:
   virtual bool load();
   virtual QString loadErrorString()const;
-  virtual void uninstantiate();
 
 protected:
   virtual BaseClassType* instanciator();

+ 0 - 12
Libs/Core/ctkAbstractPluginFactory.tpp

@@ -58,18 +58,6 @@ QString ctkFactoryPluginItem<BaseClassType>::loadErrorString()const
 
 //----------------------------------------------------------------------------
 template<typename BaseClassType>
-void ctkFactoryPluginItem<BaseClassType>::uninstantiate()
-{
-  if (this->Instance == 0)
-    {
-    return;
-    }
-  this->Instance->deleteLater();
-  this->Instance = 0;
-}
-
-//----------------------------------------------------------------------------
-template<typename BaseClassType>
 BaseClassType* ctkFactoryPluginItem<BaseClassType>::instanciator()
 {
   //qDebug() << "PluginItem::instantiate - name:" << this->path();