renamed impl to detail

FlippR-Driver/src/input/InputDriverFactory.cpp

@@ -12,9 +12,9 @@
 
 #include "utility/LoggerFactory.h"
 
-#include "input/impl/InputDriver.h"
+#include "input/detail/InputDriver.h"
-#include "input/impl/EventNotifier.h"
+#include "input/detail/EventNotifier.h"
-#include "input/impl/Detector.h"
+#include "input/detail/Detector.h"
 
 namespace flippR_driver
 {
@@ -31,17 +31,17 @@ std::shared_ptr<InputDriver> get_InputDriver(std::istream &input_pin_stream, std
   LoggerFactory::CreateInputLogger();
 
   IBlockingQueue<Event> *event_queue = new BlockingQueue<Event>;
-  std::shared_ptr<EventNotifier> event_notifier(new impl::EventNotifier(event_queue));
+  std::shared_ptr<EventNotifier> event_notifier(new detail::EventNotifier(event_queue));
 
   std::vector<std::shared_ptr<DistributingEvent>> events;
   std::map<std::string, std::shared_ptr<Event>> name_event_map;
 
   create_events(matrix_config_stream, events, name_event_map, event_notifier);
 
-  std::unique_ptr<InputPinController> input_gpio_interface(new impl::InputPinController(create_pin_map(input_pin_stream)));
+  std::unique_ptr<InputPinController> input_gpio_interface(new detail::InputPinController(create_pin_map(input_pin_stream)));
-  std::unique_ptr<Detector> detector(new impl::Detector(std::move(input_gpio_interface), events));
+  std::unique_ptr<Detector> detector(new detail::Detector(std::move(input_gpio_interface), events));
 
-  return std::make_shared<impl::InputDriver>(event_notifier, std::move(detector), name_event_map);
+  return std::make_shared<detail::InputDriver>(event_notifier, std::move(detector), name_event_map);
 }
 
 namespace

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

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<InputPinController> input_gpio_interface, std::vector<std::shared_ptr<DistributingEvent>> events)

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

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<InputDriver> input_driver) :

FlippR-Driver/src/input/detail/EventHandler.h

@@ -21,7 +21,7 @@ namespace flippR_driver
 {
 namespace input
 {
-namespace impl
+namespace detail
 {
 
 class EventHandler;

FlippR-Driver/src/input/detail/EventNotifier.cpp

@@ -15,7 +15,7 @@ namespace flippR_driver
 {
 namespace input
 {
-namespace impl
+namespace detail
 {
 
 EventNotifier::EventNotifier(utility::IBlockingQueue<Event> *queue) :

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

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<EventNotifier> event_notifier, std::unique_ptr<Detector> detector,

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

FlippR-Driver/src/input/detail/InputPinController.cpp

@@ -17,7 +17,7 @@ namespace flippR_driver
 {
 namespace input
 {
-namespace impl
+namespace detail
 {
 
 using namespace nlohmann;

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

FlippR-Driver/src/output/OutputDriverFactory.cpp

@@ -8,15 +8,15 @@
 
 #include "utility/LoggerFactory.h"
 
-#include "output/impl/OutputDriver.h"
+#include "output/detail/OutputDriver.h"
-#include "output/impl/DisplayController.h"
+#include "output/detail/DisplayController.h"
 
-#include "output/impl/DisplayBoardPinController.h"
+#include "output/detail/DisplayBoardPinController.h"
-#include "output/impl/DriverBoardPinController.h"
+#include "output/detail/DriverBoardPinController.h"
-#include "output/impl/SoundBoardPinController.h"
+#include "output/detail/SoundBoardPinController.h"
 
-#include "output/items/impl/EightDigitDisplay.h"
+#include "output/items/detail/EightDigitDisplay.h"
-#include "output/items/impl/SevenDigitDisplay.h"
+#include "output/items/detail/SevenDigitDisplay.h"
 
 
 namespace flippR_driver
@@ -41,24 +41,24 @@ std::shared_ptr<OutputDriver> get_OutputDriver(std::istream &output_pin_config,
   output_pin_config >> output_config;
 
   json driver_board_config = output_config.at("driver_board");
-  std::shared_ptr<DriverBoardPinController> driver_board_pin_controller(new impl::DriverBoardPinController(parse_pins_driver_board(driver_board_config), output_pin_mutex));
+  std::shared_ptr<DriverBoardPinController> 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<SoundBoardPinController> sound_board_pin_controller(new impl::SoundBoardPinController(parse_pins_sound_board(sound_board_config), output_pin_mutex));
+  std::shared_ptr<SoundBoardPinController> 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<DisplayBoardPinController> display_board_pin_controller(new impl::DisplayBoardPinController(parse_pins_display_board(display_board_config)));
+  std::unique_ptr<DisplayBoardPinController> display_board_pin_controller(new detail::DisplayBoardPinController(parse_pins_display_board(display_board_config)));
   auto displays = create_displays(display_config);
 
   // todo
   std::vector<std::shared_ptr<items::OutputDisplay>> displays_vec;
   boost::copy(displays | boost::adaptors::map_values, std::back_inserter(displays_vec));
-  std::unique_ptr<DisplayController> display_controller(new impl::DisplayController(displays_vec, std::move(display_board_pin_controller)));
+  std::unique_ptr<DisplayController> display_controller(new detail::DisplayController(displays_vec, std::move(display_board_pin_controller)));
 
-  return std::make_shared<impl::OutputDriver>(std::move(display_controller), solenoids, lamps, sounds, displays);
+  return std::make_shared<detail::OutputDriver>(std::move(display_controller), solenoids, lamps, sounds, displays);
 }
 
 std::map<std::string, uint8_t> parse_pins_driver_board(json &driver_board_config)
@@ -204,7 +204,7 @@ std::chrono::milliseconds get_deactivation_time(nlohmann::json &json)
   }
 }
 
-std::shared_ptr<items::impl::Solenoid> create_solenoid(nlohmann::json &solenoid_json, std::shared_ptr<DriverBoardPinController> &pin_controller, std::chrono::milliseconds &deactivation_time)
+std::shared_ptr<items::detail::Solenoid> create_solenoid(nlohmann::json &solenoid_json, std::shared_ptr<DriverBoardPinController> &pin_controller, std::chrono::milliseconds &deactivation_time)
 {
   try
   {
@@ -216,7 +216,7 @@ std::shared_ptr<items::impl::Solenoid> create_solenoid(nlohmann::json &solenoid_
       deactivation_time = get_deactivation_time(solenoid_json);
     }
     
-    return std::make_shared<items::impl::Solenoid>(pin_controller, address, name, deactivation_time);
+    return std::make_shared<items::detail::Solenoid>(pin_controller, address, name, deactivation_time);
   }
   catch(json::exception &e)
   {
@@ -225,13 +225,13 @@ std::shared_ptr<items::impl::Solenoid> create_solenoid(nlohmann::json &solenoid_
   }
 }
 
-std::shared_ptr<items::impl::Lamp> create_lamp(nlohmann::json &lamp_json, std::shared_ptr<DriverBoardPinController> &pin_controller)
+std::shared_ptr<items::detail::Lamp> create_lamp(nlohmann::json &lamp_json, std::shared_ptr<DriverBoardPinController> &pin_controller)
 {
   try
   {
     std::string name = lamp_json.at("name");
     auto address = lamp_json.at("address").get<uint8_t>();
-    return std::make_shared<items::impl::Lamp>(pin_controller, address, name);
+    return std::make_shared<items::detail::Lamp>(pin_controller, address, name);
   }
   catch(json::exception &e)
   {
@@ -240,14 +240,14 @@ std::shared_ptr<items::impl::Lamp> create_lamp(nlohmann::json &lamp_json, std::s
   }
 }
 
-std::shared_ptr<items::impl::Sound> create_sound(nlohmann::json &sound_json, std::shared_ptr<SoundBoardPinController> &pin_controller, std::chrono::milliseconds &deactivation_time)
+std::shared_ptr<items::detail::Sound> create_sound(nlohmann::json &sound_json, std::shared_ptr<SoundBoardPinController> &pin_controller, std::chrono::milliseconds &deactivation_time)
 {
   try
   {
     auto id = sound_json.at("id").get<uint>();
     std::string description = sound_json.at("description");
     auto address = sound_json.at("address").get<uint8_t>();
-    return std::make_shared<items::impl::Sound>(pin_controller, address, description, deactivation_time, id);
+    return std::make_shared<items::detail::Sound>(pin_controller, address, description, deactivation_time, id);
   }
   catch(json::exception &e)
   {
@@ -282,11 +282,11 @@ std::shared_ptr<items::OutputDisplay> create_display(nlohmann::json &display_jso
     auto digits = display_json.at("digits").get<uint8_t>();
     if(digits == 8)
     {
-      return std::make_shared<items::impl::EightDigitDisplay>(address, id);
+      return std::make_shared<items::detail::EightDigitDisplay>(address, id);
     }
     else if(digits == 7)
     {
-      return std::make_shared<items::impl::SevenDigitDisplay>(address, id);
+      return std::make_shared<items::detail::SevenDigitDisplay>(address, id);
     }
     else
     {

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/detail/Solenoid.h"
-#include "output/items/impl/Lamp.h"
+#include "output/items/detail/Lamp.h"
-#include "output/items/impl/Sound.h"
+#include "output/items/detail/Sound.h"
 #include "output/DisplayBoardPinController.h"
 
 #include "json/json.hpp"
@@ -26,13 +26,13 @@ namespace OutputDriverFactory
   namespace
   {
     std::map<std::string, std::shared_ptr<items::Solenoid>> create_solenoids(std::istream &solenoid_config, std::shared_ptr<DriverBoardPinController> &pin_controller);
-    std::shared_ptr<items::impl::Solenoid> create_solenoid(nlohmann::json &solenoid_json, std::shared_ptr<DriverBoardPinController> &pin_controller, std::chrono::milliseconds &deactivation_time);
+    std::shared_ptr<items::detail::Solenoid> create_solenoid(nlohmann::json &solenoid_json, std::shared_ptr<DriverBoardPinController> &pin_controller, std::chrono::milliseconds &deactivation_time);
 
     std::map<std::string, std::shared_ptr<items::Lamp>> create_lamps(std::istream &lamp_config, std::shared_ptr<DriverBoardPinController> &pin_controller);
-    std::shared_ptr<items::impl::Lamp> create_lamp(nlohmann::json &lamp_json, std::shared_ptr<DriverBoardPinController> &pin_controller);
+    std::shared_ptr<items::detail::Lamp> create_lamp(nlohmann::json &lamp_json, std::shared_ptr<DriverBoardPinController> &pin_controller);
 
     std::map<std::string, std::shared_ptr<items::Sound>> create_sounds(std::istream &sound_config, std::shared_ptr<SoundBoardPinController> &pin_controller);
-    std::shared_ptr<items::impl::Sound> create_sound(nlohmann::json &sound_json, std::shared_ptr<SoundBoardPinController> &pin_controller, std::chrono::milliseconds &deactivation_time);
+    std::shared_ptr<items::detail::Sound> create_sound(nlohmann::json &sound_json, std::shared_ptr<SoundBoardPinController> &pin_controller, std::chrono::milliseconds &deactivation_time);
 
     std::chrono::milliseconds get_deactivation_time(nlohmann::json &json);
 

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 activate(const items::detail::Sound &sound) = 0;
-  virtual void deactivate(const items::impl::Sound &sound) = 0;
+  virtual void deactivate(const items::detail::Sound &sound) = 0;
 };
 
 }

FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp

@@ -11,7 +11,7 @@ namespace flippR_driver
 {
 namespace output
 {
-namespace impl
+namespace detail
 {
 
 DisplayBoardPinController::DisplayBoardPinController(std::map<std::string, uint8_t> pins_display) :

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

FlippR-Driver/src/output/detail/DisplayController.cpp

@@ -13,7 +13,7 @@ namespace flippR_driver
 {
 namespace output
 {
-namespace impl
+namespace detail
 {
 
 DisplayController::DisplayController(std::vector<std::shared_ptr<items::OutputDisplay>> displays, std::unique_ptr<DisplayBoardPinController> pin_controller)

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

FlippR-Driver/src/output/detail/DriverBoardPinController.cpp

@@ -8,7 +8,7 @@ namespace flippR_driver
 {
 namespace output
 {
-namespace impl
+namespace detail
 {
 
 DriverBoardPinController::DriverBoardPinController(std::map<std::string, uint8_t> pins_driver_board, std::shared_ptr<std::mutex> output_item_mutex) :

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

FlippR-Driver/src/output/detail/OutputDriver.cpp

@@ -14,7 +14,7 @@ namespace flippR_driver
 {
 namespace output
 {
-namespace impl
+namespace detail
 {
 
 using namespace items;

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

FlippR-Driver/src/output/detail/SoundBoardPinController.cpp

@@ -8,7 +8,7 @@ namespace flippR_driver
 {
 namespace output
 {
-namespace impl
+namespace detail
 {
 
 SoundBoardPinController::SoundBoardPinController(std::map<std::string, uint8_t> pins_sound, std::shared_ptr<std::mutex> output_item_mutex) :
@@ -17,7 +17,7 @@ SoundBoardPinController::SoundBoardPinController(std::map<std::string, uint8_t>
 
 }
 
-void SoundBoardPinController::activate(const items::impl::Sound &sound)
+void SoundBoardPinController::activate(const items::detail::Sound &sound)
 {
   std::lock_guard<std::mutex> 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<std::mutex> guard(*output_item_mutex);
 

FlippR-Driver/src/output/detail/SoundBoardPinController.h

@@ -9,14 +9,14 @@
 
 #include "output/OutputPinController.h"
 
-#include <output/items/impl/Sound.h>
+#include <output/items/detail/Sound.h>
 
 #include <map>
 namespace flippR_driver
 {
 namespace output
 {
-namespace impl
+namespace detail
 {
 
 class SoundBoardPinController : public OutputPinController, public output::SoundBoardPinController
@@ -25,8 +25,8 @@ public:
   SoundBoardPinController(std::map<std::string, uint8_t> pins_sound, std::shared_ptr<std::mutex> output_item_mutex);
   ~SoundBoardPinController() override = default;
 
-  void activate(const items::impl::Sound &sound) override;
+  void activate(const items::detail::Sound &sound) override;
-  void deactivate(const items::impl::Sound &sound) override;
+  void deactivate(const items::detail::Sound &sound) override;
 
 private:
   void write_sound_address(uint8_t address) const;

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 <output/DriverBoardPinController.h>
 
@@ -18,11 +18,11 @@ namespace output
 namespace items
 {
 
-class DriverBoardItem : public impl::Item
+class DriverBoardItem : public detail::Item
 {
 public:
   DriverBoardItem(std::shared_ptr<DriverBoardPinController> 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;
 

FlippR-Driver/src/output/items/detail/Display.h

@@ -18,7 +18,7 @@ namespace output
 {
 namespace items
 {
-namespace impl
+namespace detail
 {
 
 template<int DigitCount>
@@ -28,8 +28,8 @@ public:
   Display(uint8_t address, uint8_t id);
   virtual ~Display() = default;
 
-  virtual void write_score(uint score);
+  void write_score(uint score) override;
-  virtual void write_content(std::array<char, DigitCount> content);
+  void write_content(std::array<char, DigitCount> content);
 
   std::vector<uint8_t> get_content() const override;
   uint8_t get_address() const override;

FlippR-Driver/src/output/items/detail/Display.hpp

@@ -13,7 +13,7 @@ namespace output
 {
 namespace items
 {
-namespace impl
+namespace detail
 {
 
 template<int DigitCount>

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

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) :

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

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<DriverBoardPinController> pin_controller, uint8_t address, std::string name) :

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

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

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<DriverBoardPinController> pin_controller, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time)

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

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<SoundBoardPinController> pin_controller, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time, u_int id)

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

FlippR-Driver/tests/catch.hpp

@@ -1985,7 +1985,7 @@ namespace Catch {
 
 namespace Catch {
 namespace Matchers {
-    namespace Impl {
+    namespace detail {
 
         template<typename ArgT> struct MatchAllOf;
         template<typename ArgT> struct MatchAnyOf;
@@ -2115,12 +2115,12 @@ namespace Matchers {
             return MatchNotOf<ComparatorT>( *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<std::string>;
+    using StringMatcher = Matchers::detail::MatcherBase<std::string>;
 
     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<NSString*>{
@@ -2619,19 +2619,19 @@ namespace Catch {
             };
 
         } // namespace NSStringMatchers
-        } // namespace Impl
+        } // namespace detail
 
-        inline Impl::NSStringMatchers::Equals
+        inline detail::NSStringMatchers::Equals
-            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
+            Equals( NSString* substr ){ return detail::NSStringMatchers::Equals( substr ); }
 
-        inline Impl::NSStringMatchers::Contains
+        inline detail::NSStringMatchers::Contains
-            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
+            Contains( NSString* substr ){ return detail::NSStringMatchers::Contains( substr ); }
 
-        inline Impl::NSStringMatchers::StartsWith
+        inline detail::NSStringMatchers::StartsWith
-            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
+            StartsWith( NSString* substr ){ return detail::NSStringMatchers::StartsWith( substr ); }
 
-        inline Impl::NSStringMatchers::EndsWith
+        inline detail::NSStringMatchers::EndsWith
-            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
+            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<std::string>;
+    using StringMatcher = Matchers::detail::MatcherBase<std::string>;
 
     // 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<Arg> {
     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()
+            ? PosixColourdetail::instance()
-            : NoColourImpl::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:

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;

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;

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;

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;