Changeset 288 in pacpusframework for trunk/src/PacpusLib/ComponentFactoryBase.cpp

Timestamp:

03/26/14 21:27:30 (10 years ago)

Author:

Marek Kurdej

Message:

Using boost::shared_ptr for storing components.

File:

• trunk/src/PacpusLib/ComponentFactoryBase.cpp (modified) (4 diffs)

trunk/src/PacpusLib/ComponentFactoryBase.cpp

@@ -10 +10 @@
 #include <Pacpus/kernel/Log.h>
 
-#include <cassert>
+#include <boost/assert.hpp>
 #include <QString>
 
@@ -23 +23 @@
     // get the adress of the ComponentManager instance
     mgr_ = ComponentManager::getInstance();
+    BOOST_ASSERT(mgr_);
 }
 
@@ -30 +31 @@
 }
 
-void ComponentFactoryBase::addFactory(ComponentFactoryBase* addr, const QString& type)
+void ComponentFactoryBase::addFactory(ComponentFactoryBase* addr, QString const& type)
 {
     LOG_DEBUG("addFactory(type="<< type << ")");
 
-    assert(mgr_);
     if (!mgr_->registerComponentFactory(addr, type)) {
         /*
@@ -44 +44 @@
 }
 
-void ComponentFactoryBase::addComponent(const QString& name)
+void ComponentFactoryBase::createComponent(QString const& name)
 {
     LOG_DEBUG("addComponent(" << name << ")");
 
-    // FIXME: instantiated component is never deleted!
-    // who should do it? ComponentManager?
-    ComponentBase * addr = instantiateComponent(name);
-    assert(mgr_);
-    if (!mgr_->registerComponent(addr, name)) {
-        delete addr;
-        addr = NULL;
-    }
+    ComponentSharedPointer component = instantiateComponent(name);
+    mgr_->registerComponent(component, name);
 }