diff --git a/src/lib/base/PriorityQueue.h b/src/lib/base/PriorityQueue.h index 2295ad5f9..be33a2737 100644 --- a/src/lib/base/PriorityQueue.h +++ b/src/lib/base/PriorityQueue.h @@ -7,10 +7,9 @@ #pragma once -#include "common/StdVector.h" - #include #include +#include //! A priority queue with an iterator /*! diff --git a/src/lib/base/String.cpp b/src/lib/base/String.cpp index e73e66e8c..953597be6 100644 --- a/src/lib/base/String.cpp +++ b/src/lib/base/String.cpp @@ -7,7 +7,6 @@ */ #include "base/String.h" -#include "common/StdVector.h" #include #include @@ -21,6 +20,7 @@ #include #include #include +#include namespace deskflow { namespace string { diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt index 1220b1677..6d0858af1 100644 --- a/src/lib/common/CMakeLists.txt +++ b/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 diff --git a/src/lib/common/StdVector.h b/src/lib/common/StdVector.h deleted file mode 100644 index 75f0c6304..000000000 --- a/src/lib/common/StdVector.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/ArgParser.h b/src/lib/deskflow/ArgParser.h index 1311515ee..8e9acba07 100644 --- a/src/lib/deskflow/ArgParser.h +++ b/src/lib/deskflow/ArgParser.h @@ -6,9 +6,8 @@ #pragma once -#include "common/StdVector.h" - #include +#include namespace deskflow { class ArgsBase; diff --git a/src/lib/deskflow/DragInformation.h b/src/lib/deskflow/DragInformation.h index d8fbaa8d9..cd4e8195e 100644 --- a/src/lib/deskflow/DragInformation.h +++ b/src/lib/deskflow/DragInformation.h @@ -7,9 +7,9 @@ #pragma once #include "base/EventTypes.h" -#include "common/StdVector.h" #include +#include class DragInformation; using DragFileList = std::vector; diff --git a/src/lib/deskflow/IClipboard.cpp b/src/lib/deskflow/IClipboard.cpp index 0fc33c9df..d2d5a7a43 100644 --- a/src/lib/deskflow/IClipboard.cpp +++ b/src/lib/deskflow/IClipboard.cpp @@ -6,7 +6,8 @@ */ #include "deskflow/IClipboard.h" -#include "common/StdVector.h" + +#include // // IClipboard diff --git a/src/lib/deskflow/KeyMap.h b/src/lib/deskflow/KeyMap.h index 2ee565f5b..2254e805b 100644 --- a/src/lib/deskflow/KeyMap.h +++ b/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 + #ifdef TEST_ENV #include "gtest/gtest_prod.h" #endif diff --git a/src/lib/deskflow/OptionTypes.h b/src/lib/deskflow/OptionTypes.h index c7ce66ad3..ab5ca2185 100644 --- a/src/lib/deskflow/OptionTypes.h +++ b/src/lib/deskflow/OptionTypes.h @@ -8,7 +8,8 @@ #pragma once #include "base/EventTypes.h" -#include "common/StdVector.h" + +#include //! Option ID /*! diff --git a/src/lib/deskflow/ProtocolUtil.cpp b/src/lib/deskflow/ProtocolUtil.cpp index c06d49d2e..56625dad1 100644 --- a/src/lib/deskflow/ProtocolUtil.cpp +++ b/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 #include +#include // // ProtocolUtil diff --git a/src/lib/io/StreamBuffer.h b/src/lib/io/StreamBuffer.h index 16885ab8d..c15103a1a 100644 --- a/src/lib/io/StreamBuffer.h +++ b/src/lib/io/StreamBuffer.h @@ -9,7 +9,8 @@ #include "base/EventTypes.h" #include "common/StdList.h" -#include "common/StdVector.h" + +#include //! FIFO of bytes /*! diff --git a/src/lib/net/SocketMultiplexer.cpp b/src/lib/net/SocketMultiplexer.cpp index 8631ad7fe..723a8da44 100644 --- a/src/lib/net/SocketMultiplexer.cpp +++ b/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 + // // SocketMultiplexer // diff --git a/src/lib/platform/MSWindowsClipboard.h b/src/lib/platform/MSWindowsClipboard.h index dedecb085..04663fa8e 100644 --- a/src/lib/platform/MSWindowsClipboard.h +++ b/src/lib/platform/MSWindowsClipboard.h @@ -7,10 +7,11 @@ #pragma once -#include "common/StdVector.h" #include "deskflow/IClipboard.h" #include "platform/MSWindowsClipboardFacade.h" +#include + #define WIN32_LEAN_AND_MEAN #include diff --git a/src/lib/platform/MSWindowsKeyState.h b/src/lib/platform/MSWindowsKeyState.h index c9fb836a6..559eb1f84 100644 --- a/src/lib/platform/MSWindowsKeyState.h +++ b/src/lib/platform/MSWindowsKeyState.h @@ -7,10 +7,10 @@ #pragma once -#include "common/StdVector.h" #include "deskflow/KeyState.h" #include +#include #define WIN32_LEAN_AND_MEAN #include diff --git a/src/lib/platform/OSXKeyState.h b/src/lib/platform/OSXKeyState.h index 1cd19af40..d1111241d 100644 --- a/src/lib/platform/OSXKeyState.h +++ b/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 +#include + class IOSXKeyResource; //! OS X key state diff --git a/src/lib/platform/OSXScreen.h b/src/lib/platform/OSXScreen.h index 8dc0f1804..2e6b4450d 100644 --- a/src/lib/platform/OSXScreen.h +++ b/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 #include #include +#include extern "C" { diff --git a/src/lib/platform/XWindowsClipboard.cpp b/src/lib/platform/XWindowsClipboard.cpp index 95ec64a9f..0c649e839 100644 --- a/src/lib/platform/XWindowsClipboard.cpp +++ b/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 #include #include +#include // // XWindowsClipboard diff --git a/src/lib/platform/XWindowsClipboard.h b/src/lib/platform/XWindowsClipboard.h index 22c05a558..11ce56661 100644 --- a/src/lib/platform/XWindowsClipboard.h +++ b/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 + #if X_DISPLAY_MISSING #error X11 is required to build deskflow #else diff --git a/src/lib/platform/XWindowsEventQueueBuffer.h b/src/lib/platform/XWindowsEventQueueBuffer.h index 9e1458d33..0d9088cb6 100644 --- a/src/lib/platform/XWindowsEventQueueBuffer.h +++ b/src/lib/platform/XWindowsEventQueueBuffer.h @@ -8,9 +8,10 @@ #pragma once #include "base/IEventQueueBuffer.h" -#include "common/StdVector.h" #include "mt/Mutex.h" +#include + #if X_DISPLAY_MISSING #error X11 is required to build deskflow #else diff --git a/src/lib/platform/XWindowsKeyState.h b/src/lib/platform/XWindowsKeyState.h index b4141b18e..691340da8 100644 --- a/src/lib/platform/XWindowsKeyState.h +++ b/src/lib/platform/XWindowsKeyState.h @@ -8,9 +8,10 @@ #pragma once #include "common/StdMap.h" -#include "common/StdVector.h" #include "deskflow/KeyState.h" +#include + #if X_DISPLAY_MISSING #error X11 is required to build deskflow #else diff --git a/src/lib/platform/XWindowsScreen.h b/src/lib/platform/XWindowsScreen.h index a5138500e..859a1aa77 100644 --- a/src/lib/platform/XWindowsScreen.h +++ b/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 + #if X_DISPLAY_MISSING #error X11 is required to build deskflow #else diff --git a/src/lib/platform/XWindowsUtil.h b/src/lib/platform/XWindowsUtil.h index a54cfd548..71e4e11a1 100644 --- a/src/lib/platform/XWindowsUtil.h +++ b/src/lib/platform/XWindowsUtil.h @@ -9,9 +9,9 @@ #include "base/EventTypes.h" #include "common/StdMap.h" -#include "common/StdVector.h" #include +#include #if X_DISPLAY_MISSING #error X11 is required to build deskflow diff --git a/src/lib/server/ClientProxy1_5.h b/src/lib/server/ClientProxy1_5.h index db5e3e06e..6d5b22035 100644 --- a/src/lib/server/ClientProxy1_5.h +++ b/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 + class Server; class IEventQueue; diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h index 1622cfd99..b862682a4 100644 --- a/src/lib/server/Server.h +++ b/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 +#include class BaseClientProxy; class EventQueueTimer;