clearer wording

This commit is contained in:
Ulrich Mohr 2023-07-03 10:09:47 +02:00
parent 2044e1cde2
commit 6a76857f5f

View File

@ -3,11 +3,11 @@
#include "Action.h" #include "Action.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
template <class owner, class action, class ActionEnum> template <class owner_class, class action_type, class ActionEnum>
class TemplateAction : public Action { class TemplateAction : public Action {
public: public:
#ifdef FSFW_INTROSPECTION #ifdef FSFW_INTROSPECTION
TemplateAction(owner *myOwner, ActionEnum id) : Action(), myOwner(myOwner) { TemplateAction(owner_class *myOwner, ActionEnum id) : Action(), myOwner(myOwner) {
Action::setEnum(&id); Action::setEnum(&id);
if (myOwner->getActionHelper() == nullptr) { if (myOwner->getActionHelper() == nullptr) {
sif::error sif::error
@ -17,13 +17,13 @@ class TemplateAction : public Action {
myOwner->getActionHelper()->registerAction(this); myOwner->getActionHelper()->registerAction(this);
} }
#else #else
TemplateAction(owner *myOwner, ActionEnum id) : Action((uint32_t)id), myOwner(myOwner) { TemplateAction(owner_class *myOwner, ActionEnum id) : Action((uint32_t)id), myOwner(myOwner) {
myOwner->getActionHelper()->registerAction(this); myOwner->getActionHelper()->registerAction(this);
} }
#endif #endif
ReturnValue_t handle() override { return myOwner->handleAction(dynamic_cast<action *>(this)); } ReturnValue_t handle() override { return myOwner->handleAction(dynamic_cast<action_type *>(this)); }
private: private:
owner *myOwner; owner_class *myOwner;
}; };