aaah

FlippR-Driver/src/input/Detector.cpp

@@ -10,7 +10,7 @@
 #include <iostream>
 #include <math.h>
 
-#include "../utilities/config.h"
+#include "utilities/config.h"
 
 namespace Input
 {

FlippR-Driver/src/input/Detector.h

@@ -14,12 +14,13 @@
 #ifndef DETECTOR_H_
 #define DETECTOR_H_
 
-#include "IDetector.h"
 
 #include <thread>
 #include <map>
 
-#include "../utilities/IInputGPIOInterface.h"
+#include "utilities/IInputGPIOInterface.h"
+
+#include "IDetector.h"
 #include "Event.h"
 #include "IEventNotifier.h"
 

FlippR-Driver/src/input/Event.h

@@ -11,7 +11,7 @@
 #include <set>
 #include <string>
 
-#include "../utilities/config.h"
+#include "utilities/config.h"
 
 namespace Input
 {

FlippR-Driver/src/input/EventHandler.h

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

FlippR-Driver/src/input/EventNotifier.cpp

@@ -7,7 +7,7 @@
 
 #include <boost/thread.hpp>
 
-#include "../utilities/config.h"
+#include "utilities/config.h"
 
 #include "EventNotifier.h"
 

FlippR-Driver/src/input/EventNotifier.h

@@ -14,7 +14,7 @@
 #include <thread>
 #include <mutex>
 
-#include "../utilities/BlockingQueue.hpp"
+#include "utilities/BlockingQueue.hpp"
 #include "Event.h"
 #include "EventHandler.h"
 

FlippR-Driver/src/input/InputDriver.cpp

@@ -6,7 +6,8 @@
  */
 #include "InputDriver.h"
 
-using namespace Input;
+namespace Input
+{
 
 InputDriver::InputDriver(IEventNotifier* event_notifier, IDetector* detector) :
   event_notifier(event_notifier), detector(detector)
@@ -33,4 +34,6 @@ void InputDriver::unregister_event_handler(IEventHandler* handler)
   event_notifier->unregister_event_handler(handler);
 }
 
+}
+
 

FlippR-Driver/src/input/InputDriver.h

@@ -7,7 +7,7 @@
 #ifndef SRC_INPUT_INPUTDRIVER_H_
 #define SRC_INPUT_INPUTDRIVER_H_
 
-#include "../utilities/config.h"
+#include "utilities/config.h"
 
 #include "IInputDriver.h"
 #include "IDetector.h"

FlippR-Driver/src/input/InputDriverFactory.cpp

@@ -13,7 +13,10 @@
 #include "EventNotifier.h"
 
 using namespace nlohmann;
-using namespace Input;
+
+
+namespace Input
+{
 
 std::shared_ptr<InputDriver> InputDriverFactory::get_InputDriver(std::string& input_config_path, std::string& matrix_config_path)
 {
@@ -70,3 +73,6 @@ void InputDriverFactory::ConfigureLogger()
 {
   LoggerFactory::CreateInputLogger();
 }
+
+
+}

FlippR-Driver/src/input/InputDriverFactory.h

@@ -14,10 +14,10 @@
 #include "Detector.h"
 #include "InputDriver.h"
 
-#include "../utilities/InputGPIOInterface.h"
-#include "../utilities/config.h"
-#include "../lib/json/json.hpp"
-#include "../lib/easylogging/easylogging++.h"
+#include "utilities/InputGPIOInterface.h"
+#include "utilities/config.h"
+#include "lib/json/json.hpp"
+#include "lib/easylogging/easylogging++.h"
 #include "IEventNotifier.h"