chore: remove StdSet and include set directly where needed

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 <map>
 #include <queue>
+#include <set>
 
 class Mutex;
 

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

src/lib/common/StdSet.h

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

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 <set>
+
 //! Key state interface
 /*!
 This interface provides access to set and query the keyboard state and

src/lib/deskflow/KeyMap.h

@@ -8,10 +8,10 @@
 #pragma once
 
 #include "base/String.h"
-#include "common/StdSet.h"
 #include "deskflow/KeyTypes.h"
 
 #include <map>
+#include <set>
 #include <vector>
 
 #ifdef TEST_ENV

src/lib/net/SecureListenSocket.h

@@ -7,10 +7,11 @@
 
 #pragma once
 
-#include "common/StdSet.h"
 #include "net/SecurityLevel.h"
 #include "net/TCPListenSocket.h"
 
+#include <set>
+
 class IEventQueue;
 class SocketMultiplexer;
 class IDataSocket;

src/lib/platform/OSXKeyState.h

@@ -8,12 +8,12 @@
 #pragma once
 
 #include "OSXAutoTypes.h"
-#include "common/StdSet.h"
 #include "deskflow/KeyState.h"
 
 #include <Carbon/Carbon.h>
 
 #include <map>
+#include <set>
 #include <vector>
 
 class IOSXKeyResource;

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 <set>
 #include <vector>
 
 #if X_DISPLAY_MISSING

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 <deque>
+#include <set>
 
 class ClientProxy;
 class ClientProxyUnknown;

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 <iosfwd>
 #include <map>
+#include <set>
 
 namespace deskflow::server {
 class Config;

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 <map>
+#include <set>
 
 class PrimaryClient;
 class Event;

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 <map>
 #include <memory>
+#include <set>
 #include <vector>
 
 class BaseClientProxy;