From 6daa369006c23e11cf735320d53700d3ee684c2f Mon Sep 17 00:00:00 2001
From: Jonas Zeunert <zeunert@rhrk.uni-kl.de>
Date: Thu, 20 Sep 2018 20:10:30 +0200
Subject: [PATCH] ??

---
 FlippR-Driver/cli/PrintHandler.cpp      |  2 +-
 FlippR-Driver/cli/PrintHandler.h        |  3 +-
 FlippR-Driver/src/input/InputDriver.cpp | 56 +++++++++++++------------
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/FlippR-Driver/cli/PrintHandler.cpp b/FlippR-Driver/cli/PrintHandler.cpp
index ec66e3e..4552cba 100644
--- a/FlippR-Driver/cli/PrintHandler.cpp
+++ b/FlippR-Driver/cli/PrintHandler.cpp
@@ -5,7 +5,7 @@
 #include "PrintHandler.h"
 #include <iostream>
 
-PrintHandler::PrintHandler(std::shared_ptr<Input::IInputDriver> driver) :
+PrintHandler::PrintHandler(std::shared_ptr<FlippR_Driver::Input::IInputDriver> driver) :
   EventHandler(driver)
   {}
 
diff --git a/FlippR-Driver/cli/PrintHandler.h b/FlippR-Driver/cli/PrintHandler.h
index 4ac79fb..ed5e4af 100644
--- a/FlippR-Driver/cli/PrintHandler.h
+++ b/FlippR-Driver/cli/PrintHandler.h
@@ -5,12 +5,13 @@
 #ifndef FLIPPR_DRIVER_PRINTHANDLER_H
 #define FLIPPR_DRIVER_PRINTHANDLER_H
 
+#include <memory>
 #include "IEventHandler.h"
 
 class PrintHandler : public IEventHandler
 {
 public:
-  PrintHandler(std::shared_ptr<Input::IInputDriver> driver);
+  PrintHandler(std::shared_ptr<FlippR_Driver::Input::IInputDriver> driver);
   
   virtual void handle(FlippR_Driver::Input::Event& event) override;
 };
diff --git a/FlippR-Driver/src/input/InputDriver.cpp b/FlippR-Driver/src/input/InputDriver.cpp
index 4719f57..cfbb4c7 100644
--- a/FlippR-Driver/src/input/InputDriver.cpp
+++ b/FlippR-Driver/src/input/InputDriver.cpp
@@ -10,39 +10,43 @@
 
 #include <input/ErrorEvent.hpp>
 
-namespace FlippR_Driver 
+namespace FlippR_Driver
 {
-namespace Input 
+namespace Input
 {
 
-  InputDriver::InputDriver(std::shared_ptr<IEventNotifier> event_notifier, std::unique_ptr<IDetector> detector,
-                           std::map<std::string, std::shared_ptr<Event>> events) :
-          event_notifier(event_notifier),
-          detector(std::move(detector)),
-          events(events) {
-    CLOG(INFO, INPUT_LOGGER) << "Created InputDriver";
-  
-  void InputDriver::register_event_handler(IEventHandler *handler) 
-  {
-    this->event_notifier->register_event_handler(handler);
-  }
+InputDriver::InputDriver(std::shared_ptr<IEventNotifier> event_notifier, std::unique_ptr<IDetector> detector,
+                         std::map<std::string, std::shared_ptr<Event>> events) :
+event_notifier(event_notifier), detector(std::move(detector)), events(events)
+{
+  CLOG(INFO, INPUT_LOGGER) << "Created InputDriver";
+}
 
-  void InputDriver::unregister_event_handler(IEventHandler *handler) 
-  {
-    this->event_notifier->unregister_event_handler(handler);
-  
-    std::shared_ptr<Event> InputDriver::get_event(std::string name) 
+void InputDriver::register_event_handler(IEventHandler *handler)
+{
+  this->event_notifier->register_event_handler(handler);
+}
+
+void InputDriver::unregister_event_handler(IEventHandler *handler)
+{
+  this->event_notifier->unregister_event_handler(handler);
+}
+
+std::shared_ptr<Event> InputDriver::get_event(std::string name)
+{
+  std::shared_ptr<Event> event(new ErrorEvent());
+  try
     {
-      std::shared_ptr<Event> event(new ErrorEvent());
-      try 
-      {
-        event = this->events.at(name);
-      }
-        catch (std::out_of_range &e) {
-        CLOG_N_TIMES(1, WARNING, OUTPUT_LOGGER) << "Did not found event " << name << " please check config file!";
+      event = this->events.at(name);
+    }
+  catch(std::out_of_range &e)
+    {
+      CLOG_N_TIMES(1, WARNING, OUTPUT_LOGGER) << "Did not found event " << name << " please check config file!";
 
       return event;
-      }
     }
 }
 
+}
+}
+