From 1875c599a47651752e9f0fd7cfca7c48952b7bc4 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Fri, 7 Nov 2025 17:13:33 -0500 Subject: [PATCH] refactor: define EventQueueTimer to its own header not once per IEventQueue impl --- src/lib/base/CMakeLists.txt | 1 + src/lib/base/EventQueueTimer.h | 15 +++++++++++++++ src/lib/platform/EiEventQueueBuffer.cpp | 5 +---- src/lib/platform/MSWindowsEventQueueBuffer.cpp | 9 +-------- src/lib/platform/OSXEventQueueBuffer.cpp | 9 +-------- src/lib/platform/XWindowsEventQueueBuffer.cpp | 9 +-------- 6 files changed, 20 insertions(+), 28 deletions(-) create mode 100644 src/lib/base/EventQueueTimer.h diff --git a/src/lib/base/CMakeLists.txt b/src/lib/base/CMakeLists.txt index b8febf3f2..02ec0876e 100644 --- a/src/lib/base/CMakeLists.txt +++ b/src/lib/base/CMakeLists.txt @@ -11,6 +11,7 @@ add_library(base STATIC Event.h EventQueue.cpp EventQueue.h + EventQueueTimer.h EventTypes.h FinalAction.h FunctionEventJob.cpp diff --git a/src/lib/base/EventQueueTimer.h b/src/lib/base/EventQueueTimer.h new file mode 100644 index 000000000..c9b3030de --- /dev/null +++ b/src/lib/base/EventQueueTimer.h @@ -0,0 +1,15 @@ +/* + * Deskflow -- mouse and keyboard sharing utility + * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers + * SPDX-FileCopyrightText: (C) 2023 Inputleap Contributors + * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd. + * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception + */ + +#pragma once + +class EventQueueTimer +{ +public: + virtual ~EventQueueTimer() = default; +}; diff --git a/src/lib/platform/EiEventQueueBuffer.cpp b/src/lib/platform/EiEventQueueBuffer.cpp index e07f52495..520c21f29 100644 --- a/src/lib/platform/EiEventQueueBuffer.cpp +++ b/src/lib/platform/EiEventQueueBuffer.cpp @@ -8,6 +8,7 @@ #include "platform/EiEventQueueBuffer.h" #include "base/Event.h" +#include "base/EventQueueTimer.h" #include "base/EventTypes.h" #include "base/IEventQueue.h" #include "base/Log.h" @@ -18,10 +19,6 @@ #include #include -class EventQueueTimer -{ -}; - namespace deskflow { EiEventQueueBuffer::EiEventQueueBuffer(ei *ei, IEventQueue *events) : m_ei{ei_ref(ei)}, m_events{events} diff --git a/src/lib/platform/MSWindowsEventQueueBuffer.cpp b/src/lib/platform/MSWindowsEventQueueBuffer.cpp index da181710e..793c1fe58 100644 --- a/src/lib/platform/MSWindowsEventQueueBuffer.cpp +++ b/src/lib/platform/MSWindowsEventQueueBuffer.cpp @@ -8,16 +8,9 @@ #include "platform/MSWindowsEventQueueBuffer.h" #include "arch/win32/ArchMiscWindows.h" +#include "base/EventQueueTimer.h" #include "base/IEventQueue.h" -// -// EventQueueTimer -// - -class EventQueueTimer -{ -}; - // // MSWindowsEventQueueBuffer // diff --git a/src/lib/platform/OSXEventQueueBuffer.cpp b/src/lib/platform/OSXEventQueueBuffer.cpp index 25eb682c6..59db1d022 100644 --- a/src/lib/platform/OSXEventQueueBuffer.cpp +++ b/src/lib/platform/OSXEventQueueBuffer.cpp @@ -9,17 +9,10 @@ #include "platform/OSXEventQueueBuffer.h" #include "base/Event.h" +#include "base/EventQueueTimer.h" #include "base/IEventQueue.h" #include "base/Log.h" -// -// EventQueueTimer -// - -class EventQueueTimer -{ -}; - // // OSXEventQueueBuffer // diff --git a/src/lib/platform/XWindowsEventQueueBuffer.cpp b/src/lib/platform/XWindowsEventQueueBuffer.cpp index c7211c3a6..84f24fced 100644 --- a/src/lib/platform/XWindowsEventQueueBuffer.cpp +++ b/src/lib/platform/XWindowsEventQueueBuffer.cpp @@ -8,6 +8,7 @@ #include "platform/XWindowsEventQueueBuffer.h" #include "base/Event.h" +#include "base/EventQueueTimer.h" #include "base/IEventQueue.h" #include "mt/Thread.h" @@ -15,14 +16,6 @@ #include #include -// -// EventQueueTimer -// - -class EventQueueTimer -{ -}; - // // XWindowsEventQueueBuffer //