chore: remove StdVector and include vector directly where needed

src/lib/base/PriorityQueue.h

@@ -7,10 +7,9 @@
 
 #pragma once
 
-#include "common/StdVector.h"
-
 #include <algorithm>
 #include <functional>
+#include <vector>
 
 //! A priority queue with an iterator
 /*!

src/lib/base/String.cpp

@@ -7,7 +7,6 @@
  */
 
 #include "base/String.h"
-#include "common/StdVector.h"
 
 #include <algorithm>
 #include <cctype>
@@ -21,6 +20,7 @@
 #include <sstream>
 #include <stdio.h>
 #include <string>
+#include <vector>
 
 namespace deskflow {
 namespace string {

src/lib/common/CMakeLists.txt

@@ -12,7 +12,6 @@ add_library(common STATIC
   StdMap.h
   StdOStream.h
   StdSet.h
-  StdVector.h
   Settings.h
   Settings.cpp
   QSettingsProxy.cpp

src/lib/common/StdVector.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 <vector>

src/lib/deskflow/ArgParser.h

@@ -6,9 +6,8 @@
 
 #pragma once
 
-#include "common/StdVector.h"
-
 #include <string>
+#include <vector>
 
 namespace deskflow {
 class ArgsBase;

src/lib/deskflow/DragInformation.h

@@ -7,9 +7,9 @@
 #pragma once
 
 #include "base/EventTypes.h"
-#include "common/StdVector.h"
 
 #include <string>
+#include <vector>
 
 class DragInformation;
 using DragFileList = std::vector<DragInformation>;

src/lib/deskflow/IClipboard.cpp

@@ -6,7 +6,8 @@
  */
 
 #include "deskflow/IClipboard.h"
-#include "common/StdVector.h"
+
+#include <vector>
 
 //
 // IClipboard

src/lib/deskflow/KeyMap.h

@@ -10,9 +10,10 @@
 #include "base/String.h"
 #include "common/StdMap.h"
 #include "common/StdSet.h"
-#include "common/StdVector.h"
 #include "deskflow/KeyTypes.h"
 
+#include <vector>
+
 #ifdef TEST_ENV
 #include "gtest/gtest_prod.h"
 #endif

src/lib/deskflow/OptionTypes.h

@@ -8,7 +8,8 @@
 #pragma once
 
 #include "base/EventTypes.h"
-#include "common/StdVector.h"
+
+#include <vector>
 
 //! Option ID
 /*!

src/lib/deskflow/ProtocolUtil.cpp

@@ -7,7 +7,6 @@
 
 #include "deskflow/ProtocolUtil.h"
 #include "base/Log.h"
-#include "common/StdVector.h"
 #include "deskflow/ProtocolTypes.h"
 #include "deskflow/XDeskflow.h"
 #include "io/IStream.h"
@@ -16,6 +15,7 @@
 
 #include <cctype>
 #include <cstring>
+#include <vector>
 
 //
 // ProtocolUtil

src/lib/io/StreamBuffer.h

@@ -9,7 +9,8 @@
 
 #include "base/EventTypes.h"
 #include "common/StdList.h"
-#include "common/StdVector.h"
+
+#include <vector>
 
 //! FIFO of bytes
 /*!

src/lib/net/SocketMultiplexer.cpp

@@ -11,13 +11,14 @@
 #include "arch/XArch.h"
 #include "base/Log.h"
 #include "base/TMethodJob.h"
-#include "common/StdVector.h"
 #include "mt/CondVar.h"
 #include "mt/Lock.h"
 #include "mt/Mutex.h"
 #include "mt/Thread.h"
 #include "net/ISocketMultiplexerJob.h"
 
+#include <vector>
+
 //
 // SocketMultiplexer
 //

src/lib/platform/MSWindowsClipboard.h

@@ -7,10 +7,11 @@
 
 #pragma once
 
-#include "common/StdVector.h"
 #include "deskflow/IClipboard.h"
 #include "platform/MSWindowsClipboardFacade.h"
 
+#include <vector>
+
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 

src/lib/platform/MSWindowsKeyState.h

@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include "common/StdVector.h"
 #include "deskflow/KeyState.h"
 
 #include <string>
+#include <vector>
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>

src/lib/platform/OSXKeyState.h

@@ -10,11 +10,12 @@
 #include "OSXAutoTypes.h"
 #include "common/StdMap.h"
 #include "common/StdSet.h"
-#include "common/StdVector.h"
 #include "deskflow/KeyState.h"
 
 #include <Carbon/Carbon.h>
 
+#include <vector>
+
 class IOSXKeyResource;
 
 //! OS X key state

src/lib/platform/OSXScreen.h

@@ -9,7 +9,6 @@
 
 #include "base/EventTypes.h"
 #include "common/StdMap.h"
-#include "common/StdVector.h"
 #include "deskflow/DragInformation.h"
 #include "deskflow/PlatformScreen.h"
 #include "platform/OSXClipboard.h"
@@ -22,6 +21,7 @@
 #include <mach/mach_interface.h>
 #include <mach/mach_port.h>
 #include <memory>
+#include <vector>
 
 extern "C"
 {

src/lib/platform/XWindowsClipboard.cpp

@@ -11,7 +11,6 @@
 #include "base/Log.h"
 #include "base/Stopwatch.h"
 #include "common/Common.h"
-#include "common/StdVector.h"
 #include "platform/XWindowsClipboardBMPConverter.h"
 #include "platform/XWindowsClipboardHTMLConverter.h"
 #include "platform/XWindowsClipboardTextConverter.h"
@@ -23,6 +22,7 @@
 #include <algorithm>
 #include <cstdio>
 #include <cstring>
+#include <vector>
 
 //
 // XWindowsClipboard

src/lib/platform/XWindowsClipboard.h

@@ -9,10 +9,11 @@
 
 #include "common/StdList.h"
 #include "common/StdMap.h"
-#include "common/StdVector.h"
 #include "deskflow/ClipboardTypes.h"
 #include "deskflow/IClipboard.h"
 
+#include <vector>
+
 #if X_DISPLAY_MISSING
 #error X11 is required to build deskflow
 #else

src/lib/platform/XWindowsEventQueueBuffer.h

@@ -8,9 +8,10 @@
 #pragma once
 
 #include "base/IEventQueueBuffer.h"
-#include "common/StdVector.h"
 #include "mt/Mutex.h"
 
+#include <vector>
+
 #if X_DISPLAY_MISSING
 #error X11 is required to build deskflow
 #else

src/lib/platform/XWindowsKeyState.h

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

src/lib/platform/XWindowsScreen.h

@@ -9,12 +9,13 @@
 
 #include "arch/Arch.h"
 #include "common/StdSet.h"
-#include "common/StdVector.h"
 #include "deskflow/ClientArgs.h"
 #include "deskflow/KeyMap.h"
 #include "deskflow/PlatformScreen.h"
 #include "platform/XWindowsPowerManager.h"
 
+#include <vector>
+
 #if X_DISPLAY_MISSING
 #error X11 is required to build deskflow
 #else

src/lib/platform/XWindowsUtil.h

@@ -9,9 +9,9 @@
 
 #include "base/EventTypes.h"
 #include "common/StdMap.h"
-#include "common/StdVector.h"
 
 #include <string>
+#include <vector>
 
 #if X_DISPLAY_MISSING
 #error X11 is required to build deskflow

src/lib/server/ClientProxy1_5.h

@@ -7,9 +7,10 @@
 #pragma once
 
 #include "base/Stopwatch.h"
-#include "common/StdVector.h"
 #include "server/ClientProxy1_4.h"
 
+#include <vector>
+
 class Server;
 class IEventQueue;
 

src/lib/server/Server.h

@@ -12,7 +12,6 @@
 #include "base/Stopwatch.h"
 #include "common/StdMap.h"
 #include "common/StdSet.h"
-#include "common/StdVector.h"
 #include "deskflow/Clipboard.h"
 #include "deskflow/ClipboardTypes.h"
 #include "deskflow/DragInformation.h"
@@ -22,7 +21,9 @@
 #include "deskflow/OptionTypes.h"
 #include "deskflow/ServerArgs.h"
 #include "server/Config.h"
+
 #include <memory>
+#include <vector>
 
 class BaseClientProxy;
 class EventQueueTimer;