rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactored namespaces

Browse Source
This commit is contained in:
Jonas Zeunert
2018-09-14 00:33:13 +02:00
parent 05f4242d6d
commit 530893c404
23 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FlippR-Driver/include/Event.h
View File

@@ -12,7 +12,9 @@
#include <string> #include <string>
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
class Event class Event

4
FlippR-Driver/include/IInputDriver.h
View File

@@ -11,7 +11,9 @@
#include "IEventHandler.h" #include "IEventHandler.h"
#include <memory> #include <memory>
namespace FlippR_Driver::Input { namespace FlippR_Driver
{
namespace Input {
class IInputDriver class IInputDriver
{ {

4
FlippR-Driver/src/input/Detector.cpp
View File

@@ -12,7 +12,9 @@
#include "utilities/config.h" #include "utilities/config.h"
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
Detector::Detector(std::unique_ptr<IInputGPIOInterface> input_gpio_interface, std::map<char, std::shared_ptr<Event>> events, std::shared_ptr<IEventNotifier> event_notifier) : Detector::Detector(std::unique_ptr<IInputGPIOInterface> input_gpio_interface, std::map<char, std::shared_ptr<Event>> events, std::shared_ptr<IEventNotifier> event_notifier) :

4
FlippR-Driver/src/input/Detector.h
View File

@@ -24,7 +24,9 @@
#include "Event.h" #include "Event.h"
#include "IEventNotifier.h" #include "IEventNotifier.h"
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
class Detector : public IDetector class Detector : public IDetector

4
FlippR-Driver/src/input/ErrorEvent.hpp
View File

@@ -10,7 +10,9 @@
#include "Event.h" #include "Event.h"
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
class ErrorEvent : public Event class ErrorEvent : public Event

4
FlippR-Driver/src/input/Event.cpp
View File

@@ -8,7 +8,9 @@
#include "utilities/config.h" #include "utilities/config.h"
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
Event::Event(char address, int priority, std::string name) : Event::Event(char address, int priority, std::string name) :

4
FlippR-Driver/src/input/EventHandler.cpp
View File

@@ -7,7 +7,9 @@
#include "EventHandler.h" #include "EventHandler.h"
#include "utilities/config.h" #include "utilities/config.h"
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
EventHandler::EventHandler(std::shared_ptr<IInputDriver> input_driver) : EventHandler::EventHandler(std::shared_ptr<IInputDriver> input_driver) :

4
FlippR-Driver/src/input/EventHandler.h
View File

@@ -17,7 +17,9 @@
#include "IEventHandler.h" #include "IEventHandler.h"
#include "Event.h" #include "Event.h"
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
class EventHandler; class EventHandler;

4
FlippR-Driver/src/input/EventNotifier.cpp
View File

@@ -11,7 +11,9 @@
#include "EventNotifier.h" #include "EventNotifier.h"
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
EventNotifier::EventNotifier(IBlockingQueue<Event>* queue) : EventNotifier::EventNotifier(IBlockingQueue<Event>* queue) :

4
FlippR-Driver/src/input/EventNotifier.h
View File

@@ -21,7 +21,9 @@
#define HANDLER_TIMEOUT 2000 #define HANDLER_TIMEOUT 2000
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
class EventNotifier : public IEventNotifier class EventNotifier : public IEventNotifier

4
FlippR-Driver/src/input/IDetector.h
View File

@@ -9,7 +9,9 @@
#define SRC_INPUT_IDETECTOR_H_ #define SRC_INPUT_IDETECTOR_H_
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
class IDetector class IDetector

4
FlippR-Driver/src/input/IEventNotifier.h
View File

@@ -12,7 +12,9 @@
#include "IEventHandler.h" #include "IEventHandler.h"
#include <memory> #include <memory>
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
class IEventNotifier class IEventNotifier

4
FlippR-Driver/src/input/InputDriver.cpp
View File

@@ -10,7 +10,9 @@
#include <input/ErrorEvent.hpp> #include <input/ErrorEvent.hpp>
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
InputDriver::InputDriver(std::shared_ptr<IEventNotifier> event_notifier, std::unique_ptr<IDetector> detector, std::map<std::string, std::shared_ptr<Event>> events) : InputDriver::InputDriver(std::shared_ptr<IEventNotifier> event_notifier, std::unique_ptr<IDetector> detector, std::map<std::string, std::shared_ptr<Event>> events) :

4
FlippR-Driver/src/input/InputDriver.h
View File

@@ -13,7 +13,9 @@
#include "IInputDriver.h" #include "IInputDriver.h"
#include "IDetector.h" #include "IDetector.h"
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
class InputDriver : public IInputDriver class InputDriver : public IInputDriver

4
FlippR-Driver/src/input/InputDriverFactory.cpp
View File

@@ -18,7 +18,9 @@
using namespace nlohmann; using namespace nlohmann;
namespace FlippR_Driver::Input { namespace FlippR_Driver
{
namespace Input {
std::shared_ptr<IInputDriver> std::shared_ptr<IInputDriver>
InputDriverFactory::get_InputDriver(std::istream &input_config_stream, std::istream &matrix_config_stream) { InputDriverFactory::get_InputDriver(std::istream &input_config_stream, std::istream &matrix_config_stream) {

4
FlippR-Driver/src/input/InputDriverFactory.h
View File

@@ -18,7 +18,9 @@
#include "json/json.hpp" #include "json/json.hpp"
#include "IEventNotifier.h" #include "IEventNotifier.h"
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
class InputDriverFactory class InputDriverFactory
{ {

4
FlippR-Driver/tests/input/TestDetector.cpp
View File

@@ -23,7 +23,9 @@
using namespace fakeit; using namespace fakeit;
using namespace FlippR_Driver::Input; using namespace FlippR_Driver
{
namespace Input;
SCENARIO("Creating a Detector object", "") SCENARIO("Creating a Detector object", "")

4
FlippR-Driver/tests/input/TestEventNotifier.cpp
View File

@@ -20,7 +20,9 @@
#include "input/EventNotifier.h" #include "input/EventNotifier.h"
using namespace FlippR_Driver::Input; using namespace FlippR_Driver
{
namespace Input;
using namespace fakeit; using namespace fakeit;
SCENARIO("An EventNotifier gets created", "[construction]") SCENARIO("An EventNotifier gets created", "[construction]")

4
FlippR-Driver/tests/input/TestInputDriver.cpp
View File

@@ -19,7 +19,9 @@
using namespace fakeit; using namespace fakeit;
using namespace FlippR_Driver::Input; using namespace FlippR_Driver
{
namespace Input;
SCENARIO("An InputDriver gets created", "[construction}") SCENARIO("An InputDriver gets created", "[construction}")
{ {

4
FlippR-Driver/tests/input/TestInputDriverFactory.cpp
View File

@@ -16,7 +16,9 @@
#include "input/EventNotifier.h" #include "input/EventNotifier.h"
using namespace FlippR_Driver::Input; using namespace FlippR_Driver
{
namespace Input;
using namespace fakeit; using namespace fakeit;
SCENARIO("The factory creates a InputDriver") SCENARIO("The factory creates a InputDriver")

4
FlippR-Driver/tests/input/mocks/EventHandlerMock.hpp
View File

@@ -8,7 +8,9 @@
#ifndef SRC_TESTS_INPUT_MOCKS_EVENTHANDLERMOCK_HPP_ #ifndef SRC_TESTS_INPUT_MOCKS_EVENTHANDLERMOCK_HPP_
#define SRC_TESTS_INPUT_MOCKS_EVENTHANDLERMOCK_HPP_ #define SRC_TESTS_INPUT_MOCKS_EVENTHANDLERMOCK_HPP_
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
class EventHandler; class EventHandler;
class Event; class Event;

4
FlippR-Driver/tests/input/mocks/EventNotifierMock.hpp
View File

@@ -8,7 +8,9 @@
#ifndef SRC_TESTS_INPUT_MOCKS_EVENTNOTIFIERMOCK_HPP_ #ifndef SRC_TESTS_INPUT_MOCKS_EVENTNOTIFIERMOCK_HPP_
#define SRC_TESTS_INPUT_MOCKS_EVENTNOTIFIERMOCK_HPP_ #define SRC_TESTS_INPUT_MOCKS_EVENTNOTIFIERMOCK_HPP_
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
class EventNotifier; class EventNotifier;
class EventHandler; class EventHandler;

4
FlippR-Driver/tests/input/mocks/InputDriverMock.hpp
View File

@@ -8,7 +8,9 @@
#ifndef SRC_TESTS_INPUT_MOCKS_INPUTDRIVERMOCK_HPP_ #ifndef SRC_TESTS_INPUT_MOCKS_INPUTDRIVERMOCK_HPP_
#define SRC_TESTS_INPUT_MOCKS_INPUTDRIVERMOCK_HPP_ #define SRC_TESTS_INPUT_MOCKS_INPUTDRIVERMOCK_HPP_
namespace FlippR_Driver::Input namespace FlippR_Driver
{
namespace Input
{ {
class InputDriver; class InputDriver;
class EventHandler; class EventHandler;