Changeset 290 in pacpusframework for trunk/include/Pacpus/kernel/ComponentBase.h

Timestamp:

03/27/14 12:53:36 (10 years ago)

Author:

Marek Kurdej

Message:

Some clean-up.

File:

• trunk/include/Pacpus/kernel/ComponentBase.h (modified) (3 diffs)

trunk/include/Pacpus/kernel/ComponentBase.h

@@ -141 +141 @@
     
 protected:
-    typedef QMap<QString, InputInterfaceBase *> InputsMap;
-    typedef QMap<QString, OutputInterfaceBase *> OutputsMap;
+    typedef QMap<QString, InputSharedPointer> InputsMap;
+    typedef QMap<QString, OutputSharedPointer> OutputsMap;
 
     template <typename DataType, class ComponentType, typename Function>
@@ -148 +148 @@
     {
         typedef InputInterface<DataType, ComponentType> InputType;
-        InputType * connection = new InputType(name, dynamic_cast<ComponentType *>(this), function);
+        InputSharedPointer connection(new InputType(name, dynamic_cast<ComponentType *>(this), function));
         inputs().insert(name, connection);
     }
@@ -156 +156 @@
     {
         typedef OutputInterface<DataType, ComponentType> OutputType;
-        OutputType * connection = new OutputType(name, dynamic_cast<ComponentType *>(this));
+        OutputSharedPointer connection(new OutputType(name, dynamic_cast<ComponentType *>(this)));
         outputs().insert(name, connection);
     }
     
     /// @todo DOC
-    InputInterfaceBase * getInput(QString name) const;
+    InputInterfaceBase* getInput(QString name) const;
 
     /// @todo DOC
-    OutputInterfaceBase * getOutput(QString name) const;
+    OutputInterfaceBase* getOutput(QString name) const;
 
     template <typename DataType, class ComponentType>
-    InputInterface<DataType, ComponentType> *
-        getTypedInput(const char * name) const
-    {
-        return dynamic_cast<InputInterface<DataType, ComponentType> *>(getInput(name));
+    InputInterface<DataType, ComponentType>* getTypedInput(const char * name) const
+    {
+        //using boost::dynamic_pointer_cast;
+        //return dynamic_pointer_cast<InputInterface<DataType, ComponentType> >(getInput(name));
+        return dynamic_cast<InputInterface<DataType, ComponentType>*>(getInput(name));
     }
 
     template <typename DataType, class ComponentType>
-    OutputInterface<DataType, ComponentType> *
-        getTypedOutput(const char * name) const
-    {
-        return dynamic_cast<OutputInterface<DataType, ComponentType> *>(getOutput(name));
+    OutputInterface<DataType, ComponentType>* getTypedOutput(const char * name) const
+    {
+        //using boost::dynamic_pointer_cast;
+        //return dynamic_pointer_cast<OutputInterface<DataType, ComponentType> >(getOutput(name));
+        return dynamic_cast<OutputInterface<DataType, ComponentType>*>(getOutput(name));
     }