Changeset 290 in pacpusframework for trunk/include/Pacpus/kernel

Timestamp:

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

Author:

Marek Kurdej

Message:

Some clean-up.

Location:

trunk/include/Pacpus/kernel

Files:

• ComponentBase.h (modified) (3 diffs)
• ComponentFactoryBase.h (modified) (1 diff)
• InputOutputBase.h (modified) (3 diffs)
• InputOutputInterface.h (modified) (2 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));
     }
 

trunk/include/Pacpus/kernel/ComponentFactoryBase.h

@@ -18 +18 @@
 #include <Pacpus/kernel/PacpusLibConfig.h>
 
-#include <boost/shared_ptr.hpp>
-//#include <boost/weak_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+//#include <boost/smart_ptr/weak_ptr.hpp>
 
 class QString;

trunk/include/Pacpus/kernel/InputOutputBase.h

@@ -7 +7 @@
 #include <Pacpus/kernel/PacpusLibConfig.h>
 
+#include <boost/smart_ptr/shared_ptr.hpp>
+//#include <boost/smart_ptr/weak_ptr.hpp>
 #include <QList>
 #include <QString>
@@ -14 +16 @@
 class QByteArray;
 
-namespace pacpus {
+namespace pacpus
+{
 
 class ComponentBase;
@@ -104 +107 @@
 };
 
+typedef boost::shared_ptr<InputInterfaceBase> InputSharedPointer;
+typedef boost::shared_ptr<OutputInterfaceBase> OutputSharedPointer;
+
 } // namespace pacpus
 

trunk/include/Pacpus/kernel/InputOutputInterface.h

@@ -263 +263 @@
             it->getPriority()
         );
-        LOG_TRACE("Sender: " << getSignature());
+        LOG_TRACE("Sending from " << getSignature() << " to " << it->getInterface()->getSignature());
     }
 }
@@ -280 +280 @@
 }
 
+//template <typename T1, typename T2, class C>
+//bool checkedSend(boost::shared_ptr< OutputInterface<T1, C> > sender, T2 const& data, road_time_t t = road_time(), road_timerange_t tr = 0);
+//
+//template <typename T1, typename T2, class C>
+//bool checkedSend(boost::shared_ptr< OutputInterface<T1, C> > sender, T2 const& data, road_time_t t, road_timerange_t tr)
+//{
+//    return checkedSend(sender.get(), data, t, tr);
+//}
+
 } // namespace pacpus