From 498ffe85c3a97f6b753e6c0b2184d2b1744482e3 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Thu, 20 Mar 2025 18:56:14 -0400 Subject: [PATCH] chore: remove StdSet and include set directly where needed --- src/lib/base/EventQueue.h | 2 +- src/lib/common/CMakeLists.txt | 1 - src/lib/common/StdSet.h | 10 ---------- src/lib/deskflow/IKeyState.h | 3 ++- src/lib/deskflow/KeyMap.h | 2 +- src/lib/net/SecureListenSocket.h | 3 ++- src/lib/platform/OSXKeyState.h | 2 +- src/lib/platform/XWindowsScreen.h | 2 +- src/lib/server/ClientListener.h | 2 +- src/lib/server/Config.h | 2 +- src/lib/server/InputFilter.h | 2 +- src/lib/server/Server.h | 2 +- 12 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 src/lib/common/StdSet.h diff --git a/src/lib/base/EventQueue.h b/src/lib/base/EventQueue.h index 0c603f397..68c7946b3 100644 --- a/src/lib/base/EventQueue.h +++ b/src/lib/base/EventQueue.h @@ -13,11 +13,11 @@ #include "base/IEventQueue.h" #include "base/PriorityQueue.h" #include "base/Stopwatch.h" -#include "common/StdSet.h" #include "mt/CondVar.h" #include #include +#include class Mutex; diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt index ef3c253e8..556771d6d 100644 --- a/src/lib/common/CMakeLists.txt +++ b/src/lib/common/CMakeLists.txt @@ -9,7 +9,6 @@ add_library(common STATIC StdExcept.h StdIStream.h StdOStream.h - StdSet.h Settings.h Settings.cpp QSettingsProxy.cpp diff --git a/src/lib/common/StdSet.h b/src/lib/common/StdSet.h deleted file mode 100644 index 1b28a6e34..000000000 --- a/src/lib/common/StdSet.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Deskflow -- mouse and keyboard sharing utility - * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd. - * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman - * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception - */ - -#pragma once - -#include diff --git a/src/lib/deskflow/IKeyState.h b/src/lib/deskflow/IKeyState.h index 2028116b0..6fbc3ea1a 100644 --- a/src/lib/deskflow/IKeyState.h +++ b/src/lib/deskflow/IKeyState.h @@ -11,9 +11,10 @@ #include "base/EventTypes.h" #include "base/IEventQueue.h" #include "common/IInterface.h" -#include "common/StdSet.h" #include "deskflow/KeyTypes.h" +#include + //! Key state interface /*! This interface provides access to set and query the keyboard state and diff --git a/src/lib/deskflow/KeyMap.h b/src/lib/deskflow/KeyMap.h index 4e854b7c7..250a2a189 100644 --- a/src/lib/deskflow/KeyMap.h +++ b/src/lib/deskflow/KeyMap.h @@ -8,10 +8,10 @@ #pragma once #include "base/String.h" -#include "common/StdSet.h" #include "deskflow/KeyTypes.h" #include +#include #include #ifdef TEST_ENV diff --git a/src/lib/net/SecureListenSocket.h b/src/lib/net/SecureListenSocket.h index e577a5959..9c1247632 100644 --- a/src/lib/net/SecureListenSocket.h +++ b/src/lib/net/SecureListenSocket.h @@ -7,10 +7,11 @@ #pragma once -#include "common/StdSet.h" #include "net/SecurityLevel.h" #include "net/TCPListenSocket.h" +#include + class IEventQueue; class SocketMultiplexer; class IDataSocket; diff --git a/src/lib/platform/OSXKeyState.h b/src/lib/platform/OSXKeyState.h index 8bbfa3ffb..497bc3f8f 100644 --- a/src/lib/platform/OSXKeyState.h +++ b/src/lib/platform/OSXKeyState.h @@ -8,12 +8,12 @@ #pragma once #include "OSXAutoTypes.h" -#include "common/StdSet.h" #include "deskflow/KeyState.h" #include #include +#include #include class IOSXKeyResource; diff --git a/src/lib/platform/XWindowsScreen.h b/src/lib/platform/XWindowsScreen.h index 859a1aa77..73fa9f5bb 100644 --- a/src/lib/platform/XWindowsScreen.h +++ b/src/lib/platform/XWindowsScreen.h @@ -8,12 +8,12 @@ #pragma once #include "arch/Arch.h" -#include "common/StdSet.h" #include "deskflow/ClientArgs.h" #include "deskflow/KeyMap.h" #include "deskflow/PlatformScreen.h" #include "platform/XWindowsPowerManager.h" +#include #include #if X_DISPLAY_MISSING diff --git a/src/lib/server/ClientListener.h b/src/lib/server/ClientListener.h index 6c8fc676b..0d6c04af4 100644 --- a/src/lib/server/ClientListener.h +++ b/src/lib/server/ClientListener.h @@ -10,11 +10,11 @@ #include "base/Event.h" #include "base/EventTypes.h" -#include "common/StdSet.h" #include "net/SecurityLevel.h" #include "server/Config.h" #include +#include class ClientProxy; class ClientProxyUnknown; diff --git a/src/lib/server/Config.h b/src/lib/server/Config.h index 99abb8b45..67fa6e8ba 100644 --- a/src/lib/server/Config.h +++ b/src/lib/server/Config.h @@ -9,7 +9,6 @@ #include "base/String.h" #include "base/XBase.h" -#include "common/StdSet.h" #include "deskflow/IPlatformScreen.h" #include "deskflow/OptionTypes.h" #include "deskflow/ProtocolTypes.h" @@ -18,6 +17,7 @@ #include #include +#include namespace deskflow::server { class Config; diff --git a/src/lib/server/InputFilter.h b/src/lib/server/InputFilter.h index 7e1a49dd6..3a09a71bc 100644 --- a/src/lib/server/InputFilter.h +++ b/src/lib/server/InputFilter.h @@ -7,13 +7,13 @@ #pragma once -#include "common/StdSet.h" #include "deskflow/IPlatformScreen.h" #include "deskflow/KeyTypes.h" #include "deskflow/MouseTypes.h" #include "deskflow/ProtocolTypes.h" #include +#include class PrimaryClient; class Event; diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h index c11b48483..ac06db219 100644 --- a/src/lib/server/Server.h +++ b/src/lib/server/Server.h @@ -10,7 +10,6 @@ #include "base/Event.h" #include "base/EventTypes.h" #include "base/Stopwatch.h" -#include "common/StdSet.h" #include "deskflow/Clipboard.h" #include "deskflow/ClipboardTypes.h" #include "deskflow/DragInformation.h" @@ -23,6 +22,7 @@ #include #include +#include #include class BaseClientProxy;