git is weird #15

Merged
muellerr merged 1 commits from mueller/action-git-update into mueller/master 2020-08-28 17:37:30 +02:00
10 changed files with 669 additions and 669 deletions

View File

@ -1,5 +1,5 @@
#include "../action/ActionHelper.h"
#include "../action/HasActionsIF.h"
#include "ActionHelper.h"
#include "HasActionsIF.h"
#include "../objectmanager/ObjectManagerIF.h"
ActionHelper::ActionHelper(HasActionsIF* setOwner, MessageQueueIF* useThisQueue) :

View File

@ -1,7 +1,7 @@
#ifndef ACTIONHELPER_H_
#define ACTIONHELPER_H_
#include "../action/ActionMessage.h"
#include "ActionMessage.h"
#include "../serialize/SerializeIF.h"
#include "../ipc/MessageQueueIF.h"
/**
@ -35,7 +35,7 @@ public:
ReturnValue_t handleActionMessage(CommandMessage* command);
/**
* Helper initialize function. Must be called before use of any other helper function
* @param queueToUse_ Pointer to the messageQueue to be used
* @param queueToUse_ Pointer to the messageQueue to be used, optional if queue was set in constructor
* @return Returns RETURN_OK if successful
*/
ReturnValue_t initialize(MessageQueueIF* queueToUse_ = nullptr);

View File

@ -1,4 +1,4 @@
#include "../action/ActionMessage.h"
#include "ActionMessage.h"
#include "../objectmanager/ObjectManagerIF.h"
#include "../storagemanager/StorageManagerIF.h"

View File

@ -1,7 +1,7 @@
#include "../action/ActionMessage.h"
#include "../action/CommandActionHelper.h"
#include "../action/CommandsActionsIF.h"
#include "../action/HasActionsIF.h"
#include "ActionMessage.h"
#include "CommandActionHelper.h"
#include "CommandsActionsIF.h"
#include "HasActionsIF.h"
#include "../objectmanager/ObjectManagerIF.h"
CommandActionHelper::CommandActionHelper(CommandsActionsIF *setOwner) :

View File

@ -1,7 +1,7 @@
#ifndef COMMANDACTIONHELPER_H_
#define COMMANDACTIONHELPER_H_
#include "../action/ActionMessage.h"
#include "ActionMessage.h"
#include "../objectmanager/ObjectManagerIF.h"
#include "../returnvalues/HasReturnvaluesIF.h"
#include "../serialize/SerializeIF.h"

View File

@ -1,7 +1,7 @@
#ifndef COMMANDSACTIONSIF_H_
#define COMMANDSACTIONSIF_H_
#include "../action/CommandActionHelper.h"
#include "CommandActionHelper.h"
#include "../returnvalues/HasReturnvaluesIF.h"
#include "../ipc/MessageQueueIF.h"

View File

@ -1,9 +1,9 @@
#ifndef FRAMEWORK_ACTION_HASACTIONSIF_H_
#define FRAMEWORK_ACTION_HASACTIONSIF_H_
#include "../action/ActionHelper.h"
#include "../action/ActionMessage.h"
#include "../action/SimpleActionHelper.h"
#include "ActionHelper.h"
#include "ActionMessage.h"
#include "SimpleActionHelper.h"
#include "../returnvalues/HasReturnvaluesIF.h"
#include "../ipc/MessageQueueIF.h"
/**

View File

@ -1,5 +1,5 @@
#include "../action/HasActionsIF.h"
#include "../action/SimpleActionHelper.h"
#include "HasActionsIF.h"
#include "SimpleActionHelper.h"
SimpleActionHelper::SimpleActionHelper(HasActionsIF* setOwner,
MessageQueueIF* useThisQueue) :
ActionHelper(setOwner, useThisQueue), isExecuting(false), lastCommander(

View File

@ -1,7 +1,7 @@
#ifndef SIMPLEACTIONHELPER_H_
#define SIMPLEACTIONHELPER_H_
#include "../action/ActionHelper.h"
#include "ActionHelper.h"
class SimpleActionHelper: public ActionHelper {
public: