Changeset 288 in pacpusframework for trunk/src/PacpusLib/ComponentManager.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/ComponentManager.cpp (modified) (18 diffs)

trunk/src/PacpusLib/ComponentManager.cpp

@@ -125 +125 @@
 }
 
-bool ComponentManager::registerComponentFactory(ComponentFactoryBase* addr, const QString& type)
+bool ComponentManager::registerComponentFactory(ComponentFactoryBase* addr, QString const& type)
 {
     LOG_TRACE("registerComponentFactory(type="<< type << ")");
@@ -141 +141 @@
 }
 
-bool ComponentManager::unregisterComponentFactory(const QString& type)
+bool ComponentManager::unregisterComponentFactory(QString const& type)
 {
     LOG_TRACE("unregisterComponentFactory(type="<< type << ")");
@@ -156 +156 @@
 }
 
-bool ComponentManager::registerComponent(ComponentBase* addr, const QString& name)
+bool ComponentManager::registerComponent(boost::shared_ptr<ComponentBase> addr, QString const& name)
 {
     LOG_TRACE("registerComponent(name="<< name << ")");
@@ -171 +171 @@
 }
 
-bool ComponentManager::unregisterComponent(const QString& name)
+bool ComponentManager::unregisterComponent(QString const& name)
 {
     LOG_TRACE("unregisterComponent(name="<< name << ")");
@@ -180 +180 @@
     }
 
-    // FIXME: delete component
-    ComponentBase* component = componentMap_.value(name, NULL);
-    //delete component;
-
+    boost::shared_ptr<ComponentBase> component = componentMap_.value(name, NULL);
+    
     // FIXME: remove from map (causes segfault in QMap::qMapLessThanKey on Windows)
     //componentMap_.remove(name);
     LOG_INFO("unregistered component '" << name << "'");
-
-    return true;
-}
-
-bool ComponentManager::createComponent(const QString& type, const QString& name)
+    return true;
+}
+
+bool ComponentManager::createComponent(QString const& type, QString const& name)
 {
     LOG_TRACE("createComponent(type=" << type << ", " << "name="<< name << ")");
@@ -198 +195 @@
         ComponentFactoryBase* factory = factoryMap_.value(type);
         assert(factory);
-        factory->addComponent(name);
+        factory->createComponent(name);
         return true;
     }
@@ -209 +206 @@
 }
 
-bool ComponentManager::loadPlugin(const QString& filename)
+bool ComponentManager::loadPlugin(QString const& filename)
 {
     LOG_TRACE("loadPlugin(filename=" << filename << ")");
@@ -236 +233 @@
 }
 
-bool ComponentManager::checkComponent(const QString & componentName)
+bool ComponentManager::checkComponent(QString const& componentName)
 {
     if (NULL == getComponent(componentName)) {
@@ -245 +242 @@
 }
 
-bool ComponentManager::checkComponentInput(const QString & componentName, const QString & inputName)
+bool ComponentManager::checkComponentInput(QString const& componentName, QString const& inputName)
 {
     if (!checkComponent(componentName)) {
@@ -257 +254 @@
 }
 
-bool ComponentManager::checkComponentOutput(const QString & componentName, const QString & outputName)
+bool ComponentManager::checkComponentOutput(QString const& componentName, QString const& outputName)
 {
     if (!checkComponent(componentName)) {
@@ -269 +266 @@
 }
 
-bool ComponentManager::createConnection(const QString & outputSignature, const QString & inputSignature, const QString & type, int priority = 0)
+bool ComponentManager::createConnection(QString const& outputSignature, QString const& inputSignature, QString const& type, int priority = 0)
 {
     // FIXME: use 2 signatures (output component + output connection) instead of 1 separated by a (".") dot
@@ -289 +286 @@
 }
 
-std::size_t ComponentManager::loadComponents(const QString& configFilename)
+std::size_t ComponentManager::loadComponents(QString const& configFilename)
 {
     LOG_TRACE("loadComponents(filename=" << configFilename << ")");
@@ -334 +331 @@
 
         // copy locally the config parameters of the component
-        ComponentBase * component = getComponent(componentName);
+        ComponentSharedPointer component = getComponent(componentName);
         if (NULL == component) {
             LOG_WARN("component '" << componentName << "' does not exist");
@@ -356 +353 @@
         QString componentName = cfg.getComponentName();
 
-        ComponentBase * component = getComponent(componentName);
-        if (NULL == component) {
+        ComponentSharedPointer component = getComponent(componentName);
+        if (!component) {
             LOG_WARN("component '" << componentName << "' does not exist");
             continue;
@@ -430 +427 @@
 }
 
-bool ComponentManager::start(const QString & componentName)
+bool ComponentManager::start(QString const& componentName)
 {
     LOG_TRACE("start(component=" << componentName << ")");
 
-    ComponentBase* component = getComponent(componentName);
+    ComponentSharedPointer component = getComponent(componentName);
     if (!component) {
         LOG_WARN("cannot start component '" << componentName << "'.  It does not exist!");
@@ -465 +462 @@
 }
 
-bool ComponentManager::stop(ComponentBase * component) const
+bool ComponentManager::stop(ComponentSharedPointer component) const
 {
     if (!component) {
@@ -477 +474 @@
 }
 
-bool ComponentManager::stop(const QString & componentName)
+bool ComponentManager::stop(QString const& componentName)
 {
     LOG_TRACE("stop(component=" << componentName << ")");
 
-    ComponentBase* component = getComponent(componentName);
+    ComponentSharedPointer component = getComponent(componentName);
     if (!component) {
         LOG_WARN("cannot stop component '" << componentName << "'" << ". It does not exist");
@@ -495 +492 @@
 }
 
-ComponentBase * ComponentManager::getComponent(const QString & name)
+ComponentSharedPointer ComponentManager::getComponent(QString const& name)
 {
     LOG_TRACE("getComponent(name=" << name << ")");