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

changed virtual to override

Browse Source
This commit is contained in:
Jonas Zeunert
2018-12-07 11:53:38 +01:00
parent 8fd5588d02
commit dc95c45d9b
15 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ EventHandler::EventHandler(std::shared_ptr<IInputDriver> 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

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

@@ -26,9 +26,9 @@ class EventHandler;
class EventHandler : public IEventHandler
{
public:
EventHandler(std::shared_ptr<IInputDriver> input_driver);
virtual ~EventHandler();
virtual void handle(Event& event);
explicit EventHandler(std::shared_ptr<IInputDriver> input_driver);
~EventHandler() override;
void handle(Event& event) override;
private:
std::shared_ptr<IInputDriver> input_driver;

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

@@ -30,13 +30,13 @@ class EventNotifier : public IEventNotifier
{
public:
EventNotifier(utility::IBlockingQueue<Event>* queue);
~EventNotifier();
explicit EventNotifier(utility::IBlockingQueue<Event>* 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();

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

@@ -18,7 +18,7 @@ class IDetector
{
public:
virtual ~IDetector(){};
virtual ~IDetector() = default;
};
}

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

@@ -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;

2
FlippR-Driver/src/input/IInputGPIOInterface.h
View File

@@ -17,7 +17,7 @@ class IInputGPIOInterface
{
public:
virtual ~IInputGPIOInterface()
{};
= default;;
virtual bool read_data(char pin) = 0;
};

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

@@ -24,10 +24,10 @@ class InputDriver : public IInputDriver
public:
InputDriver(std::shared_ptr<IEventNotifier> event_notifier, std::unique_ptr<IDetector> detector, std::map<std::string, std::shared_ptr<Event>> 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<Event> get_event(std::string name);
std::shared_ptr<Event> get_event(std::string name) override;
private:
std::shared_ptr<IEventNotifier> event_notifier;

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

@@ -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);