From dc95c45d9b8fd41608bf450e6ab7a4ed824091f0 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Fri, 7 Dec 2018 11:53:38 +0100 Subject: [PATCH] changed virtual to override --- FlippR-Driver/src/GPIOInterface.h | 2 +- FlippR-Driver/src/input/EventHandler.cpp | 2 +- FlippR-Driver/src/input/EventHandler.h | 6 +++--- FlippR-Driver/src/input/EventNotifier.h | 10 +++++----- FlippR-Driver/src/input/IDetector.h | 2 +- FlippR-Driver/src/input/IEventNotifier.h | 2 +- FlippR-Driver/src/input/IInputGPIOInterface.h | 2 +- FlippR-Driver/src/input/InputDriver.h | 6 +++--- FlippR-Driver/src/input/InputGPIOInterface.h | 4 ++-- FlippR-Driver/src/output/IOutputGPIOInterface.h | 2 +- FlippR-Driver/src/output/items/IDriverBoardItem.h | 2 +- FlippR-Driver/src/output/items/Item.h | 2 +- FlippR-Driver/src/output/items/Sound.h | 2 +- FlippR-Driver/src/utility/IBlockingQueue.h | 3 +-- FlippR-Driver/src/utility/InputSocketHandler.h | 2 +- 15 files changed, 24 insertions(+), 25 deletions(-) diff --git a/FlippR-Driver/src/GPIOInterface.h b/FlippR-Driver/src/GPIOInterface.h index 61f5a0d..9f31954 100644 --- a/FlippR-Driver/src/GPIOInterface.h +++ b/FlippR-Driver/src/GPIOInterface.h @@ -22,7 +22,7 @@ class GPIOInterface { public: GPIOInterface(); - virtual ~GPIOInterface() {}; + virtual ~GPIOInterface() = default; protected: static void initialize_input_pin(char address); diff --git a/FlippR-Driver/src/input/EventHandler.cpp b/FlippR-Driver/src/input/EventHandler.cpp index 55aa68d..158c3ff 100644 --- a/FlippR-Driver/src/input/EventHandler.cpp +++ b/FlippR-Driver/src/input/EventHandler.cpp @@ -23,7 +23,7 @@ EventHandler::EventHandler(std::shared_ptr input_driver) : EventHandler::~EventHandler() { this->input_driver->unregister_event_handler(this); - this->input_driver = NULL; + this->input_driver = nullptr; } // This function is intended to be non pure, if it is called when the derived class doesn't exist anymore diff --git a/FlippR-Driver/src/input/EventHandler.h b/FlippR-Driver/src/input/EventHandler.h index c085236..75ac516 100644 --- a/FlippR-Driver/src/input/EventHandler.h +++ b/FlippR-Driver/src/input/EventHandler.h @@ -26,9 +26,9 @@ class EventHandler; class EventHandler : public IEventHandler { public: - EventHandler(std::shared_ptr input_driver); - virtual ~EventHandler(); - virtual void handle(Event& event); + explicit EventHandler(std::shared_ptr input_driver); + ~EventHandler() override; + void handle(Event& event) override; private: std::shared_ptr input_driver; diff --git a/FlippR-Driver/src/input/EventNotifier.h b/FlippR-Driver/src/input/EventNotifier.h index b5295ac..97eb2ac 100644 --- a/FlippR-Driver/src/input/EventNotifier.h +++ b/FlippR-Driver/src/input/EventNotifier.h @@ -30,13 +30,13 @@ class EventNotifier : public IEventNotifier { public: - EventNotifier(utility::IBlockingQueue* queue); - ~EventNotifier(); + explicit EventNotifier(utility::IBlockingQueue* queue); + ~EventNotifier() override; - void register_event_handler(IEventHandler* handler); - void unregister_event_handler(IEventHandler* handler); + void register_event_handler(IEventHandler* handler) override; + void unregister_event_handler(IEventHandler* handler) override; - void distribute_event(Event &event); + void distribute_event(Event &event) override; private: void notify(); diff --git a/FlippR-Driver/src/input/IDetector.h b/FlippR-Driver/src/input/IDetector.h index 156d795..c62f560 100644 --- a/FlippR-Driver/src/input/IDetector.h +++ b/FlippR-Driver/src/input/IDetector.h @@ -18,7 +18,7 @@ class IDetector { public: - virtual ~IDetector(){}; + virtual ~IDetector() = default; }; } diff --git a/FlippR-Driver/src/input/IEventNotifier.h b/FlippR-Driver/src/input/IEventNotifier.h index 2cb749f..b368e67 100644 --- a/FlippR-Driver/src/input/IEventNotifier.h +++ b/FlippR-Driver/src/input/IEventNotifier.h @@ -20,7 +20,7 @@ namespace input class IEventNotifier { public: - virtual ~IEventNotifier(){}; + virtual ~IEventNotifier() = default; virtual void register_event_handler(IEventHandler* handler) = 0; virtual void unregister_event_handler(IEventHandler* handler) = 0; diff --git a/FlippR-Driver/src/input/IInputGPIOInterface.h b/FlippR-Driver/src/input/IInputGPIOInterface.h index 820a180..428d36d 100644 --- a/FlippR-Driver/src/input/IInputGPIOInterface.h +++ b/FlippR-Driver/src/input/IInputGPIOInterface.h @@ -17,7 +17,7 @@ class IInputGPIOInterface { public: virtual ~IInputGPIOInterface() - {}; + = default;; virtual bool read_data(char pin) = 0; }; diff --git a/FlippR-Driver/src/input/InputDriver.h b/FlippR-Driver/src/input/InputDriver.h index 3d600e6..f1a218a 100644 --- a/FlippR-Driver/src/input/InputDriver.h +++ b/FlippR-Driver/src/input/InputDriver.h @@ -24,10 +24,10 @@ class InputDriver : public IInputDriver public: InputDriver(std::shared_ptr event_notifier, std::unique_ptr detector, std::map> events); - virtual void register_event_handler(IEventHandler* handler) override; - virtual void unregister_event_handler(IEventHandler* handler) override; + void register_event_handler(IEventHandler* handler) override; + void unregister_event_handler(IEventHandler* handler) override; - virtual std::shared_ptr get_event(std::string name); + std::shared_ptr get_event(std::string name) override; private: std::shared_ptr event_notifier; diff --git a/FlippR-Driver/src/input/InputGPIOInterface.h b/FlippR-Driver/src/input/InputGPIOInterface.h index 8fc7cea..1822d62 100644 --- a/FlippR-Driver/src/input/InputGPIOInterface.h +++ b/FlippR-Driver/src/input/InputGPIOInterface.h @@ -20,8 +20,8 @@ namespace input class InputGPIOInterface : public IInputGPIOInterface, GPIOInterface { public: - InputGPIOInterface(std::istream &input_config); - bool read_data(char pin); + explicit InputGPIOInterface(std::istream &input_config); + bool read_data(char pin) override; private: void init_members(std::istream &input_config_stream); diff --git a/FlippR-Driver/src/output/IOutputGPIOInterface.h b/FlippR-Driver/src/output/IOutputGPIOInterface.h index c35915c..dd96a8b 100644 --- a/FlippR-Driver/src/output/IOutputGPIOInterface.h +++ b/FlippR-Driver/src/output/IOutputGPIOInterface.h @@ -20,7 +20,7 @@ namespace output class IOutputGPIOInterface { public: - virtual ~IOutputGPIOInterface(){}; + virtual ~IOutputGPIOInterface() = default; virtual void activate(items::IDriverBoardItem *driver_board_item) = 0; virtual void activate(items::ISoundItem *sound) = 0; diff --git a/FlippR-Driver/src/output/items/IDriverBoardItem.h b/FlippR-Driver/src/output/items/IDriverBoardItem.h index a3586e6..20f57ff 100644 --- a/FlippR-Driver/src/output/items/IDriverBoardItem.h +++ b/FlippR-Driver/src/output/items/IDriverBoardItem.h @@ -19,7 +19,7 @@ namespace items class IDriverBoardItem : public IItem { public: - virtual ~IDriverBoardItem(){}; + virtual ~IDriverBoardItem() = default; }; } diff --git a/FlippR-Driver/src/output/items/Item.h b/FlippR-Driver/src/output/items/Item.h index 5455ebe..7277b15 100644 --- a/FlippR-Driver/src/output/items/Item.h +++ b/FlippR-Driver/src/output/items/Item.h @@ -26,7 +26,7 @@ class Item : public IItem { public: Item(std::shared_ptr output_gpio_interface, uint8_t address, std::string name); - virtual ~Item(); + ~Item() override; uint8_t get_address() override; diff --git a/FlippR-Driver/src/output/items/Sound.h b/FlippR-Driver/src/output/items/Sound.h index d7bce61..9e1aef1 100644 --- a/FlippR-Driver/src/output/items/Sound.h +++ b/FlippR-Driver/src/output/items/Sound.h @@ -34,7 +34,7 @@ public: Sound(std::shared_ptr output_gpio_interface, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time, u_int id); virtual ~Sound() = default; - virtual void play(); + void play() override; private: std::chrono::milliseconds deactivation_time; diff --git a/FlippR-Driver/src/utility/IBlockingQueue.h b/FlippR-Driver/src/utility/IBlockingQueue.h index 81f9fa6..89504a4 100644 --- a/FlippR-Driver/src/utility/IBlockingQueue.h +++ b/FlippR-Driver/src/utility/IBlockingQueue.h @@ -16,8 +16,7 @@ template class IBlockingQueue { public: - virtual ~IBlockingQueue() - {}; + virtual ~IBlockingQueue() = default; virtual void push(T const &value) = 0; virtual T pop() = 0; diff --git a/FlippR-Driver/src/utility/InputSocketHandler.h b/FlippR-Driver/src/utility/InputSocketHandler.h index 99c5de4..f3edb45 100644 --- a/FlippR-Driver/src/utility/InputSocketHandler.h +++ b/FlippR-Driver/src/utility/InputSocketHandler.h @@ -17,7 +17,7 @@ namespace utility class InputSocketHandler : public SocketHandler, IEventHandler { public: - InputSocketHandler(boost::asio::io_service &service, std::string socket_file = "/var/run/user/" + std::to_string(getuid()) + explicit InputSocketHandler(boost::asio::io_service &service, std::string socket_file = "/var/run/user/" + std::to_string(getuid()) + "flippR/S.flippR_input"); void handle(input::Event &event) override;