Changeset 290 in pacpusframework for trunk/src/PacpusLib

Timestamp:

Mar 27, 2014, 12:53:36 PM (11 years ago)

Author:

Marek Kurdej

Message:

Some clean-up.

Location:

trunk/src/PacpusLib

Files:

• ComponentBase.cpp (modified) (3 diffs)
• ComponentManager.cpp (modified) (1 diff)

trunk/src/PacpusLib/ComponentBase.cpp

@@ -17 +17 @@
 #include <boost/program_options/parsers.hpp>
 #include <boost/program_options/variables_map.hpp>
-//#include <boost/thread/thread.hpp>
 #include <ostream>
 #include <string>
@@ -245 +244 @@
 }
 
-InputInterfaceBase * ComponentBase::getInput(QString inputName) const
+InputInterfaceBase* ComponentBase::getInput(QString inputName) const
 {
     if (inputs().contains(inputName)) {
-        return inputs()[inputName];
+        return inputs()[inputName].get();
     }
     LOG_WARN("Component " << getName() << " does not contain input " << inputName);
@@ -254 +253 @@
 }
 
-OutputInterfaceBase * ComponentBase::getOutput(QString outputName) const
+OutputInterfaceBase* ComponentBase::getOutput(QString outputName) const
 {
     if (outputs().contains(outputName)) {
-        return outputs()[outputName];
+        return outputs()[outputName].get();
     }
     LOG_WARN("Component " << getName() << " does not contain output " << outputName);

trunk/src/PacpusLib/ComponentManager.cpp

@@ -38 +38 @@
 /// Connects OutputInterfaceBase @b out to InputInterfaceBase @b in using given priority and reading mode.
 /// @returns @b true if connection has been added successfully, @b false otherwise.
-bool connectInterface(OutputInterfaceBase * out, InputInterfaceBase * in, int priority, InputInterfaceBase::ReadingMode mode = InputInterfaceBase::GetLast);
+bool connectInterface(OutputInterfaceBase* out, InputInterfaceBase* in, int priority, InputInterfaceBase::ReadingMode mode = InputInterfaceBase::GetLast);
 
 ////////////////////////////////////////////////////////////////////////////////
 
-bool connectInterface(OutputInterfaceBase * out, InputInterfaceBase * in, int priority, InputInterfaceBase::ReadingMode mode)
+bool connectInterface(OutputInterfaceBase* out, InputInterfaceBase* in, int priority, InputInterfaceBase::ReadingMode mode)
 {
     // check connections