From 22f7c43cf058f4e039a3c7c2e8255eb4ab9e8039 Mon Sep 17 00:00:00 2001
From: Jonas Zeunert <zeunert@rhrk.uni-kl.de>
Date: Tue, 20 Nov 2018 22:52:10 +0100
Subject: [PATCH] some refactoring

---
 FlippR-Driver/cli/PrintHandler.h                        | 4 ++--
 FlippR-Driver/cli/main.cpp                              | 2 +-
 FlippR-Driver/include/DriverFactory.h                   | 2 +-
 FlippR-Driver/include/{ => input}/Event.h               | 0
 FlippR-Driver/include/{ => input}/EventHandler.h        | 2 +-
 FlippR-Driver/include/{ => input}/IEventHandler.h       | 2 +-
 FlippR-Driver/include/{ => input}/IInputDriver.h        | 2 +-
 FlippR-Driver/include/{ => output}/IEightDigitDisplay.h | 8 +++++++-
 FlippR-Driver/{src => include}/output/IOutputDisplay.h  | 0
 FlippR-Driver/include/{ => output}/ISevenDigitDisplay.h | 8 ++++++++
 FlippR-Driver/src/input/DistributingEvent.h             | 2 +-
 FlippR-Driver/src/input/ErrorEvent.hpp                  | 2 +-
 FlippR-Driver/src/input/Event.cpp                       | 2 +-
 FlippR-Driver/src/input/EventHandler.cpp                | 2 +-
 FlippR-Driver/src/input/EventNotifier.h                 | 4 ++--
 FlippR-Driver/src/input/IEventNotifier.h                | 4 ++--
 FlippR-Driver/src/input/InputDriver.h                   | 2 +-
 FlippR-Driver/src/input/InputDriverFactory.h            | 2 +-
 18 files changed, 32 insertions(+), 18 deletions(-)
 rename FlippR-Driver/include/{ => input}/Event.h (100%)
 rename FlippR-Driver/include/{ => input}/EventHandler.h (95%)
 rename FlippR-Driver/include/{ => input}/IEventHandler.h (93%)
 rename FlippR-Driver/include/{ => input}/IInputDriver.h (94%)
 rename FlippR-Driver/include/{ => output}/IEightDigitDisplay.h (87%)
 rename FlippR-Driver/{src => include}/output/IOutputDisplay.h (100%)
 rename FlippR-Driver/include/{ => output}/ISevenDigitDisplay.h (86%)

diff --git a/FlippR-Driver/cli/PrintHandler.h b/FlippR-Driver/cli/PrintHandler.h
index d591eae..3ba31cb 100644
--- a/FlippR-Driver/cli/PrintHandler.h
+++ b/FlippR-Driver/cli/PrintHandler.h
@@ -6,8 +6,8 @@
 #define flippR_driver_PRINTHANDLER_H
 
 #include <memory>
-#include "EventHandler.h"
-#include "IInputDriver.h"
+#include "input/EventHandler.h"
+#include "input/IInputDriver.h"
 
 class PrintHandler : public flippR_driver::input::EventHandler
 {
diff --git a/FlippR-Driver/cli/main.cpp b/FlippR-Driver/cli/main.cpp
index 90522e2..39eb60d 100644
--- a/FlippR-Driver/cli/main.cpp
+++ b/FlippR-Driver/cli/main.cpp
@@ -7,7 +7,7 @@
 #include <signal.h>
 
 #include "DriverFactory.h"
-#include "IInputDriver.h"
+#include "input/IInputDriver.h"
 
 #include "PrintHandler.h"
 
diff --git a/FlippR-Driver/include/DriverFactory.h b/FlippR-Driver/include/DriverFactory.h
index e16b122..80d188d 100644
--- a/FlippR-Driver/include/DriverFactory.h
+++ b/FlippR-Driver/include/DriverFactory.h
@@ -8,7 +8,7 @@
 #include <fstream>
 #include <memory>
 
-#include "IInputDriver.h"
+#include "input/IInputDriver.h"
 
 namespace flippR_driver
 {
diff --git a/FlippR-Driver/include/Event.h b/FlippR-Driver/include/input/Event.h
similarity index 100%
rename from FlippR-Driver/include/Event.h
rename to FlippR-Driver/include/input/Event.h
diff --git a/FlippR-Driver/include/EventHandler.h b/FlippR-Driver/include/input/EventHandler.h
similarity index 95%
rename from FlippR-Driver/include/EventHandler.h
rename to FlippR-Driver/include/input/EventHandler.h
index 5bda799..03e052e 100644
--- a/FlippR-Driver/include/EventHandler.h
+++ b/FlippR-Driver/include/input/EventHandler.h
@@ -15,7 +15,7 @@
 #include "IInputDriver.h"
 
 #include "IEventHandler.h"
-#include "Event.h"
+#include "input/Event.h"
 
 namespace flippR_driver
 {
diff --git a/FlippR-Driver/include/IEventHandler.h b/FlippR-Driver/include/input/IEventHandler.h
similarity index 93%
rename from FlippR-Driver/include/IEventHandler.h
rename to FlippR-Driver/include/input/IEventHandler.h
index 5c52985..4fe3179 100644
--- a/FlippR-Driver/include/IEventHandler.h
+++ b/FlippR-Driver/include/input/IEventHandler.h
@@ -8,7 +8,7 @@
 #ifndef SRC_IEVENTHANDLER_H_
 #define SRC_IEVENTHANDLER_H_
 
-#include "Event.h"
+#include "input/Event.h"
 
 class IEventHandler
 {
diff --git a/FlippR-Driver/include/IInputDriver.h b/FlippR-Driver/include/input/IInputDriver.h
similarity index 94%
rename from FlippR-Driver/include/IInputDriver.h
rename to FlippR-Driver/include/input/IInputDriver.h
index d3f1726..37b5bb9 100644
--- a/FlippR-Driver/include/IInputDriver.h
+++ b/FlippR-Driver/include/input/IInputDriver.h
@@ -8,7 +8,7 @@
 #ifndef SRC_INPUT_IINPUTDRIVER_H_
 #define SRC_INPUT_IINPUTDRIVER_H_
 
-#include "IEventHandler.h"
+#include "input/IEventHandler.h"
 #include <memory>
 
 namespace flippR_driver
diff --git a/FlippR-Driver/include/IEightDigitDisplay.h b/FlippR-Driver/include/output/IEightDigitDisplay.h
similarity index 87%
rename from FlippR-Driver/include/IEightDigitDisplay.h
rename to FlippR-Driver/include/output/IEightDigitDisplay.h
index c7d0d65..4346f6c 100644
--- a/FlippR-Driver/include/IEightDigitDisplay.h
+++ b/FlippR-Driver/include/output/IEightDigitDisplay.h
@@ -7,12 +7,18 @@
 
 #include <array>
 
+namespace flippr_driver
+{
+namespace output
+{
+
 class IEightDigitDisplay
 {
 public:
   virtual void write_score(int score);
   virtual void write_content(std::array<char, 8> content);
-
 };
 
+}
+}
 #endif //FLIPPR_DRIVER_IEIGHTDIGITDISPLAY_H
diff --git a/FlippR-Driver/src/output/IOutputDisplay.h b/FlippR-Driver/include/output/IOutputDisplay.h
similarity index 100%
rename from FlippR-Driver/src/output/IOutputDisplay.h
rename to FlippR-Driver/include/output/IOutputDisplay.h
diff --git a/FlippR-Driver/include/ISevenDigitDisplay.h b/FlippR-Driver/include/output/ISevenDigitDisplay.h
similarity index 86%
rename from FlippR-Driver/include/ISevenDigitDisplay.h
rename to FlippR-Driver/include/output/ISevenDigitDisplay.h
index 6c7d845..7d85392 100644
--- a/FlippR-Driver/include/ISevenDigitDisplay.h
+++ b/FlippR-Driver/include/output/ISevenDigitDisplay.h
@@ -7,10 +7,18 @@
 
 #include <array>
 
+namespace flippr_driver
+{
+namespace output
+{
+
 class ISevenDigitDisplay
 {
 public:
   virtual void write_score(int score);
   virtual void write_content(std::array<char, 7> content);
 };
+
+}
+}
 #endif //FLIPPR_DRIVER_ISEVENDIGITDISPLAY_H
diff --git a/FlippR-Driver/src/input/DistributingEvent.h b/FlippR-Driver/src/input/DistributingEvent.h
index 3cec71a..69c38f3 100644
--- a/FlippR-Driver/src/input/DistributingEvent.h
+++ b/FlippR-Driver/src/input/DistributingEvent.h
@@ -5,7 +5,7 @@
 #ifndef flippR_driver_DISTRIBUTINGEVENT_H
 #define flippR_driver_DISTRIBUTINGEVENT_H
 
-#include "Event.h"
+#include "input/Event.h"
 #include "IEventNotifier.h"
 
 namespace flippR_driver
diff --git a/FlippR-Driver/src/input/ErrorEvent.hpp b/FlippR-Driver/src/input/ErrorEvent.hpp
index 12f286d..33bcf33 100644
--- a/FlippR-Driver/src/input/ErrorEvent.hpp
+++ b/FlippR-Driver/src/input/ErrorEvent.hpp
@@ -8,7 +8,7 @@
 #ifndef SRC_INPUT_ERROREVENT_HPP_
 #define SRC_INPUT_ERROREVENT_HPP_
 
-#include "Event.h"
+#include "input/Event.h"
 
 namespace flippR_driver {
 namespace input {
diff --git a/FlippR-Driver/src/input/Event.cpp b/FlippR-Driver/src/input/Event.cpp
index 49b09f2..1638180 100644
--- a/FlippR-Driver/src/input/Event.cpp
+++ b/FlippR-Driver/src/input/Event.cpp
@@ -4,7 +4,7 @@
  *  Created on: Jun 15, 2018
  *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
  */
-#include "Event.h"
+#include "input/Event.h"
 
 #include "utility/config.h"
 
diff --git a/FlippR-Driver/src/input/EventHandler.cpp b/FlippR-Driver/src/input/EventHandler.cpp
index 6f16bc3..80fd9cb 100644
--- a/FlippR-Driver/src/input/EventHandler.cpp
+++ b/FlippR-Driver/src/input/EventHandler.cpp
@@ -4,7 +4,7 @@
  *  Created on: Jun 14, 2018
  *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
  */
-#include "EventHandler.h"
+#include "input/EventHandler.h"
 #include "utility/config.h"
 
 namespace flippR_driver
diff --git a/FlippR-Driver/src/input/EventNotifier.h b/FlippR-Driver/src/input/EventNotifier.h
index 45d51d3..40af4ad 100644
--- a/FlippR-Driver/src/input/EventNotifier.h
+++ b/FlippR-Driver/src/input/EventNotifier.h
@@ -16,8 +16,8 @@
 
 #include "utility/BlockingQueue.hpp"
 #include "utility/IBlockingQueue.h"
-#include "Event.h"
-#include "EventHandler.h"
+#include "input/Event.h"
+#include "input/EventHandler.h"
 
 #define HANDLER_TIMEOUT 2000
 
diff --git a/FlippR-Driver/src/input/IEventNotifier.h b/FlippR-Driver/src/input/IEventNotifier.h
index 425fabf..c231fce 100644
--- a/FlippR-Driver/src/input/IEventNotifier.h
+++ b/FlippR-Driver/src/input/IEventNotifier.h
@@ -8,8 +8,8 @@
 #ifndef SRC_INPUT_IEVENTNOTIFIER_H_
 #define SRC_INPUT_IEVENTNOTIFIER_H_
 
-#include "Event.h"
-#include "IEventHandler.h"
+#include "input/Event.h"
+#include "input/IEventHandler.h"
 #include <memory>
 
 namespace flippR_driver
diff --git a/FlippR-Driver/src/input/InputDriver.h b/FlippR-Driver/src/input/InputDriver.h
index 07781fd..cc4fa24 100644
--- a/FlippR-Driver/src/input/InputDriver.h
+++ b/FlippR-Driver/src/input/InputDriver.h
@@ -10,7 +10,7 @@
 #include <map>
 
 #include "IEventNotifier.h"
-#include "IInputDriver.h"
+#include "input/IInputDriver.h"
 #include "IDetector.h"
 
 namespace flippR_driver
diff --git a/FlippR-Driver/src/input/InputDriverFactory.h b/FlippR-Driver/src/input/InputDriverFactory.h
index 6a9bf00..0349e3d 100644
--- a/FlippR-Driver/src/input/InputDriverFactory.h
+++ b/FlippR-Driver/src/input/InputDriverFactory.h
@@ -12,7 +12,7 @@
 #include <atomic>
 
 #include "Detector.h"
-#include "IInputDriver.h"
+#include "input/IInputDriver.h"
 
 #include "utility/InputGPIOInterface.h"
 #include "json/json.hpp"