From 3b72274d6b2599fc0e5f65071df20d9bca5bb3d3 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Fri, 14 Dec 2018 16:16:44 +0100 Subject: [PATCH] renamed impl to detail --- .../src/input/InputDriverFactory.cpp | 14 ++--- FlippR-Driver/src/input/InputDriverFactory.h | 2 +- .../src/input/{impl => detail}/Detector.cpp | 2 +- .../src/input/{impl => detail}/Detector.h | 2 +- .../input/{impl => detail}/EventHandler.cpp | 2 +- .../src/input/{impl => detail}/EventHandler.h | 2 +- .../input/{impl => detail}/EventNotifier.cpp | 2 +- .../input/{impl => detail}/EventNotifier.h | 2 +- .../input/{impl => detail}/InputDriver.cpp | 2 +- .../src/input/{impl => detail}/InputDriver.h | 2 +- .../{impl => detail}/InputPinController.cpp | 2 +- .../{impl => detail}/InputPinController.h | 2 +- .../src/output/OutputDriverFactory.cpp | 40 +++++++------- .../src/output/OutputDriverFactory.h | 12 ++--- .../src/output/SoundBoardPinController.h | 6 +-- .../DisplayBoardPinController.cpp | 2 +- .../DisplayBoardPinController.h | 2 +- .../{impl => detail}/DisplayController.cpp | 2 +- .../{impl => detail}/DisplayController.h | 2 +- .../DriverBoardPinController.cpp | 2 +- .../DriverBoardPinController.h | 2 +- .../output/{impl => detail}/OutputDriver.cpp | 2 +- .../output/{impl => detail}/OutputDriver.h | 2 +- .../SoundBoardPinController.cpp | 6 +-- .../SoundBoardPinController.h | 8 +-- .../src/output/items/DriverBoardItem.h | 6 +-- .../output/items/{impl => detail}/Display.h | 6 +-- .../output/items/{impl => detail}/Display.hpp | 2 +- .../{impl => detail}/EightDigitDisplay.h | 4 +- .../output/items/{impl => detail}/Item.cpp | 2 +- .../src/output/items/{impl => detail}/Item.h | 2 +- .../output/items/{impl => detail}/Lamp.cpp | 2 +- .../src/output/items/{impl => detail}/Lamp.h | 2 +- .../{impl => detail}/SevenDigitDisplay.h | 4 +- .../items/{impl => detail}/Solenoid.cpp | 2 +- .../output/items/{impl => detail}/Solenoid.h | 2 +- .../output/items/{impl => detail}/Sound.cpp | 2 +- .../src/output/items/{impl => detail}/Sound.h | 2 +- FlippR-Driver/tests/catch.hpp | 52 +++++++++---------- FlippR-Driver/tests/output/TestDisplay.cpp | 2 +- FlippR-Driver/tests/output/TestLamp.cpp | 2 +- FlippR-Driver/tests/output/TestSolenoid.cpp | 2 +- FlippR-Driver/tests/output/TestSound.cpp | 2 +- 43 files changed, 111 insertions(+), 111 deletions(-) rename FlippR-Driver/src/input/{impl => detail}/Detector.cpp (98%) rename FlippR-Driver/src/input/{impl => detail}/Detector.h (98%) rename FlippR-Driver/src/input/{impl => detail}/EventHandler.cpp (97%) rename FlippR-Driver/src/input/{impl => detail}/EventHandler.h (97%) rename FlippR-Driver/src/input/{impl => detail}/EventNotifier.cpp (99%) rename FlippR-Driver/src/input/{impl => detail}/EventNotifier.h (98%) rename FlippR-Driver/src/input/{impl => detail}/InputDriver.cpp (98%) rename FlippR-Driver/src/input/{impl => detail}/InputDriver.h (97%) rename FlippR-Driver/src/input/{impl => detail}/InputPinController.cpp (99%) rename FlippR-Driver/src/input/{impl => detail}/InputPinController.h (97%) rename FlippR-Driver/src/output/{impl => detail}/DisplayBoardPinController.cpp (99%) rename FlippR-Driver/src/output/{impl => detail}/DisplayBoardPinController.h (98%) rename FlippR-Driver/src/output/{impl => detail}/DisplayController.cpp (98%) rename FlippR-Driver/src/output/{impl => detail}/DisplayController.h (98%) rename FlippR-Driver/src/output/{impl => detail}/DriverBoardPinController.cpp (99%) rename FlippR-Driver/src/output/{impl => detail}/DriverBoardPinController.h (98%) rename FlippR-Driver/src/output/{impl => detail}/OutputDriver.cpp (99%) rename FlippR-Driver/src/output/{impl => detail}/OutputDriver.h (99%) rename FlippR-Driver/src/output/{impl => detail}/SoundBoardPinController.cpp (89%) rename FlippR-Driver/src/output/{impl => detail}/SoundBoardPinController.h (83%) rename FlippR-Driver/src/output/items/{impl => detail}/Display.h (87%) rename FlippR-Driver/src/output/items/{impl => detail}/Display.hpp (98%) rename FlippR-Driver/src/output/items/{impl => detail}/EightDigitDisplay.h (92%) rename FlippR-Driver/src/output/items/{impl => detail}/Item.cpp (95%) rename FlippR-Driver/src/output/items/{impl => detail}/Item.h (97%) rename FlippR-Driver/src/output/items/{impl => detail}/Lamp.cpp (97%) rename FlippR-Driver/src/output/items/{impl => detail}/Lamp.h (97%) rename FlippR-Driver/src/output/items/{impl => detail}/SevenDigitDisplay.h (92%) rename FlippR-Driver/src/output/items/{impl => detail}/Solenoid.cpp (97%) rename FlippR-Driver/src/output/items/{impl => detail}/Solenoid.h (98%) rename FlippR-Driver/src/output/items/{impl => detail}/Sound.cpp (97%) rename FlippR-Driver/src/output/items/{impl => detail}/Sound.h (98%) diff --git a/FlippR-Driver/src/input/InputDriverFactory.cpp b/FlippR-Driver/src/input/InputDriverFactory.cpp index 7a8607f..273892e 100644 --- a/FlippR-Driver/src/input/InputDriverFactory.cpp +++ b/FlippR-Driver/src/input/InputDriverFactory.cpp @@ -12,9 +12,9 @@ #include "utility/LoggerFactory.h" -#include "input/impl/InputDriver.h" -#include "input/impl/EventNotifier.h" -#include "input/impl/Detector.h" +#include "input/detail/InputDriver.h" +#include "input/detail/EventNotifier.h" +#include "input/detail/Detector.h" namespace flippR_driver { @@ -31,17 +31,17 @@ std::shared_ptr get_InputDriver(std::istream &input_pin_stream, std LoggerFactory::CreateInputLogger(); IBlockingQueue *event_queue = new BlockingQueue; - std::shared_ptr event_notifier(new impl::EventNotifier(event_queue)); + std::shared_ptr event_notifier(new detail::EventNotifier(event_queue)); std::vector> events; std::map> name_event_map; create_events(matrix_config_stream, events, name_event_map, event_notifier); - std::unique_ptr input_gpio_interface(new impl::InputPinController(create_pin_map(input_pin_stream))); - std::unique_ptr detector(new impl::Detector(std::move(input_gpio_interface), events)); + std::unique_ptr input_gpio_interface(new detail::InputPinController(create_pin_map(input_pin_stream))); + std::unique_ptr detector(new detail::Detector(std::move(input_gpio_interface), events)); - return std::make_shared(event_notifier, std::move(detector), name_event_map); + return std::make_shared(event_notifier, std::move(detector), name_event_map); } namespace diff --git a/FlippR-Driver/src/input/InputDriverFactory.h b/FlippR-Driver/src/input/InputDriverFactory.h index 7c3be8c..a2f2e33 100644 --- a/FlippR-Driver/src/input/InputDriverFactory.h +++ b/FlippR-Driver/src/input/InputDriverFactory.h @@ -13,7 +13,7 @@ #include "input/InputDriver.h" #include "DistributingEvent.h" -#include "input/impl/InputPinController.h" +#include "input/detail/InputPinController.h" #include "input/EventNotifier.h" namespace flippR_driver diff --git a/FlippR-Driver/src/input/impl/Detector.cpp b/FlippR-Driver/src/input/detail/Detector.cpp similarity index 98% rename from FlippR-Driver/src/input/impl/Detector.cpp rename to FlippR-Driver/src/input/detail/Detector.cpp index f86554d..3ade2e8 100644 --- a/FlippR-Driver/src/input/impl/Detector.cpp +++ b/FlippR-Driver/src/input/detail/Detector.cpp @@ -15,7 +15,7 @@ namespace flippR_driver { namespace input { -namespace impl +namespace detail { Detector::Detector(std::unique_ptr input_gpio_interface, std::vector> events) diff --git a/FlippR-Driver/src/input/impl/Detector.h b/FlippR-Driver/src/input/detail/Detector.h similarity index 98% rename from FlippR-Driver/src/input/impl/Detector.h rename to FlippR-Driver/src/input/detail/Detector.h index 272e51f..2e5a4df 100644 --- a/FlippR-Driver/src/input/impl/Detector.h +++ b/FlippR-Driver/src/input/detail/Detector.h @@ -29,7 +29,7 @@ namespace flippR_driver { namespace input { -namespace impl +namespace detail { class Detector : public input::Detector diff --git a/FlippR-Driver/src/input/impl/EventHandler.cpp b/FlippR-Driver/src/input/detail/EventHandler.cpp similarity index 97% rename from FlippR-Driver/src/input/impl/EventHandler.cpp rename to FlippR-Driver/src/input/detail/EventHandler.cpp index 8dc5f03..f5739a4 100644 --- a/FlippR-Driver/src/input/impl/EventHandler.cpp +++ b/FlippR-Driver/src/input/detail/EventHandler.cpp @@ -11,7 +11,7 @@ namespace flippR_driver { namespace input { -namespace impl +namespace detail { EventHandler::EventHandler(std::shared_ptr input_driver) : diff --git a/FlippR-Driver/src/input/impl/EventHandler.h b/FlippR-Driver/src/input/detail/EventHandler.h similarity index 97% rename from FlippR-Driver/src/input/impl/EventHandler.h rename to FlippR-Driver/src/input/detail/EventHandler.h index 44fa696..a31db28 100644 --- a/FlippR-Driver/src/input/impl/EventHandler.h +++ b/FlippR-Driver/src/input/detail/EventHandler.h @@ -21,7 +21,7 @@ namespace flippR_driver { namespace input { -namespace impl +namespace detail { class EventHandler; diff --git a/FlippR-Driver/src/input/impl/EventNotifier.cpp b/FlippR-Driver/src/input/detail/EventNotifier.cpp similarity index 99% rename from FlippR-Driver/src/input/impl/EventNotifier.cpp rename to FlippR-Driver/src/input/detail/EventNotifier.cpp index b240ac3..d369343 100644 --- a/FlippR-Driver/src/input/impl/EventNotifier.cpp +++ b/FlippR-Driver/src/input/detail/EventNotifier.cpp @@ -15,7 +15,7 @@ namespace flippR_driver { namespace input { -namespace impl +namespace detail { EventNotifier::EventNotifier(utility::IBlockingQueue *queue) : diff --git a/FlippR-Driver/src/input/impl/EventNotifier.h b/FlippR-Driver/src/input/detail/EventNotifier.h similarity index 98% rename from FlippR-Driver/src/input/impl/EventNotifier.h rename to FlippR-Driver/src/input/detail/EventNotifier.h index b8eba27..8915871 100644 --- a/FlippR-Driver/src/input/impl/EventNotifier.h +++ b/FlippR-Driver/src/input/detail/EventNotifier.h @@ -25,7 +25,7 @@ namespace flippR_driver { namespace input { -namespace impl +namespace detail { class EventNotifier : public input::EventNotifier diff --git a/FlippR-Driver/src/input/impl/InputDriver.cpp b/FlippR-Driver/src/input/detail/InputDriver.cpp similarity index 98% rename from FlippR-Driver/src/input/impl/InputDriver.cpp rename to FlippR-Driver/src/input/detail/InputDriver.cpp index 835bb67..fb62c8e 100644 --- a/FlippR-Driver/src/input/impl/InputDriver.cpp +++ b/FlippR-Driver/src/input/detail/InputDriver.cpp @@ -12,7 +12,7 @@ namespace flippR_driver { namespace input { -namespace impl +namespace detail { InputDriver::InputDriver(std::shared_ptr event_notifier, std::unique_ptr detector, diff --git a/FlippR-Driver/src/input/impl/InputDriver.h b/FlippR-Driver/src/input/detail/InputDriver.h similarity index 97% rename from FlippR-Driver/src/input/impl/InputDriver.h rename to FlippR-Driver/src/input/detail/InputDriver.h index d081831..c83d63e 100644 --- a/FlippR-Driver/src/input/impl/InputDriver.h +++ b/FlippR-Driver/src/input/detail/InputDriver.h @@ -18,7 +18,7 @@ namespace flippR_driver { namespace input { -namespace impl +namespace detail { class InputDriver : public input::InputDriver diff --git a/FlippR-Driver/src/input/impl/InputPinController.cpp b/FlippR-Driver/src/input/detail/InputPinController.cpp similarity index 99% rename from FlippR-Driver/src/input/impl/InputPinController.cpp rename to FlippR-Driver/src/input/detail/InputPinController.cpp index 53ec5ab..4b6ae5e 100644 --- a/FlippR-Driver/src/input/impl/InputPinController.cpp +++ b/FlippR-Driver/src/input/detail/InputPinController.cpp @@ -17,7 +17,7 @@ namespace flippR_driver { namespace input { -namespace impl +namespace detail { using namespace nlohmann; diff --git a/FlippR-Driver/src/input/impl/InputPinController.h b/FlippR-Driver/src/input/detail/InputPinController.h similarity index 97% rename from FlippR-Driver/src/input/impl/InputPinController.h rename to FlippR-Driver/src/input/detail/InputPinController.h index 29cb06a..a31613c 100644 --- a/FlippR-Driver/src/input/impl/InputPinController.h +++ b/FlippR-Driver/src/input/detail/InputPinController.h @@ -19,7 +19,7 @@ namespace flippR_driver { namespace input { -namespace impl +namespace detail { class InputPinController : public input::InputPinController, public PinController diff --git a/FlippR-Driver/src/output/OutputDriverFactory.cpp b/FlippR-Driver/src/output/OutputDriverFactory.cpp index 87a2e92..66f9331 100644 --- a/FlippR-Driver/src/output/OutputDriverFactory.cpp +++ b/FlippR-Driver/src/output/OutputDriverFactory.cpp @@ -8,15 +8,15 @@ #include "utility/LoggerFactory.h" -#include "output/impl/OutputDriver.h" -#include "output/impl/DisplayController.h" +#include "output/detail/OutputDriver.h" +#include "output/detail/DisplayController.h" -#include "output/impl/DisplayBoardPinController.h" -#include "output/impl/DriverBoardPinController.h" -#include "output/impl/SoundBoardPinController.h" +#include "output/detail/DisplayBoardPinController.h" +#include "output/detail/DriverBoardPinController.h" +#include "output/detail/SoundBoardPinController.h" -#include "output/items/impl/EightDigitDisplay.h" -#include "output/items/impl/SevenDigitDisplay.h" +#include "output/items/detail/EightDigitDisplay.h" +#include "output/items/detail/SevenDigitDisplay.h" namespace flippR_driver @@ -41,24 +41,24 @@ std::shared_ptr get_OutputDriver(std::istream &output_pin_config, output_pin_config >> output_config; json driver_board_config = output_config.at("driver_board"); - std::shared_ptr driver_board_pin_controller(new impl::DriverBoardPinController(parse_pins_driver_board(driver_board_config), output_pin_mutex)); + std::shared_ptr driver_board_pin_controller(new detail::DriverBoardPinController(parse_pins_driver_board(driver_board_config), output_pin_mutex)); auto solenoids = create_solenoids(solenoid_config, driver_board_pin_controller); auto lamps = create_lamps(lamp_config, driver_board_pin_controller); json sound_board_config = output_config.at("sound_board"); - std::shared_ptr sound_board_pin_controller(new impl::SoundBoardPinController(parse_pins_sound_board(sound_board_config), output_pin_mutex)); + std::shared_ptr sound_board_pin_controller(new detail::SoundBoardPinController(parse_pins_sound_board(sound_board_config), output_pin_mutex)); auto sounds = create_sounds(sound_config, sound_board_pin_controller); json display_board_config = output_config.at("display_board"); - std::unique_ptr display_board_pin_controller(new impl::DisplayBoardPinController(parse_pins_display_board(display_board_config))); + std::unique_ptr display_board_pin_controller(new detail::DisplayBoardPinController(parse_pins_display_board(display_board_config))); auto displays = create_displays(display_config); // todo std::vector> displays_vec; boost::copy(displays | boost::adaptors::map_values, std::back_inserter(displays_vec)); - std::unique_ptr display_controller(new impl::DisplayController(displays_vec, std::move(display_board_pin_controller))); + std::unique_ptr display_controller(new detail::DisplayController(displays_vec, std::move(display_board_pin_controller))); - return std::make_shared(std::move(display_controller), solenoids, lamps, sounds, displays); + return std::make_shared(std::move(display_controller), solenoids, lamps, sounds, displays); } std::map parse_pins_driver_board(json &driver_board_config) @@ -204,7 +204,7 @@ std::chrono::milliseconds get_deactivation_time(nlohmann::json &json) } } -std::shared_ptr create_solenoid(nlohmann::json &solenoid_json, std::shared_ptr &pin_controller, std::chrono::milliseconds &deactivation_time) +std::shared_ptr create_solenoid(nlohmann::json &solenoid_json, std::shared_ptr &pin_controller, std::chrono::milliseconds &deactivation_time) { try { @@ -216,7 +216,7 @@ std::shared_ptr create_solenoid(nlohmann::json &solenoid_ deactivation_time = get_deactivation_time(solenoid_json); } - return std::make_shared(pin_controller, address, name, deactivation_time); + return std::make_shared(pin_controller, address, name, deactivation_time); } catch(json::exception &e) { @@ -225,13 +225,13 @@ std::shared_ptr create_solenoid(nlohmann::json &solenoid_ } } -std::shared_ptr create_lamp(nlohmann::json &lamp_json, std::shared_ptr &pin_controller) +std::shared_ptr create_lamp(nlohmann::json &lamp_json, std::shared_ptr &pin_controller) { try { std::string name = lamp_json.at("name"); auto address = lamp_json.at("address").get(); - return std::make_shared(pin_controller, address, name); + return std::make_shared(pin_controller, address, name); } catch(json::exception &e) { @@ -240,14 +240,14 @@ std::shared_ptr create_lamp(nlohmann::json &lamp_json, std::s } } -std::shared_ptr create_sound(nlohmann::json &sound_json, std::shared_ptr &pin_controller, std::chrono::milliseconds &deactivation_time) +std::shared_ptr create_sound(nlohmann::json &sound_json, std::shared_ptr &pin_controller, std::chrono::milliseconds &deactivation_time) { try { auto id = sound_json.at("id").get(); std::string description = sound_json.at("description"); auto address = sound_json.at("address").get(); - return std::make_shared(pin_controller, address, description, deactivation_time, id); + return std::make_shared(pin_controller, address, description, deactivation_time, id); } catch(json::exception &e) { @@ -282,11 +282,11 @@ std::shared_ptr create_display(nlohmann::json &display_jso auto digits = display_json.at("digits").get(); if(digits == 8) { - return std::make_shared(address, id); + return std::make_shared(address, id); } else if(digits == 7) { - return std::make_shared(address, id); + return std::make_shared(address, id); } else { diff --git a/FlippR-Driver/src/output/OutputDriverFactory.h b/FlippR-Driver/src/output/OutputDriverFactory.h index 009bd9c..d2d2ec1 100644 --- a/FlippR-Driver/src/output/OutputDriverFactory.h +++ b/FlippR-Driver/src/output/OutputDriverFactory.h @@ -6,9 +6,9 @@ #define flippR_driver_OUTPUTDRIVERFACTORY_H #include "output/OutputDriver.h" -#include "output/items/impl/Solenoid.h" -#include "output/items/impl/Lamp.h" -#include "output/items/impl/Sound.h" +#include "output/items/detail/Solenoid.h" +#include "output/items/detail/Lamp.h" +#include "output/items/detail/Sound.h" #include "output/DisplayBoardPinController.h" #include "json/json.hpp" @@ -26,13 +26,13 @@ namespace OutputDriverFactory namespace { std::map> create_solenoids(std::istream &solenoid_config, std::shared_ptr &pin_controller); - std::shared_ptr create_solenoid(nlohmann::json &solenoid_json, std::shared_ptr &pin_controller, std::chrono::milliseconds &deactivation_time); + std::shared_ptr create_solenoid(nlohmann::json &solenoid_json, std::shared_ptr &pin_controller, std::chrono::milliseconds &deactivation_time); std::map> create_lamps(std::istream &lamp_config, std::shared_ptr &pin_controller); - std::shared_ptr create_lamp(nlohmann::json &lamp_json, std::shared_ptr &pin_controller); + std::shared_ptr create_lamp(nlohmann::json &lamp_json, std::shared_ptr &pin_controller); std::map> create_sounds(std::istream &sound_config, std::shared_ptr &pin_controller); - std::shared_ptr create_sound(nlohmann::json &sound_json, std::shared_ptr &pin_controller, std::chrono::milliseconds &deactivation_time); + std::shared_ptr create_sound(nlohmann::json &sound_json, std::shared_ptr &pin_controller, std::chrono::milliseconds &deactivation_time); std::chrono::milliseconds get_deactivation_time(nlohmann::json &json); diff --git a/FlippR-Driver/src/output/SoundBoardPinController.h b/FlippR-Driver/src/output/SoundBoardPinController.h index f44ce79..3833a2c 100644 --- a/FlippR-Driver/src/output/SoundBoardPinController.h +++ b/FlippR-Driver/src/output/SoundBoardPinController.h @@ -5,7 +5,7 @@ #ifndef FLIPPR_DRIVER_OUTPUT_SOUNDBOARDPINCONTROLLER_H #define FLIPPR_DRIVER_OUTPUT_SOUNDBOARDPINCONTROLLER_H -#include "output/items/impl/Sound.h" +#include "output/items/detail/Sound.h" namespace flippR_driver { @@ -19,8 +19,8 @@ namespace items class SoundBoardPinController { public: - virtual void activate(const items::impl::Sound &sound) = 0; - virtual void deactivate(const items::impl::Sound &sound) = 0; + virtual void activate(const items::detail::Sound &sound) = 0; + virtual void deactivate(const items::detail::Sound &sound) = 0; }; } diff --git a/FlippR-Driver/src/output/impl/DisplayBoardPinController.cpp b/FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp similarity index 99% rename from FlippR-Driver/src/output/impl/DisplayBoardPinController.cpp rename to FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp index 40d5b68..bdf1eb6 100644 --- a/FlippR-Driver/src/output/impl/DisplayBoardPinController.cpp +++ b/FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp @@ -11,7 +11,7 @@ namespace flippR_driver { namespace output { -namespace impl +namespace detail { DisplayBoardPinController::DisplayBoardPinController(std::map pins_display) : diff --git a/FlippR-Driver/src/output/impl/DisplayBoardPinController.h b/FlippR-Driver/src/output/detail/DisplayBoardPinController.h similarity index 98% rename from FlippR-Driver/src/output/impl/DisplayBoardPinController.h rename to FlippR-Driver/src/output/detail/DisplayBoardPinController.h index 0891d9d..62e66a9 100644 --- a/FlippR-Driver/src/output/impl/DisplayBoardPinController.h +++ b/FlippR-Driver/src/output/detail/DisplayBoardPinController.h @@ -15,7 +15,7 @@ namespace flippR_driver { namespace output { -namespace impl +namespace detail { class DisplayBoardPinController : public output::DisplayBoardPinController, public PinController diff --git a/FlippR-Driver/src/output/impl/DisplayController.cpp b/FlippR-Driver/src/output/detail/DisplayController.cpp similarity index 98% rename from FlippR-Driver/src/output/impl/DisplayController.cpp rename to FlippR-Driver/src/output/detail/DisplayController.cpp index a67cf47..bd61cf8 100644 --- a/FlippR-Driver/src/output/impl/DisplayController.cpp +++ b/FlippR-Driver/src/output/detail/DisplayController.cpp @@ -13,7 +13,7 @@ namespace flippR_driver { namespace output { -namespace impl +namespace detail { DisplayController::DisplayController(std::vector> displays, std::unique_ptr pin_controller) diff --git a/FlippR-Driver/src/output/impl/DisplayController.h b/FlippR-Driver/src/output/detail/DisplayController.h similarity index 98% rename from FlippR-Driver/src/output/impl/DisplayController.h rename to FlippR-Driver/src/output/detail/DisplayController.h index c8e3f61..ba29269 100644 --- a/FlippR-Driver/src/output/impl/DisplayController.h +++ b/FlippR-Driver/src/output/detail/DisplayController.h @@ -20,7 +20,7 @@ namespace flippR_driver { namespace output { -namespace impl +namespace detail { class DisplayController : public output::DisplayController diff --git a/FlippR-Driver/src/output/impl/DriverBoardPinController.cpp b/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp similarity index 99% rename from FlippR-Driver/src/output/impl/DriverBoardPinController.cpp rename to FlippR-Driver/src/output/detail/DriverBoardPinController.cpp index 50432a0..4e5a5de 100644 --- a/FlippR-Driver/src/output/impl/DriverBoardPinController.cpp +++ b/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp @@ -8,7 +8,7 @@ namespace flippR_driver { namespace output { -namespace impl +namespace detail { DriverBoardPinController::DriverBoardPinController(std::map pins_driver_board, std::shared_ptr output_item_mutex) : diff --git a/FlippR-Driver/src/output/impl/DriverBoardPinController.h b/FlippR-Driver/src/output/detail/DriverBoardPinController.h similarity index 98% rename from FlippR-Driver/src/output/impl/DriverBoardPinController.h rename to FlippR-Driver/src/output/detail/DriverBoardPinController.h index 2f14963..4353922 100644 --- a/FlippR-Driver/src/output/impl/DriverBoardPinController.h +++ b/FlippR-Driver/src/output/detail/DriverBoardPinController.h @@ -18,7 +18,7 @@ namespace flippR_driver { namespace output { -namespace impl +namespace detail { class DriverBoardPinController : public OutputPinController, public output::DriverBoardPinController diff --git a/FlippR-Driver/src/output/impl/OutputDriver.cpp b/FlippR-Driver/src/output/detail/OutputDriver.cpp similarity index 99% rename from FlippR-Driver/src/output/impl/OutputDriver.cpp rename to FlippR-Driver/src/output/detail/OutputDriver.cpp index 25d54af..9ea20fa 100644 --- a/FlippR-Driver/src/output/impl/OutputDriver.cpp +++ b/FlippR-Driver/src/output/detail/OutputDriver.cpp @@ -14,7 +14,7 @@ namespace flippR_driver { namespace output { -namespace impl +namespace detail { using namespace items; diff --git a/FlippR-Driver/src/output/impl/OutputDriver.h b/FlippR-Driver/src/output/detail/OutputDriver.h similarity index 99% rename from FlippR-Driver/src/output/impl/OutputDriver.h rename to FlippR-Driver/src/output/detail/OutputDriver.h index 239de0e..4b985cc 100644 --- a/FlippR-Driver/src/output/impl/OutputDriver.h +++ b/FlippR-Driver/src/output/detail/OutputDriver.h @@ -17,7 +17,7 @@ namespace flippR_driver { namespace output { -namespace impl +namespace detail { class OutputDriver : public output::OutputDriver diff --git a/FlippR-Driver/src/output/impl/SoundBoardPinController.cpp b/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp similarity index 89% rename from FlippR-Driver/src/output/impl/SoundBoardPinController.cpp rename to FlippR-Driver/src/output/detail/SoundBoardPinController.cpp index 1d5377f..d5b53ee 100644 --- a/FlippR-Driver/src/output/impl/SoundBoardPinController.cpp +++ b/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp @@ -8,7 +8,7 @@ namespace flippR_driver { namespace output { -namespace impl +namespace detail { SoundBoardPinController::SoundBoardPinController(std::map pins_sound, std::shared_ptr output_item_mutex) : @@ -17,7 +17,7 @@ SoundBoardPinController::SoundBoardPinController(std::map } -void SoundBoardPinController::activate(const items::impl::Sound &sound) +void SoundBoardPinController::activate(const items::detail::Sound &sound) { std::lock_guard guard(*output_item_mutex); @@ -26,7 +26,7 @@ void SoundBoardPinController::activate(const items::impl::Sound &sound) fire_sound(true); } -void SoundBoardPinController::deactivate(const items::impl::Sound &sound) +void SoundBoardPinController::deactivate(const items::detail::Sound &sound) { std::lock_guard guard(*output_item_mutex); diff --git a/FlippR-Driver/src/output/impl/SoundBoardPinController.h b/FlippR-Driver/src/output/detail/SoundBoardPinController.h similarity index 83% rename from FlippR-Driver/src/output/impl/SoundBoardPinController.h rename to FlippR-Driver/src/output/detail/SoundBoardPinController.h index 84ee4b5..3c8a92a 100644 --- a/FlippR-Driver/src/output/impl/SoundBoardPinController.h +++ b/FlippR-Driver/src/output/detail/SoundBoardPinController.h @@ -9,14 +9,14 @@ #include "output/OutputPinController.h" -#include +#include #include namespace flippR_driver { namespace output { -namespace impl +namespace detail { class SoundBoardPinController : public OutputPinController, public output::SoundBoardPinController @@ -25,8 +25,8 @@ public: SoundBoardPinController(std::map pins_sound, std::shared_ptr output_item_mutex); ~SoundBoardPinController() override = default; - void activate(const items::impl::Sound &sound) override; - void deactivate(const items::impl::Sound &sound) override; + void activate(const items::detail::Sound &sound) override; + void deactivate(const items::detail::Sound &sound) override; private: void write_sound_address(uint8_t address) const; diff --git a/FlippR-Driver/src/output/items/DriverBoardItem.h b/FlippR-Driver/src/output/items/DriverBoardItem.h index 8b8fdb6..b153882 100644 --- a/FlippR-Driver/src/output/items/DriverBoardItem.h +++ b/FlippR-Driver/src/output/items/DriverBoardItem.h @@ -5,7 +5,7 @@ #ifndef FLIPPR_DRIVER_IDRIVERBOARDITEM_H #define FLIPPR_DRIVER_IDRIVERBOARDITEM_H -#include "output/items/impl/Item.h" +#include "output/items/detail/Item.h" #include @@ -18,11 +18,11 @@ namespace output namespace items { -class DriverBoardItem : public impl::Item +class DriverBoardItem : public detail::Item { public: DriverBoardItem(std::shared_ptr pin_controller, uint8_t address, std::string name) : - pin_controller(std::move(pin_controller)), impl::Item(address, std::move(name)) {} + pin_controller(std::move(pin_controller)), detail::Item(address, std::move(name)) {} ~DriverBoardItem() override = default; diff --git a/FlippR-Driver/src/output/items/impl/Display.h b/FlippR-Driver/src/output/items/detail/Display.h similarity index 87% rename from FlippR-Driver/src/output/items/impl/Display.h rename to FlippR-Driver/src/output/items/detail/Display.h index c2d3ec1..882be12 100644 --- a/FlippR-Driver/src/output/items/impl/Display.h +++ b/FlippR-Driver/src/output/items/detail/Display.h @@ -18,7 +18,7 @@ namespace output { namespace items { -namespace impl +namespace detail { template @@ -28,8 +28,8 @@ public: Display(uint8_t address, uint8_t id); virtual ~Display() = default; - virtual void write_score(uint score); - virtual void write_content(std::array content); + void write_score(uint score) override; + void write_content(std::array content); std::vector get_content() const override; uint8_t get_address() const override; diff --git a/FlippR-Driver/src/output/items/impl/Display.hpp b/FlippR-Driver/src/output/items/detail/Display.hpp similarity index 98% rename from FlippR-Driver/src/output/items/impl/Display.hpp rename to FlippR-Driver/src/output/items/detail/Display.hpp index 644f47d..65322bc 100644 --- a/FlippR-Driver/src/output/items/impl/Display.hpp +++ b/FlippR-Driver/src/output/items/detail/Display.hpp @@ -13,7 +13,7 @@ namespace output { namespace items { -namespace impl +namespace detail { template diff --git a/FlippR-Driver/src/output/items/impl/EightDigitDisplay.h b/FlippR-Driver/src/output/items/detail/EightDigitDisplay.h similarity index 92% rename from FlippR-Driver/src/output/items/impl/EightDigitDisplay.h rename to FlippR-Driver/src/output/items/detail/EightDigitDisplay.h index 8d398c7..938203f 100644 --- a/FlippR-Driver/src/output/items/impl/EightDigitDisplay.h +++ b/FlippR-Driver/src/output/items/detail/EightDigitDisplay.h @@ -5,7 +5,7 @@ #ifndef FLIPPR_DRIVER_OUTPUT_ITEMS_IMPL_EIGHTDIGITDISPLAY_H #define FLIPPR_DRIVER_OUTPUT_ITEMS_IMPL_EIGHTDIGITDISPLAY_H -#include "output/items/impl/Display.h" +#include "output/items/detail/Display.h" #include "output/items/EightDigitDisplay.h" @@ -15,7 +15,7 @@ namespace output { namespace items { -namespace impl +namespace detail { class EightDigitDisplay : public Display<8>, public items::EightDigitDisplay diff --git a/FlippR-Driver/src/output/items/impl/Item.cpp b/FlippR-Driver/src/output/items/detail/Item.cpp similarity index 95% rename from FlippR-Driver/src/output/items/impl/Item.cpp rename to FlippR-Driver/src/output/items/detail/Item.cpp index 4e6f7bd..b3947fb 100644 --- a/FlippR-Driver/src/output/items/impl/Item.cpp +++ b/FlippR-Driver/src/output/items/detail/Item.cpp @@ -10,7 +10,7 @@ namespace output { namespace items { -namespace impl +namespace detail { Item::Item(uint8_t address, std::string name) : diff --git a/FlippR-Driver/src/output/items/impl/Item.h b/FlippR-Driver/src/output/items/detail/Item.h similarity index 97% rename from FlippR-Driver/src/output/items/impl/Item.h rename to FlippR-Driver/src/output/items/detail/Item.h index b727eb4..6b83118 100644 --- a/FlippR-Driver/src/output/items/impl/Item.h +++ b/FlippR-Driver/src/output/items/detail/Item.h @@ -19,7 +19,7 @@ namespace output { namespace items { -namespace impl +namespace detail { class Item : public items::Item diff --git a/FlippR-Driver/src/output/items/impl/Lamp.cpp b/FlippR-Driver/src/output/items/detail/Lamp.cpp similarity index 97% rename from FlippR-Driver/src/output/items/impl/Lamp.cpp rename to FlippR-Driver/src/output/items/detail/Lamp.cpp index 09582c0..ef9c8ba 100644 --- a/FlippR-Driver/src/output/items/impl/Lamp.cpp +++ b/FlippR-Driver/src/output/items/detail/Lamp.cpp @@ -13,7 +13,7 @@ namespace output { namespace items { -namespace impl +namespace detail { Lamp::Lamp(std::shared_ptr pin_controller, uint8_t address, std::string name) : diff --git a/FlippR-Driver/src/output/items/impl/Lamp.h b/FlippR-Driver/src/output/items/detail/Lamp.h similarity index 97% rename from FlippR-Driver/src/output/items/impl/Lamp.h rename to FlippR-Driver/src/output/items/detail/Lamp.h index 097f803..8a7ec69 100644 --- a/FlippR-Driver/src/output/items/impl/Lamp.h +++ b/FlippR-Driver/src/output/items/detail/Lamp.h @@ -17,7 +17,7 @@ namespace output { namespace items { -namespace impl +namespace detail { class Lamp : public DriverBoardItem, public items::Lamp diff --git a/FlippR-Driver/src/output/items/impl/SevenDigitDisplay.h b/FlippR-Driver/src/output/items/detail/SevenDigitDisplay.h similarity index 92% rename from FlippR-Driver/src/output/items/impl/SevenDigitDisplay.h rename to FlippR-Driver/src/output/items/detail/SevenDigitDisplay.h index eb3b1e0..dc714d7 100644 --- a/FlippR-Driver/src/output/items/impl/SevenDigitDisplay.h +++ b/FlippR-Driver/src/output/items/detail/SevenDigitDisplay.h @@ -7,7 +7,7 @@ #include "output/items/SevenDigitDisplay.h" -#include "output/items/impl/Display.h" +#include "output/items/detail/Display.h" namespace flippR_driver { @@ -15,7 +15,7 @@ namespace output { namespace items { -namespace impl +namespace detail { class SevenDigitDisplay : public Display<7>, public items::SevenDigitDisplay diff --git a/FlippR-Driver/src/output/items/impl/Solenoid.cpp b/FlippR-Driver/src/output/items/detail/Solenoid.cpp similarity index 97% rename from FlippR-Driver/src/output/items/impl/Solenoid.cpp rename to FlippR-Driver/src/output/items/detail/Solenoid.cpp index 87332da..2fdf691 100644 --- a/FlippR-Driver/src/output/items/impl/Solenoid.cpp +++ b/FlippR-Driver/src/output/items/detail/Solenoid.cpp @@ -13,7 +13,7 @@ namespace output { namespace items { -namespace impl +namespace detail { Solenoid::Solenoid(std::shared_ptr pin_controller, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time) diff --git a/FlippR-Driver/src/output/items/impl/Solenoid.h b/FlippR-Driver/src/output/items/detail/Solenoid.h similarity index 98% rename from FlippR-Driver/src/output/items/impl/Solenoid.h rename to FlippR-Driver/src/output/items/detail/Solenoid.h index a3e7185..93b1fb8 100644 --- a/FlippR-Driver/src/output/items/impl/Solenoid.h +++ b/FlippR-Driver/src/output/items/detail/Solenoid.h @@ -20,7 +20,7 @@ namespace output { namespace items { -namespace impl +namespace detail { class Solenoid : public DriverBoardItem, public items::Solenoid diff --git a/FlippR-Driver/src/output/items/impl/Sound.cpp b/FlippR-Driver/src/output/items/detail/Sound.cpp similarity index 97% rename from FlippR-Driver/src/output/items/impl/Sound.cpp rename to FlippR-Driver/src/output/items/detail/Sound.cpp index f4b7f68..87d2e71 100644 --- a/FlippR-Driver/src/output/items/impl/Sound.cpp +++ b/FlippR-Driver/src/output/items/detail/Sound.cpp @@ -15,7 +15,7 @@ namespace output { namespace items { -namespace impl +namespace detail { Sound::Sound(std::shared_ptr pin_controller, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time, u_int id) diff --git a/FlippR-Driver/src/output/items/impl/Sound.h b/FlippR-Driver/src/output/items/detail/Sound.h similarity index 98% rename from FlippR-Driver/src/output/items/impl/Sound.h rename to FlippR-Driver/src/output/items/detail/Sound.h index 6d15f73..e523b7e 100644 --- a/FlippR-Driver/src/output/items/impl/Sound.h +++ b/FlippR-Driver/src/output/items/detail/Sound.h @@ -25,7 +25,7 @@ class SoundBoardPinController; namespace items { -namespace impl +namespace detail { class Sound : public Item, public items::Sound diff --git a/FlippR-Driver/tests/catch.hpp b/FlippR-Driver/tests/catch.hpp index 1de749e..5a791f8 100644 --- a/FlippR-Driver/tests/catch.hpp +++ b/FlippR-Driver/tests/catch.hpp @@ -1985,7 +1985,7 @@ namespace Catch { namespace Catch { namespace Matchers { - namespace Impl { + namespace detail { template struct MatchAllOf; template struct MatchAnyOf; @@ -2115,12 +2115,12 @@ namespace Matchers { return MatchNotOf( *this ); } - } // namespace Impl + } // namespace detail } // namespace Matchers using namespace Matchers; -using Matchers::Impl::MatcherBase; +using Matchers::detail::MatcherBase; } // namespace Catch @@ -2317,7 +2317,7 @@ namespace Catch { } }; - using StringMatcher = Matchers::Impl::MatcherBase; + using StringMatcher = Matchers::detail::MatcherBase; void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef matcherString ); @@ -2550,7 +2550,7 @@ namespace Catch { #if !defined(CATCH_CONFIG_DISABLE_MATCHERS) namespace Matchers { - namespace Impl { + namespace detail { namespace NSStringMatchers { struct StringHolder : MatcherBase{ @@ -2619,19 +2619,19 @@ namespace Catch { }; } // namespace NSStringMatchers - } // namespace Impl + } // namespace detail - inline Impl::NSStringMatchers::Equals - Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); } + inline detail::NSStringMatchers::Equals + Equals( NSString* substr ){ return detail::NSStringMatchers::Equals( substr ); } - inline Impl::NSStringMatchers::Contains - Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); } + inline detail::NSStringMatchers::Contains + Contains( NSString* substr ){ return detail::NSStringMatchers::Contains( substr ); } - inline Impl::NSStringMatchers::StartsWith - StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); } + inline detail::NSStringMatchers::StartsWith + StartsWith( NSString* substr ){ return detail::NSStringMatchers::StartsWith( substr ); } - inline Impl::NSStringMatchers::EndsWith - EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); } + inline detail::NSStringMatchers::EndsWith + EndsWith( NSString* substr ){ return detail::NSStringMatchers::EndsWith( substr ); } } // namespace Matchers @@ -3373,7 +3373,7 @@ namespace Catch { virtual void skipTest( TestCaseInfo const& testInfo ) = 0; - // Default empty impl provided + // Default empty detail provided virtual void fatalErrorEncountered( StringRef name ); virtual bool isMulti() const; @@ -4316,7 +4316,7 @@ namespace Catch { namespace Catch { - using StringMatcher = Matchers::Impl::MatcherBase; + using StringMatcher = Matchers::detail::MatcherBase; // This is the general overload that takes a any string matcher // There is another overload, in catch_assertinhandler.h/.cpp, that only takes a string and infers @@ -5244,7 +5244,7 @@ namespace detail { class Arg : public ParserRefImpl { public: - using ParserRefImpl::ParserRefImpl; + using ParserRefdetail::ParserRefImpl; auto parse( std::string const &, TokenStream const &tokens ) const -> InternalParseResult override { auto validationResult = validate(); @@ -5368,7 +5368,7 @@ namespace detail { return Result::logicError( "Option name must begin with '-'" ); #endif } - return ParserRefImpl::validate(); + return ParserRefdetail::validate(); } }; @@ -6002,7 +6002,7 @@ namespace { colourMode = UseColour::Yes; return colourMode == UseColour::Yes ? &s_instance - : NoColourImpl::instance(); + : NoColourdetail::instance(); } } // end anon namespace @@ -6069,8 +6069,8 @@ namespace { ? UseColour::Yes : UseColour::No; return colourMode == UseColour::Yes - ? PosixColourImpl::instance() - : NoColourImpl::instance(); + ? PosixColourdetail::instance() + : NoColourdetail::instance(); } } // end anon namespace @@ -6080,7 +6080,7 @@ namespace { namespace Catch { - static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); } + static IColourImpl* platformColourInstance() { return NoColourdetail::instance(); } } // end namespace Catch @@ -7053,7 +7053,7 @@ namespace Catch { namespace Catch { namespace Matchers { - namespace Impl { + namespace detail { std::string MatcherUntypedBase::toString() const { if( m_cachedToString.empty() ) @@ -7063,11 +7063,11 @@ namespace Matchers { MatcherUntypedBase::~MatcherUntypedBase() = default; - } // namespace Impl + } // namespace detail } // namespace Matchers using namespace Matchers; -using Matchers::Impl::MatcherBase; +using Matchers::detail::MatcherBase; } // namespace Catch // end catch_matchers.cpp @@ -8394,7 +8394,7 @@ namespace Catch { } ~StreamBufImpl() noexcept { - StreamBufImpl::sync(); + StreamBufdetail::sync(); } private: diff --git a/FlippR-Driver/tests/output/TestDisplay.cpp b/FlippR-Driver/tests/output/TestDisplay.cpp index 50ddc12..4df2f4b 100644 --- a/FlippR-Driver/tests/output/TestDisplay.cpp +++ b/FlippR-Driver/tests/output/TestDisplay.cpp @@ -17,7 +17,7 @@ // testing purposes #define private public -#include "output/items/impl/Display.h" +#include "output/items/detail/Display.h" using namespace flippR_driver::output; using namespace fakeit; diff --git a/FlippR-Driver/tests/output/TestLamp.cpp b/FlippR-Driver/tests/output/TestLamp.cpp index 4b5710c..051bafc 100644 --- a/FlippR-Driver/tests/output/TestLamp.cpp +++ b/FlippR-Driver/tests/output/TestLamp.cpp @@ -14,7 +14,7 @@ // testing purposes #define private public -#include "output/items/impl/Lamp.h" +#include "output/items/detail/Lamp.h" using namespace flippR_driver::output; using namespace fakeit; diff --git a/FlippR-Driver/tests/output/TestSolenoid.cpp b/FlippR-Driver/tests/output/TestSolenoid.cpp index c427723..8dc6d12 100644 --- a/FlippR-Driver/tests/output/TestSolenoid.cpp +++ b/FlippR-Driver/tests/output/TestSolenoid.cpp @@ -16,7 +16,7 @@ // testing purposes #define private public -#include "output/items/impl/Solenoid.h" +#include "output/items/detail/Solenoid.h" using namespace flippR_driver::output; using namespace fakeit; diff --git a/FlippR-Driver/tests/output/TestSound.cpp b/FlippR-Driver/tests/output/TestSound.cpp index e127fbe..2c73163 100644 --- a/FlippR-Driver/tests/output/TestSound.cpp +++ b/FlippR-Driver/tests/output/TestSound.cpp @@ -14,7 +14,7 @@ // testing purposes #define private public -#include "output/items/impl/Sound.h" +#include "output/items/detail/Sound.h" using namespace flippR_driver::output; using namespace fakeit;