chore: remove StdMap and include map directly where needed

src/lib/base/Event.h

@@ -8,7 +8,8 @@
 #pragma once
 
 #include "common/Common.h"
-#include "common/StdMap.h"
+
+#include <map>
 
 class EventData
 {

src/lib/base/EventQueue.h

@@ -13,10 +13,10 @@
 #include "base/IEventQueue.h"
 #include "base/PriorityQueue.h"
 #include "base/Stopwatch.h"
-#include "common/StdMap.h"
 #include "common/StdSet.h"
 #include "mt/CondVar.h"
 
+#include <map>
 #include <queue>
 
 class Mutex;

src/lib/common/CMakeLists.txt

@@ -8,7 +8,6 @@ add_library(common STATIC
   IInterface.h
   StdExcept.h
   StdIStream.h
-  StdMap.h
   StdOStream.h
   StdSet.h
   Settings.h

src/lib/common/StdMap.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 <map>

src/lib/deskflow/KeyMap.h

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

src/lib/net/SocketMultiplexer.h

@@ -8,9 +8,9 @@
 #pragma once
 
 #include "arch/IArchNetwork.h"
-#include "common/StdMap.h"
 
 #include <list>
+#include <map>
 
 template <class T> class CondVar;
 class Mutex;

src/lib/platform/MSWindowsDesks.h

@@ -7,13 +7,13 @@
 
 #pragma once
 
-#include "common/StdMap.h"
 #include "deskflow/KeyTypes.h"
 #include "deskflow/MouseTypes.h"
 #include "deskflow/OptionTypes.h"
 #include "mt/CondVar.h"
 #include "mt/Mutex.h"
 
+#include <map>
 #include <string>
 
 #define WIN32_LEAN_AND_MEAN

src/lib/platform/OSXKeyState.h

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

src/lib/platform/OSXScreen.h

@@ -8,7 +8,6 @@
 #pragma once
 
 #include "base/EventTypes.h"
-#include "common/StdMap.h"
 #include "deskflow/DragInformation.h"
 #include "deskflow/PlatformScreen.h"
 #include "platform/OSXClipboard.h"
@@ -16,10 +15,12 @@
 
 #include <Carbon/Carbon.h>
 #include <IOKit/IOMessage.h>
-#include <bitset>
 #include <mach/mach_init.h>
 #include <mach/mach_interface.h>
 #include <mach/mach_port.h>
+
+#include <bitset>
+#include <map>
 #include <memory>
 #include <vector>
 

src/lib/platform/XWindowsClipboard.h

@@ -7,11 +7,11 @@
 
 #pragma once
 
-#include "common/StdMap.h"
 #include "deskflow/ClipboardTypes.h"
 #include "deskflow/IClipboard.h"
 
 #include <list>
+#include <map>
 #include <vector>
 
 #if X_DISPLAY_MISSING

src/lib/platform/XWindowsKeyState.cpp

@@ -15,7 +15,6 @@
 #include "platform/XWindowsKeyState.h"
 
 #include "base/Log.h"
-#include "common/StdMap.h"
 #include "deskflow/AppUtil.h"
 #include "deskflow/ClientApp.h"
 #include "deskflow/ClientArgs.h"
@@ -23,6 +22,7 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <map>
 #if X_DISPLAY_MISSING
 #error X11 is required to build deskflow
 #else

src/lib/platform/XWindowsKeyState.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include "common/StdMap.h"
 #include "deskflow/KeyState.h"
 
+#include <map>
 #include <vector>
 
 #if X_DISPLAY_MISSING

src/lib/platform/XWindowsScreenSaver.h

@@ -8,9 +8,10 @@
 #pragma once
 
 #include "base/IEventQueue.h"
-#include "common/StdMap.h"
 #include "deskflow/IScreenSaver.h"
 
+#include <map>
+
 #if X_DISPLAY_MISSING
 #error X11 is required to build deskflow
 #else

src/lib/platform/XWindowsUtil.h

@@ -8,8 +8,8 @@
 #pragma once
 
 #include "base/EventTypes.h"
-#include "common/StdMap.h"
 
+#include <map>
 #include <string>
 #include <vector>
 

src/lib/server/Config.h

@@ -9,7 +9,6 @@
 
 #include "base/String.h"
 #include "base/XBase.h"
-#include "common/StdMap.h"
 #include "common/StdSet.h"
 #include "deskflow/IPlatformScreen.h"
 #include "deskflow/OptionTypes.h"
@@ -18,6 +17,7 @@
 #include "server/InputFilter.h"
 
 #include <iosfwd>
+#include <map>
 
 namespace deskflow::server {
 class Config;

src/lib/server/InputFilter.h

@@ -7,13 +7,14 @@
 
 #pragma once
 
-#include "common/StdMap.h"
 #include "common/StdSet.h"
 #include "deskflow/IPlatformScreen.h"
 #include "deskflow/KeyTypes.h"
 #include "deskflow/MouseTypes.h"
 #include "deskflow/ProtocolTypes.h"
 
+#include <map>
+
 class PrimaryClient;
 class Event;
 class IEventQueue;

src/lib/server/Server.h

@@ -10,7 +10,6 @@
 #include "base/Event.h"
 #include "base/EventTypes.h"
 #include "base/Stopwatch.h"
-#include "common/StdMap.h"
 #include "common/StdSet.h"
 #include "deskflow/Clipboard.h"
 #include "deskflow/ClipboardTypes.h"
@@ -22,6 +21,7 @@
 #include "deskflow/ServerArgs.h"
 #include "server/Config.h"
 
+#include <map>
 #include <memory>
 #include <vector>