diff --git a/src/lib/arch/unix/ArchMultithreadPosix.h b/src/lib/arch/unix/ArchMultithreadPosix.h index e51ef4d27..0aa5917af 100644 --- a/src/lib/arch/unix/ArchMultithreadPosix.h +++ b/src/lib/arch/unix/ArchMultithreadPosix.h @@ -8,8 +8,8 @@ #pragma once #include "arch/IArchMultithread.h" -#include "common/StdList.h" +#include #include #define ARCH_MULTITHREAD ArchMultithreadPosix diff --git a/src/lib/arch/win32/ArchMultithreadWindows.h b/src/lib/arch/win32/ArchMultithreadWindows.h index cc02ccc91..b9d94ce6d 100644 --- a/src/lib/arch/win32/ArchMultithreadWindows.h +++ b/src/lib/arch/win32/ArchMultithreadWindows.h @@ -8,7 +8,8 @@ #pragma once #include "arch/IArchMultithread.h" -#include "common/StdList.h" + +#include #define WIN32_LEAN_AND_MEAN #include diff --git a/src/lib/base/Log.h b/src/lib/base/Log.h index fbb051e97..59e29c475 100644 --- a/src/lib/base/Log.h +++ b/src/lib/base/Log.h @@ -10,8 +10,8 @@ #include "arch/Arch.h" #include "arch/IArchMultithread.h" #include "common/Common.h" -#include "common/StdList.h" +#include #include #define CLOG (Log::getInstance()) diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt index 6d0858af1..40883e395 100644 --- a/src/lib/common/CMakeLists.txt +++ b/src/lib/common/CMakeLists.txt @@ -8,7 +8,6 @@ add_library(common STATIC IInterface.h StdExcept.h StdIStream.h - StdList.h StdMap.h StdOStream.h StdSet.h diff --git a/src/lib/common/StdList.h b/src/lib/common/StdList.h deleted file mode 100644 index 8c0373795..000000000 --- a/src/lib/common/StdList.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/io/StreamBuffer.h b/src/lib/io/StreamBuffer.h index c15103a1a..d869514b2 100644 --- a/src/lib/io/StreamBuffer.h +++ b/src/lib/io/StreamBuffer.h @@ -8,8 +8,8 @@ #pragma once #include "base/EventTypes.h" -#include "common/StdList.h" +#include #include //! FIFO of bytes diff --git a/src/lib/net/SocketMultiplexer.h b/src/lib/net/SocketMultiplexer.h index e8f0e678e..426d24e0f 100644 --- a/src/lib/net/SocketMultiplexer.h +++ b/src/lib/net/SocketMultiplexer.h @@ -8,9 +8,10 @@ #pragma once #include "arch/IArchNetwork.h" -#include "common/StdList.h" #include "common/StdMap.h" +#include + template class CondVar; class Mutex; class Thread; diff --git a/src/lib/platform/XWindowsClipboard.h b/src/lib/platform/XWindowsClipboard.h index 11ce56661..fcc0886d7 100644 --- a/src/lib/platform/XWindowsClipboard.h +++ b/src/lib/platform/XWindowsClipboard.h @@ -7,11 +7,11 @@ #pragma once -#include "common/StdList.h" #include "common/StdMap.h" #include "deskflow/ClipboardTypes.h" #include "deskflow/IClipboard.h" +#include #include #if X_DISPLAY_MISSING