From e011351aad34c405f54a02f2cfa82e35ceba2eeb Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Wed, 12 Nov 2025 20:37:54 -0500 Subject: [PATCH] refactor: remove event.cpp, event code is just the header now basedon: https://github.com/input-leap/input-leap/pull/1554/commits/6b7d45e9c4ebadf305ad4921ce3c4890cf2cf8be --- src/lib/base/CMakeLists.txt | 1 - src/lib/base/Event.cpp | 81 ------------------------------------- src/lib/base/Event.h | 73 ++++++++++++++++++++++++++------- 3 files changed, 58 insertions(+), 97 deletions(-) delete mode 100644 src/lib/base/Event.cpp diff --git a/src/lib/base/CMakeLists.txt b/src/lib/base/CMakeLists.txt index 02ec0876e..7b1476fce 100644 --- a/src/lib/base/CMakeLists.txt +++ b/src/lib/base/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(base STATIC BaseException.cpp BaseException.h DirectionTypes.h - Event.cpp Event.h EventQueue.cpp EventQueue.h diff --git a/src/lib/base/Event.cpp b/src/lib/base/Event.cpp deleted file mode 100644 index 9536d66a3..000000000 --- a/src/lib/base/Event.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Deskflow -- mouse and keyboard sharing utility - * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd. - * SPDX-FileCopyrightText: (C) 2004 Chris Schoeneman - * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception - */ - -#include "base/Event.h" - -#include -#include - -// -// Event -// -Event::Event(EventTypes type, void *target, void *data, Flags flags) - : m_type(type), - m_target(target), - m_data(data), - m_flags(flags) -{ - // do nothing -} - -Event::Event(EventTypes type, void *target, EventData *dataObject) - : m_type(type), - m_target(target), - m_dataObject(dataObject) -{ - // do nothing -} - -EventTypes Event::getType() const -{ - return m_type; -} - -void *Event::getTarget() const -{ - return m_target; -} - -void *Event::getData() const -{ - return m_data; -} - -EventData *Event::getDataObject() const -{ - return m_dataObject; -} - -Event::Flags Event::getFlags() const -{ - return m_flags; -} - -void Event::deleteData(const Event &event) -{ - switch (event.getType()) { - using enum EventTypes; - case Unknown: - case Quit: - case System: - case Timer: - break; - - default: - if ((event.getFlags() & EventFlags::DontFreeData) == 0) { - free(event.getData()); - delete event.getDataObject(); - } - break; - } -} - -void Event::setDataObject(EventData *dataObject) -{ - assert(m_dataObject == nullptr); - m_dataObject = dataObject; -} diff --git a/src/lib/base/Event.h b/src/lib/base/Event.h index b8b62a219..f4c9341eb 100644 --- a/src/lib/base/Event.h +++ b/src/lib/base/Event.h @@ -9,6 +9,9 @@ #include "EventTypes.h" +#include +#include + using deskflow::EventTypes; class EventData @@ -44,15 +47,19 @@ public: \p target is the intended recipient of the event. \p flags is any combination of \c Flags. */ - explicit Event(EventTypes type, void *target = nullptr, void *data = nullptr, Flags flags = EventFlags::NoFlags); + explicit Event(EventTypes type, void *target = nullptr, void *data = nullptr, Flags flags = EventFlags::NoFlags) + : m_type(type), + m_target(target), + m_data(data), + m_flags(flags) + { + // do nothing + } - //! Create \c Event with non-POD data - /*! - \p type of the event - \p target is the intended recipient of the event. - \p dataObject with event data - */ - explicit Event(EventTypes type, void *target, EventData *dataObject); + Event(EventTypes type, void *target, EventData *dataObject) : m_type(type), m_target(target), m_dataObject(dataObject) + { + // do nothing + } //! @name manipulators //@{ @@ -61,14 +68,35 @@ public: /*! Deletes event data for the given event (using free()). */ - static void deleteData(const Event &); + static void deleteData(const Event &event) + { + switch (event.getType()) { + using enum EventTypes; + case Unknown: + case Quit: + case System: + case Timer: + break; + + default: + if ((event.getFlags() & EventFlags::DontFreeData) == 0) { + free(event.getData()); + delete event.getDataObject(); + } + break; + } + } //! Set data (non-POD) /*! Set non-POD (non plain old data), where delete is called when the event is deleted, and the destructor is called. */ - void setDataObject(EventData *dataObject); + void setDataObject(EventData *dataObject) + { + assert(m_dataObject == nullptr); + m_dataObject = dataObject; + }; //@} //! @name accessors @@ -78,19 +106,28 @@ public: /*! Returns the event type. */ - EventTypes getType() const; + EventTypes getType() const + { + return m_type; + } //! Get the event target /*! Returns the event target. */ - void *getTarget() const; + void *getTarget() const + { + return m_target; + } //! Get the event data (POD). /*! Returns the event data (POD). */ - void *getData() const; + void *getData() const + { + return m_data; + } //! Get the event data (non-POD) /*! @@ -98,13 +135,19 @@ public: \c getData() is that when delete is called on this data, so non-POD (non plain old data) dtor is called. */ - EventData *getDataObject() const; + EventData *getDataObject() const + { + return m_dataObject; + } //! Get event flags /*! Returns the event flags. */ - Flags getFlags() const; + Flags getFlags() const + { + return m_flags; + } //@}