refactored public includes

This commit is contained in:
Jonas Zeunert
2018-09-13 22:38:24 +02:00
parent e8c801a3c0
commit b77ace536c
13 changed files with 54 additions and 71 deletions

View File

@@ -17,7 +17,7 @@ class ErrorEvent : public Event
{
public:
ErrorEvent() :
Event(0, HIGHEST_INPUT_EVENT_PRIORITY, "ERROR")
Event(0, 0, "ERROR")
{}
};
}

View File

@@ -6,6 +6,8 @@
*/
#include "Event.h"
#include "utilities/config.h"
namespace Input
{

View File

@@ -1,43 +0,0 @@
/*
* InputEvent.h
*
* Created on: Apr 5, 2018
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
*/
#ifndef INPUTEVENT_H_
#define INPUTEVENT_H_
#include <set>
#include <string>
#include "utilities/config.h"
namespace Input
{
class Event
{
public:
Event(char address, int priority, std::string name);
friend bool operator==(const Event& left, const Event& right);
friend bool operator<(const Event& left, const Event& right)
{
return left.priority < right.priority;
}
private:
char address;
public:
int priority;
std::string name;
};
bool operator==(const Event& left, const Event& right);
}
#endif /* INPUTEVENT_H_ */

View File

@@ -14,7 +14,7 @@
#include "IInputDriver.h"
#include "utilities/IEventHandler.h"
#include "IEventHandler.h"
#include "utilities/config.h"
#include "Event.h"

View File

@@ -9,7 +9,8 @@
#define SRC_INPUT_IEVENTNOTIFIER_H_
#include "Event.h"
#include "utilities/IEventHandler.h"
#include "IEventHandler.h"
#include <memory>
namespace Input
{

View File

@@ -9,6 +9,7 @@
#include "utilities/config.h"
#include "IEventNotifier.h"
#include "IInputDriver.h"
#include "IDetector.h"

View File

@@ -1,21 +0,0 @@
/*
* IEventHandler.h
*
* Created on: Jun 13, 2018
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
*/
#ifndef SRC_IEVENTHANDLER_H_
#define SRC_IEVENTHANDLER_H_
#include "input/Event.h"
class IEventHandler
{
public:
virtual ~IEventHandler(){};
virtual void handle(Input::Event& event) = 0;
};
#endif /* SRC_IEVENTHANDLER_H_ */