From 785467a4b35f7c6aaa444099069b80579966bdc0 Mon Sep 17 00:00:00 2001 From: Neeflix Date: Thu, 14 Jun 2018 22:44:08 +0200 Subject: [PATCH] changed things :wheelchair: --- FlippR-Driver/.gitignore | 1 + FlippR-Driver/.settings/language.settings.xml | 37 ++++++------------- FlippR-Driver/src/input/EventHandler.hpp | 2 +- FlippR-Driver/src/input/InputDriver.hpp | 2 +- FlippR-Driver/src/output/EventHandler.cpp | 24 ++++++++++++ FlippR-Driver/src/output/EventHandler.h | 28 ++++++++++++++ .../src/{input => utilities}/IEventHandler.h | 13 +++---- 7 files changed, 72 insertions(+), 35 deletions(-) create mode 100644 FlippR-Driver/src/output/EventHandler.cpp create mode 100644 FlippR-Driver/src/output/EventHandler.h rename FlippR-Driver/src/{input => utilities}/IEventHandler.h (54%) diff --git a/FlippR-Driver/.gitignore b/FlippR-Driver/.gitignore index efc2322..f490952 100644 --- a/FlippR-Driver/.gitignore +++ b/FlippR-Driver/.gitignore @@ -1,3 +1,4 @@ build src/Debug /Debug/ +.settings/* diff --git a/FlippR-Driver/.settings/language.settings.xml b/FlippR-Driver/.settings/language.settings.xml index c7e504e..d3526a4 100644 --- a/FlippR-Driver/.settings/language.settings.xml +++ b/FlippR-Driver/.settings/language.settings.xml @@ -1,28 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/FlippR-Driver/src/input/EventHandler.hpp b/FlippR-Driver/src/input/EventHandler.hpp index e90f227..e915545 100644 --- a/FlippR-Driver/src/input/EventHandler.hpp +++ b/FlippR-Driver/src/input/EventHandler.hpp @@ -11,11 +11,11 @@ #ifndef INPUTEVENTHANDLER_H_ #define INPUTEVENTHANDLER_H_ -#include "IEventHandler.h" #include "Event.hpp" #include "IInputDriver.h" +#include "../utilities/IEventHandler.h" #include "../utilities/config.h" namespace Input diff --git a/FlippR-Driver/src/input/InputDriver.hpp b/FlippR-Driver/src/input/InputDriver.hpp index b4b4de4..ed87623 100644 --- a/FlippR-Driver/src/input/InputDriver.hpp +++ b/FlippR-Driver/src/input/InputDriver.hpp @@ -6,10 +6,10 @@ */ #ifndef SRC_INPUT_INPUTDRIVER_HPP_ #define SRC_INPUT_INPUTDRIVER_HPP_ -#include "IInputDriver.h" #include "../utilities/config.h" +#include "IInputDriver.h" #include "IDetector.h" namespace Input diff --git a/FlippR-Driver/src/output/EventHandler.cpp b/FlippR-Driver/src/output/EventHandler.cpp new file mode 100644 index 0000000..7464850 --- /dev/null +++ b/FlippR-Driver/src/output/EventHandler.cpp @@ -0,0 +1,24 @@ +/* + * EventHandler.cpp + * + * Created on: Jun 14, 2018 + * Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht + */ + +#include "EventHandler.h" + +namespace output +{ + + EventHandler::EventHandler () + { + // TODO Auto-generated constructor stub + + } + + EventHandler::~EventHandler () + { + // TODO Auto-generated destructor stub + } + +} /* namespace output */ diff --git a/FlippR-Driver/src/output/EventHandler.h b/FlippR-Driver/src/output/EventHandler.h new file mode 100644 index 0000000..66ddadb --- /dev/null +++ b/FlippR-Driver/src/output/EventHandler.h @@ -0,0 +1,28 @@ +/* + * EventHandler.h + * + * Created on: Jun 14, 2018 + * Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht + */ + + +#include "../utilities/IEventHandler.h" + +#ifndef SRC_OUTPUT_EVENTHANDLER_H_ +#define SRC_OUTPUT_EVENTHANDLER_H_ + +namespace output +{ + +class EventHandler : public IEventHandler +{ +public: + EventHandler(); + virtual ~EventHandler(); + + virtual void handle() override; +}; + +} /* namespace output */ + +#endif /* SRC_OUTPUT_EVENTHANDLER_H_ */ diff --git a/FlippR-Driver/src/input/IEventHandler.h b/FlippR-Driver/src/utilities/IEventHandler.h similarity index 54% rename from FlippR-Driver/src/input/IEventHandler.h rename to FlippR-Driver/src/utilities/IEventHandler.h index 350e09c..00f6b03 100644 --- a/FlippR-Driver/src/input/IEventHandler.h +++ b/FlippR-Driver/src/utilities/IEventHandler.h @@ -5,20 +5,17 @@ * Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht */ -#ifndef SRC_INPUT_IEVENTHANDLER_H_ -#define SRC_INPUT_IEVENTHANDLER_H_ +#ifndef SRC_IEVENTHANDLER_H_ +#define SRC_IEVENTHANDLER_H_ -#include "Event.hpp" - -namespace Input { +#include "../input/Event.hpp" class IEventHandler { public: virtual ~IEventHandler() = 0; - virtual void handle(Event& event) = 0; + virtual void handle(Input::Event& event) = 0; }; -} -#endif /* SRC_INPUT_IEVENTHANDLER_H_ */ +#endif /* SRC_IEVENTHANDLER_H_ */