Changeset 152 in pacpusframework for branches/2.0-beta1/include/Pacpus/kernel/InputOutputInterface.h

Timestamp:

08/01/13 10:45:50 (11 years ago)

Author:

Marek Kurdej

Message:

Major update.
Renamed: addInput -> addInputs, addOutput -> addOutputs and made pure virtual (=0).
Transformed macro definitions into template methods: ADD_INPUT -> ComponentBase::addInput, ADD_OUTPUT -> ComponentBase::addOutput, GET_INPUT -> ComponentBase::getTypedInput, GET_OUTPUT -> ComponentBase::getTypedOutput.
Fixed: added public/protected set/get methods in ComponentBase, made member fields private.

File:

• branches/2.0-beta1/include/Pacpus/kernel/InputOutputInterface.h (modified) (3 diffs)

branches/2.0-beta1/include/Pacpus/kernel/InputOutputInterface.h

@@ -12 +12 @@
 #include <QByteArray>
 
-#define ADD_INPUT(name,ComponentType, DataType, functionName)  input.insert(name,new InputInterface<DataType,ComponentType> (name,this,&ComponentType::functionName))
-#define ADD_OUTPUT(name,ComponentType, DataType)      output.insert(name,new OutputInterface<DataType,ComponentType> (name,this))
-
-#define GET_OUTPUT(name,ComponentType, DataType) dynamic_cast<OutputInterface<DataType,ComponentType> *> (output.value(name))
-#define GET_INPUT(name,ComponentType, DataType) dynamic_cast<InputInterface<DataType,ComponentType> *> (input.value(name))
+//#define ADD_INPUT(name, ComponentType, DataType, functionName) \
+//    inputs().insert((name), new InputInterface<DataType, ComponentType> ((name), this, &ComponentType::functionName))
+//#define ADD_OUTPUT(name, ComponentType, DataType) \
+//    outputs().insert((name), new OutputInterface<DataType, ComponentType> ((name), this))
+
+//#define GET_INPUT(name, ComponentType, DataType) \
+//    dynamic_cast<InputInterface<DataType, ComponentType> *> (input.value(name))
+//#define GET_OUTPUT(name, ComponentType, DataType) \
+//    dynamic_cast<OutputInterface<DataType, ComponentType> *> (output.value(name))
 
 namespace pacpus {
 
-template <class T, class C>
+template <typename T, class C>
 class InputInterface
     : public InputInterfaceBase
@@ -26 +30 @@
 public:
     InputInterface(QString name, C * component, void (C::*m)(const T&))
-        : InputInterfaceBase(name,component,component)
+        : InputInterfaceBase(name, component, component)
         , method(m)
     {}
@@ -140 +144 @@
 };
 
-template <class T, class C>
+template <typename T, class C>
 class OutputInterface : public OutputInterfaceBase
 {