From 4fe38023aa34e4dd1baf803288dae42e829f973a Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Thu, 14 Sep 2017 13:28:16 +0100 Subject: [PATCH] #6151 Rename synergy lib to core lib --- src/lib/CMakeLists.txt | 2 +- src/lib/arch/win32/ArchTaskBarWindows.cpp | 2 +- src/lib/client/CMakeLists.txt | 2 +- src/lib/client/Client.cpp | 18 +++++++-------- src/lib/client/Client.h | 10 ++++----- src/lib/client/ServerProxy.cpp | 14 ++++++------ src/lib/client/ServerProxy.h | 4 ++-- src/lib/ipc/CMakeLists.txt | 2 +- src/lib/ipc/IpcClientProxy.cpp | 2 +- src/lib/ipc/IpcServerProxy.cpp | 2 +- src/lib/platform/CMakeLists.txt | 2 +- src/lib/platform/IOSXKeyResource.h | 2 +- src/lib/platform/MSWindowsClipboard.h | 2 +- src/lib/platform/MSWindowsClipboardFacade.h | 2 +- src/lib/platform/MSWindowsDesks.cpp | 4 ++-- src/lib/platform/MSWindowsDesks.h | 6 ++--- src/lib/platform/MSWindowsHook.cpp | 2 +- src/lib/platform/MSWindowsKeyState.h | 2 +- src/lib/platform/MSWindowsScreen.cpp | 12 +++++----- src/lib/platform/MSWindowsScreen.h | 4 ++-- src/lib/platform/MSWindowsScreenSaver.h | 2 +- src/lib/platform/MSWindowsSession.cpp | 2 +- src/lib/platform/MSWindowsWatchdog.cpp | 4 ++-- src/lib/platform/MSWindowsWatchdog.h | 2 +- src/lib/platform/OSXClipboard.cpp | 2 +- src/lib/platform/OSXClipboard.h | 2 +- src/lib/platform/OSXKeyState.h | 2 +- src/lib/platform/OSXMediaKeySimulator.h | 2 +- src/lib/platform/OSXMediaKeySupport.h | 2 +- src/lib/platform/OSXScreen.h | 4 ++-- src/lib/platform/OSXScreen.mm | 6 ++--- src/lib/platform/OSXScreenSaver.cpp | 2 +- src/lib/platform/OSXScreenSaver.h | 2 +- src/lib/platform/OSXUchrKeyResource.h | 2 +- src/lib/platform/XWindowsClipboard.h | 4 ++-- src/lib/platform/XWindowsKeyState.h | 2 +- src/lib/platform/XWindowsScreen.cpp | 6 ++--- src/lib/platform/XWindowsScreen.h | 4 ++-- src/lib/platform/XWindowsScreenSaver.cpp | 2 +- src/lib/platform/XWindowsScreenSaver.h | 2 +- src/lib/platform/XWindowsUtil.cpp | 2 +- src/lib/server/BaseClientProxy.h | 2 +- src/lib/server/CMakeLists.txt | 2 +- src/lib/server/ClientListener.cpp | 2 +- src/lib/server/ClientProxy.cpp | 2 +- src/lib/server/ClientProxy1_0.cpp | 4 ++-- src/lib/server/ClientProxy1_0.h | 4 ++-- src/lib/server/ClientProxy1_1.cpp | 2 +- src/lib/server/ClientProxy1_2.cpp | 2 +- src/lib/server/ClientProxy1_3.cpp | 2 +- src/lib/server/ClientProxy1_4.cpp | 2 +- src/lib/server/ClientProxy1_5.cpp | 6 ++--- src/lib/server/ClientProxy1_6.cpp | 6 ++--- src/lib/server/ClientProxyUnknown.cpp | 6 ++--- src/lib/server/Config.cpp | 4 ++-- src/lib/server/Config.h | 6 ++--- src/lib/server/InputFilter.cpp | 2 +- src/lib/server/InputFilter.h | 8 +++---- src/lib/server/PrimaryClient.cpp | 4 ++-- src/lib/server/PrimaryClient.h | 2 +- src/lib/server/Server.cpp | 22 +++++++++---------- src/lib/server/Server.h | 14 ++++++------ src/lib/synwinhk/synwinhk.cpp | 2 +- src/test/integtests/net/NetworkTests.cpp | 4 ++-- src/test/mock/synergy/MockApp.h | 2 +- src/test/mock/synergy/MockArgParser.h | 2 +- src/test/mock/synergy/MockKeyMap.h | 2 +- src/test/mock/synergy/MockKeyState.h | 2 +- src/test/mock/synergy/MockScreen.h | 2 +- src/test/unittests/synergy/ArgParserTests.cpp | 4 ++-- .../synergy/ClientArgsParsingTests.cpp | 4 ++-- .../unittests/synergy/ClipboardChunkTests.cpp | 4 ++-- src/test/unittests/synergy/ClipboardTests.cpp | 2 +- .../synergy/DeprecatedArgsParsingTests.cpp | 2 +- .../synergy/GenericArgsParsingTests.cpp | 5 ++--- src/test/unittests/synergy/KeyMapTests.cpp | 2 +- .../synergy/ServerArgsParsingTests.cpp | 4 ++-- 77 files changed, 150 insertions(+), 151 deletions(-) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 7b78bc96..23189121 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -14,6 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +add_subdirectory(core) add_subdirectory(arch) add_subdirectory(base) add_subdirectory(client) @@ -24,7 +25,6 @@ add_subdirectory(mt) add_subdirectory(net) add_subdirectory(platform) add_subdirectory(server) -add_subdirectory(synergy) add_subdirectory(shared) if (WIN32) diff --git a/src/lib/arch/win32/ArchTaskBarWindows.cpp b/src/lib/arch/win32/ArchTaskBarWindows.cpp index 61376674..0fa8dbe2 100644 --- a/src/lib/arch/win32/ArchTaskBarWindows.cpp +++ b/src/lib/arch/win32/ArchTaskBarWindows.cpp @@ -21,7 +21,7 @@ #include "arch/IArchTaskBarReceiver.h" #include "arch/Arch.h" #include "arch/XArch.h" -#include "synergy/win32/AppUtilWindows.h" +#include "core/win32/AppUtilWindows.h" #include #include diff --git a/src/lib/client/CMakeLists.txt b/src/lib/client/CMakeLists.txt index 3e8dc7fc..87611e86 100644 --- a/src/lib/client/CMakeLists.txt +++ b/src/lib/client/CMakeLists.txt @@ -24,5 +24,5 @@ endif() add_library(client STATIC ${sources}) if (UNIX) - target_link_libraries(client synlib io) + target_link_libraries(client core io) endif() diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp index c744ec2b..2f0a4803 100644 --- a/src/lib/client/Client.cpp +++ b/src/lib/client/Client.cpp @@ -19,15 +19,15 @@ #include "client/Client.h" #include "client/ServerProxy.h" -#include "synergy/Screen.h" -#include "synergy/FileChunk.h" -#include "synergy/DropHelper.h" -#include "synergy/PacketStreamFilter.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/protocol_types.h" -#include "synergy/XSynergy.h" -#include "synergy/StreamChunker.h" -#include "synergy/IPlatformScreen.h" +#include "core/Screen.h" +#include "core/FileChunk.h" +#include "core/DropHelper.h" +#include "core/PacketStreamFilter.h" +#include "core/ProtocolUtil.h" +#include "core/protocol_types.h" +#include "core/XSynergy.h" +#include "core/StreamChunker.h" +#include "core/IPlatformScreen.h" #include "mt/Thread.h" #include "net/TCPSocket.h" #include "net/IDataSocket.h" diff --git a/src/lib/client/Client.h b/src/lib/client/Client.h index 02b5fa9a..fc852208 100644 --- a/src/lib/client/Client.h +++ b/src/lib/client/Client.h @@ -18,12 +18,12 @@ #pragma once -#include "synergy/IClient.h" +#include "core/IClient.h" -#include "synergy/Clipboard.h" -#include "synergy/DragInformation.h" -#include "synergy/INode.h" -#include "synergy/ClientArgs.h" +#include "core/Clipboard.h" +#include "core/DragInformation.h" +#include "core/INode.h" +#include "core/ClientArgs.h" #include "net/NetworkAddress.h" #include "base/EventTypes.h" #include "mt/CondVar.h" diff --git a/src/lib/client/ServerProxy.cpp b/src/lib/client/ServerProxy.cpp index ae5d9fc5..f8b7c91b 100644 --- a/src/lib/client/ServerProxy.cpp +++ b/src/lib/client/ServerProxy.cpp @@ -19,13 +19,13 @@ #include "client/ServerProxy.h" #include "client/Client.h" -#include "synergy/FileChunk.h" -#include "synergy/ClipboardChunk.h" -#include "synergy/StreamChunker.h" -#include "synergy/Clipboard.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/option_types.h" -#include "synergy/protocol_types.h" +#include "core/FileChunk.h" +#include "core/ClipboardChunk.h" +#include "core/StreamChunker.h" +#include "core/Clipboard.h" +#include "core/ProtocolUtil.h" +#include "core/option_types.h" +#include "core/protocol_types.h" #include "io/IStream.h" #include "base/Log.h" #include "base/IEventQueue.h" diff --git a/src/lib/client/ServerProxy.h b/src/lib/client/ServerProxy.h index a9f217a1..234894dd 100644 --- a/src/lib/client/ServerProxy.h +++ b/src/lib/client/ServerProxy.h @@ -18,8 +18,8 @@ #pragma once -#include "synergy/clipboard_types.h" -#include "synergy/key_types.h" +#include "core/clipboard_types.h" +#include "core/key_types.h" #include "base/Event.h" #include "base/Stopwatch.h" #include "base/String.h" diff --git a/src/lib/ipc/CMakeLists.txt b/src/lib/ipc/CMakeLists.txt index 8615a50d..0759ce7c 100644 --- a/src/lib/ipc/CMakeLists.txt +++ b/src/lib/ipc/CMakeLists.txt @@ -24,5 +24,5 @@ endif() add_library(ipc STATIC ${sources}) if (UNIX) - target_link_libraries(ipc arch base common mt io net synlib) + target_link_libraries(ipc arch base common mt io net core) endif() diff --git a/src/lib/ipc/IpcClientProxy.cpp b/src/lib/ipc/IpcClientProxy.cpp index bbebf9a8..2a279f69 100644 --- a/src/lib/ipc/IpcClientProxy.cpp +++ b/src/lib/ipc/IpcClientProxy.cpp @@ -20,7 +20,7 @@ #include "ipc/Ipc.h" #include "ipc/IpcMessage.h" -#include "synergy/ProtocolUtil.h" +#include "core/ProtocolUtil.h" #include "io/IStream.h" #include "arch/Arch.h" #include "base/TMethodEventJob.h" diff --git a/src/lib/ipc/IpcServerProxy.cpp b/src/lib/ipc/IpcServerProxy.cpp index 3cf59f7b..8b631412 100644 --- a/src/lib/ipc/IpcServerProxy.cpp +++ b/src/lib/ipc/IpcServerProxy.cpp @@ -20,7 +20,7 @@ #include "ipc/IpcMessage.h" #include "ipc/Ipc.h" -#include "synergy/ProtocolUtil.h" +#include "core/ProtocolUtil.h" #include "io/IStream.h" #include "base/TMethodEventJob.h" #include "base/Log.h" diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt index af36c55f..aee03738 100644 --- a/src/lib/platform/CMakeLists.txt +++ b/src/lib/platform/CMakeLists.txt @@ -40,7 +40,7 @@ add_library(platform STATIC ${sources}) target_link_libraries(platform client ${libs}) if (UNIX) - target_link_libraries(platform io net ipc synlib client ${libs}) + target_link_libraries(platform io net ipc core client ${libs}) endif() if (APPLE) diff --git a/src/lib/platform/IOSXKeyResource.h b/src/lib/platform/IOSXKeyResource.h index 71770828..7d9b0fcd 100644 --- a/src/lib/platform/IOSXKeyResource.h +++ b/src/lib/platform/IOSXKeyResource.h @@ -17,7 +17,7 @@ #pragma once -#include "synergy/KeyState.h" +#include "core/KeyState.h" class IOSXKeyResource : public IInterface { public: diff --git a/src/lib/platform/MSWindowsClipboard.h b/src/lib/platform/MSWindowsClipboard.h index c0f47cc1..c1c733bc 100644 --- a/src/lib/platform/MSWindowsClipboard.h +++ b/src/lib/platform/MSWindowsClipboard.h @@ -19,7 +19,7 @@ #pragma once #include "platform/MSWindowsClipboardFacade.h" -#include "synergy/IClipboard.h" +#include "core/IClipboard.h" #include "common/stdvector.h" #define WIN32_LEAN_AND_MEAN diff --git a/src/lib/platform/MSWindowsClipboardFacade.h b/src/lib/platform/MSWindowsClipboardFacade.h index a256dace..57507316 100644 --- a/src/lib/platform/MSWindowsClipboardFacade.h +++ b/src/lib/platform/MSWindowsClipboardFacade.h @@ -20,7 +20,7 @@ #include "platform/IMSWindowsClipboardFacade.h" -#include "synergy/IClipboard.h" +#include "core/IClipboard.h" class MSWindowsClipboardFacade : public IMSWindowsClipboardFacade { diff --git a/src/lib/platform/MSWindowsDesks.cpp b/src/lib/platform/MSWindowsDesks.cpp index 4b761bf5..b7d67440 100644 --- a/src/lib/platform/MSWindowsDesks.cpp +++ b/src/lib/platform/MSWindowsDesks.cpp @@ -20,8 +20,8 @@ #include "synwinhk/synwinhk.h" #include "platform/MSWindowsScreen.h" -#include "synergy/IScreenSaver.h" -#include "synergy/XScreen.h" +#include "core/IScreenSaver.h" +#include "core/XScreen.h" #include "mt/Lock.h" #include "mt/Thread.h" #include "arch/win32/ArchMiscWindows.h" diff --git a/src/lib/platform/MSWindowsDesks.h b/src/lib/platform/MSWindowsDesks.h index d12900a1..251020c1 100644 --- a/src/lib/platform/MSWindowsDesks.h +++ b/src/lib/platform/MSWindowsDesks.h @@ -19,9 +19,9 @@ #pragma once #include "synwinhk/synwinhk.h" -#include "synergy/key_types.h" -#include "synergy/mouse_types.h" -#include "synergy/option_types.h" +#include "core/key_types.h" +#include "core/mouse_types.h" +#include "core/option_types.h" #include "mt/CondVar.h" #include "mt/Mutex.h" #include "base/String.h" diff --git a/src/lib/platform/MSWindowsHook.cpp b/src/lib/platform/MSWindowsHook.cpp index f127ae98..105298c1 100644 --- a/src/lib/platform/MSWindowsHook.cpp +++ b/src/lib/platform/MSWindowsHook.cpp @@ -18,7 +18,7 @@ #include "platform/MSWindowsHook.h" -#include "synergy/XScreen.h" +#include "core/XScreen.h" #include "base/Log.h" static const char* g_name = "synwinhk"; diff --git a/src/lib/platform/MSWindowsKeyState.h b/src/lib/platform/MSWindowsKeyState.h index fcbd5d98..782e2746 100644 --- a/src/lib/platform/MSWindowsKeyState.h +++ b/src/lib/platform/MSWindowsKeyState.h @@ -18,7 +18,7 @@ #pragma once -#include "synergy/KeyState.h" +#include "core/KeyState.h" #include "base/String.h" #include "common/stdvector.h" diff --git a/src/lib/platform/MSWindowsScreen.cpp b/src/lib/platform/MSWindowsScreen.cpp index f317ea26..9180c4bb 100644 --- a/src/lib/platform/MSWindowsScreen.cpp +++ b/src/lib/platform/MSWindowsScreen.cpp @@ -25,12 +25,12 @@ #include "platform/MSWindowsEventQueueBuffer.h" #include "platform/MSWindowsKeyState.h" #include "platform/MSWindowsScreenSaver.h" -#include "synergy/Clipboard.h" -#include "synergy/KeyMap.h" -#include "synergy/XScreen.h" -#include "synergy/App.h" -#include "synergy/ArgsBase.h" -#include "synergy/ClientApp.h" +#include "core/Clipboard.h" +#include "core/KeyMap.h" +#include "core/XScreen.h" +#include "core/App.h" +#include "core/ArgsBase.h" +#include "core/ClientApp.h" #include "mt/Lock.h" #include "mt/Thread.h" #include "arch/win32/ArchMiscWindows.h" diff --git a/src/lib/platform/MSWindowsScreen.h b/src/lib/platform/MSWindowsScreen.h index 5aafd577..41161ab6 100644 --- a/src/lib/platform/MSWindowsScreen.h +++ b/src/lib/platform/MSWindowsScreen.h @@ -19,8 +19,8 @@ #pragma once #include "platform/MSWindowsHook.h" -#include "synergy/PlatformScreen.h" -#include "synergy/DragInformation.h" +#include "core/PlatformScreen.h" +#include "core/DragInformation.h" #include "synwinhk/synwinhk.h" #include "mt/CondVar.h" #include "mt/Mutex.h" diff --git a/src/lib/platform/MSWindowsScreenSaver.h b/src/lib/platform/MSWindowsScreenSaver.h index c7441283..489ae22c 100644 --- a/src/lib/platform/MSWindowsScreenSaver.h +++ b/src/lib/platform/MSWindowsScreenSaver.h @@ -18,7 +18,7 @@ #pragma once -#include "synergy/IScreenSaver.h" +#include "core/IScreenSaver.h" #include "base/String.h" #define WIN32_LEAN_AND_MEAN diff --git a/src/lib/platform/MSWindowsSession.cpp b/src/lib/platform/MSWindowsSession.cpp index b70de74c..37298b55 100644 --- a/src/lib/platform/MSWindowsSession.cpp +++ b/src/lib/platform/MSWindowsSession.cpp @@ -18,7 +18,7 @@ #include "platform/MSWindowsSession.h" #include "arch/win32/XArchWindows.h" -#include "synergy/XSynergy.h" +#include "core/XSynergy.h" #include "base/Log.h" #include diff --git a/src/lib/platform/MSWindowsWatchdog.cpp b/src/lib/platform/MSWindowsWatchdog.cpp index 3f37d368..11d52a4b 100644 --- a/src/lib/platform/MSWindowsWatchdog.cpp +++ b/src/lib/platform/MSWindowsWatchdog.cpp @@ -22,8 +22,8 @@ #include "ipc/IpcServer.h" #include "ipc/IpcMessage.h" #include "ipc/Ipc.h" -#include "synergy/App.h" -#include "synergy/ArgsBase.h" +#include "core/App.h" +#include "core/ArgsBase.h" #include "mt/Thread.h" #include "arch/win32/ArchDaemonWindows.h" #include "arch/win32/XArchWindows.h" diff --git a/src/lib/platform/MSWindowsWatchdog.h b/src/lib/platform/MSWindowsWatchdog.h index 76546539..18145e2c 100644 --- a/src/lib/platform/MSWindowsWatchdog.h +++ b/src/lib/platform/MSWindowsWatchdog.h @@ -19,7 +19,7 @@ #pragma once #include "platform/MSWindowsSession.h" -#include "synergy/XSynergy.h" +#include "core/XSynergy.h" #include "arch/IArchMultithread.h" #define WIN32_LEAN_AND_MEAN diff --git a/src/lib/platform/OSXClipboard.cpp b/src/lib/platform/OSXClipboard.cpp index 7212175c..36c7f00c 100644 --- a/src/lib/platform/OSXClipboard.cpp +++ b/src/lib/platform/OSXClipboard.cpp @@ -18,7 +18,7 @@ #include "platform/OSXClipboard.h" -#include "synergy/Clipboard.h" +#include "core/Clipboard.h" #include "platform/OSXClipboardUTF16Converter.h" #include "platform/OSXClipboardTextConverter.h" #include "platform/OSXClipboardBMPConverter.h" diff --git a/src/lib/platform/OSXClipboard.h b/src/lib/platform/OSXClipboard.h index e9d01a70..97c70644 100644 --- a/src/lib/platform/OSXClipboard.h +++ b/src/lib/platform/OSXClipboard.h @@ -18,7 +18,7 @@ #pragma once -#include "synergy/IClipboard.h" +#include "core/IClipboard.h" #include #include diff --git a/src/lib/platform/OSXKeyState.h b/src/lib/platform/OSXKeyState.h index ac951671..4ffa679c 100644 --- a/src/lib/platform/OSXKeyState.h +++ b/src/lib/platform/OSXKeyState.h @@ -18,7 +18,7 @@ #pragma once -#include "synergy/KeyState.h" +#include "core/KeyState.h" #include "common/stdmap.h" #include "common/stdset.h" #include "common/stdvector.h" diff --git a/src/lib/platform/OSXMediaKeySimulator.h b/src/lib/platform/OSXMediaKeySimulator.h index 75145480..1c7ce9cf 100644 --- a/src/lib/platform/OSXMediaKeySimulator.h +++ b/src/lib/platform/OSXMediaKeySimulator.h @@ -19,7 +19,7 @@ #import -#include "synergy/key_types.h" +#include "core/key_types.h" #if defined(__cplusplus) extern "C" { diff --git a/src/lib/platform/OSXMediaKeySupport.h b/src/lib/platform/OSXMediaKeySupport.h index 3cecaacf..d5f39ed3 100644 --- a/src/lib/platform/OSXMediaKeySupport.h +++ b/src/lib/platform/OSXMediaKeySupport.h @@ -20,7 +20,7 @@ #import #import -#include "synergy/key_types.h" +#include "core/key_types.h" #if defined(__cplusplus) extern "C" { diff --git a/src/lib/platform/OSXScreen.h b/src/lib/platform/OSXScreen.h index 668e713b..ea89a82d 100644 --- a/src/lib/platform/OSXScreen.h +++ b/src/lib/platform/OSXScreen.h @@ -19,8 +19,8 @@ #pragma once #include "platform/OSXClipboard.h" -#include "synergy/PlatformScreen.h" -#include "synergy/DragInformation.h" +#include "core/PlatformScreen.h" +#include "core/DragInformation.h" #include "base/EventTypes.h" #include "common/stdmap.h" #include "common/stdvector.h" diff --git a/src/lib/platform/OSXScreen.mm b/src/lib/platform/OSXScreen.mm index 80d155d2..3bc23d03 100644 --- a/src/lib/platform/OSXScreen.mm +++ b/src/lib/platform/OSXScreen.mm @@ -27,9 +27,9 @@ #include "platform/OSXDragSimulator.h" #include "platform/OSXMediaKeySupport.h" #include "platform/OSXPasteboardPeeker.h" -#include "synergy/Clipboard.h" -#include "synergy/KeyMap.h" -#include "synergy/ClientApp.h" +#include "core/Clipboard.h" +#include "core/KeyMap.h" +#include "core/ClientApp.h" #include "mt/CondVar.h" #include "mt/Lock.h" #include "mt/Mutex.h" diff --git a/src/lib/platform/OSXScreenSaver.cpp b/src/lib/platform/OSXScreenSaver.cpp index 49fe8fe8..458ca482 100644 --- a/src/lib/platform/OSXScreenSaver.cpp +++ b/src/lib/platform/OSXScreenSaver.cpp @@ -19,7 +19,7 @@ #import "platform/OSXScreenSaver.h" #import "platform/OSXScreenSaverUtil.h" -#import "synergy/IPrimaryScreen.h" +#import "core/IPrimaryScreen.h" #import "base/Log.h" #import "base/IEventQueue.h" diff --git a/src/lib/platform/OSXScreenSaver.h b/src/lib/platform/OSXScreenSaver.h index 2427ba8d..77dfb1f8 100644 --- a/src/lib/platform/OSXScreenSaver.h +++ b/src/lib/platform/OSXScreenSaver.h @@ -18,7 +18,7 @@ #pragma once -#include "synergy/IScreenSaver.h" +#include "core/IScreenSaver.h" #include diff --git a/src/lib/platform/OSXUchrKeyResource.h b/src/lib/platform/OSXUchrKeyResource.h index bbb8fd2b..13c5402c 100644 --- a/src/lib/platform/OSXUchrKeyResource.h +++ b/src/lib/platform/OSXUchrKeyResource.h @@ -17,7 +17,7 @@ #pragma once -#include "synergy/KeyState.h" +#include "core/KeyState.h" #include "platform/IOSXKeyResource.h" #include diff --git a/src/lib/platform/XWindowsClipboard.h b/src/lib/platform/XWindowsClipboard.h index 9e6fbd47..7d65579b 100644 --- a/src/lib/platform/XWindowsClipboard.h +++ b/src/lib/platform/XWindowsClipboard.h @@ -18,8 +18,8 @@ #pragma once -#include "synergy/clipboard_types.h" -#include "synergy/IClipboard.h" +#include "core/clipboard_types.h" +#include "core/IClipboard.h" #include "common/stdmap.h" #include "common/stdlist.h" #include "common/stdvector.h" diff --git a/src/lib/platform/XWindowsKeyState.h b/src/lib/platform/XWindowsKeyState.h index 9b389794..a47c2c59 100644 --- a/src/lib/platform/XWindowsKeyState.h +++ b/src/lib/platform/XWindowsKeyState.h @@ -18,7 +18,7 @@ #pragma once -#include "synergy/KeyState.h" +#include "core/KeyState.h" #include "common/stdmap.h" #include "common/stdvector.h" diff --git a/src/lib/platform/XWindowsScreen.cpp b/src/lib/platform/XWindowsScreen.cpp index 42742ad0..de8766aa 100644 --- a/src/lib/platform/XWindowsScreen.cpp +++ b/src/lib/platform/XWindowsScreen.cpp @@ -23,9 +23,9 @@ #include "platform/XWindowsKeyState.h" #include "platform/XWindowsScreenSaver.h" #include "platform/XWindowsUtil.h" -#include "synergy/Clipboard.h" -#include "synergy/KeyMap.h" -#include "synergy/XScreen.h" +#include "core/Clipboard.h" +#include "core/KeyMap.h" +#include "core/XScreen.h" #include "arch/XArch.h" #include "arch/Arch.h" #include "base/Log.h" diff --git a/src/lib/platform/XWindowsScreen.h b/src/lib/platform/XWindowsScreen.h index 89524490..40422da6 100644 --- a/src/lib/platform/XWindowsScreen.h +++ b/src/lib/platform/XWindowsScreen.h @@ -18,8 +18,8 @@ #pragma once -#include "synergy/PlatformScreen.h" -#include "synergy/KeyMap.h" +#include "core/PlatformScreen.h" +#include "core/KeyMap.h" #include "common/stdset.h" #include "common/stdvector.h" diff --git a/src/lib/platform/XWindowsScreenSaver.cpp b/src/lib/platform/XWindowsScreenSaver.cpp index 239ddc14..ab4069af 100644 --- a/src/lib/platform/XWindowsScreenSaver.cpp +++ b/src/lib/platform/XWindowsScreenSaver.cpp @@ -19,7 +19,7 @@ #include "platform/XWindowsScreenSaver.h" #include "platform/XWindowsUtil.h" -#include "synergy/IPlatformScreen.h" +#include "core/IPlatformScreen.h" #include "base/Log.h" #include "base/Event.h" #include "base/IEventQueue.h" diff --git a/src/lib/platform/XWindowsScreenSaver.h b/src/lib/platform/XWindowsScreenSaver.h index 1b3b0928..452d9594 100644 --- a/src/lib/platform/XWindowsScreenSaver.h +++ b/src/lib/platform/XWindowsScreenSaver.h @@ -18,7 +18,7 @@ #pragma once -#include "synergy/IScreenSaver.h" +#include "core/IScreenSaver.h" #include "base/IEventQueue.h" #include "common/stdmap.h" diff --git a/src/lib/platform/XWindowsUtil.cpp b/src/lib/platform/XWindowsUtil.cpp index cfef8cf4..c0625bc6 100644 --- a/src/lib/platform/XWindowsUtil.cpp +++ b/src/lib/platform/XWindowsUtil.cpp @@ -18,7 +18,7 @@ #include "platform/XWindowsUtil.h" -#include "synergy/key_types.h" +#include "core/key_types.h" #include "mt/Thread.h" #include "base/Log.h" #include "base/String.h" diff --git a/src/lib/server/BaseClientProxy.h b/src/lib/server/BaseClientProxy.h index 22076c7c..90034952 100644 --- a/src/lib/server/BaseClientProxy.h +++ b/src/lib/server/BaseClientProxy.h @@ -18,7 +18,7 @@ #pragma once -#include "synergy/IClient.h" +#include "core/IClient.h" #include "base/String.h" namespace synergy { class IStream; } diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt index 1fc7154d..1c03da22 100644 --- a/src/lib/server/CMakeLists.txt +++ b/src/lib/server/CMakeLists.txt @@ -26,5 +26,5 @@ add_library(server STATIC ${sources}) target_link_libraries(server shared) if (UNIX) - target_link_libraries(server synlib) + target_link_libraries(server core) endif() diff --git a/src/lib/server/ClientListener.cpp b/src/lib/server/ClientListener.cpp index 0ecdb0e6..0d07e766 100644 --- a/src/lib/server/ClientListener.cpp +++ b/src/lib/server/ClientListener.cpp @@ -20,7 +20,7 @@ #include "server/ClientProxy.h" #include "server/ClientProxyUnknown.h" -#include "synergy/PacketStreamFilter.h" +#include "core/PacketStreamFilter.h" #include "net/IDataSocket.h" #include "net/IListenSocket.h" #include "net/ISocketFactory.h" diff --git a/src/lib/server/ClientProxy.cpp b/src/lib/server/ClientProxy.cpp index 404ce2c6..248b2ba8 100644 --- a/src/lib/server/ClientProxy.cpp +++ b/src/lib/server/ClientProxy.cpp @@ -18,7 +18,7 @@ #include "server/ClientProxy.h" -#include "synergy/ProtocolUtil.h" +#include "core/ProtocolUtil.h" #include "io/IStream.h" #include "base/Log.h" #include "base/EventQueue.h" diff --git a/src/lib/server/ClientProxy1_0.cpp b/src/lib/server/ClientProxy1_0.cpp index 429973f1..1fada449 100644 --- a/src/lib/server/ClientProxy1_0.cpp +++ b/src/lib/server/ClientProxy1_0.cpp @@ -18,8 +18,8 @@ #include "server/ClientProxy1_0.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/XSynergy.h" +#include "core/ProtocolUtil.h" +#include "core/XSynergy.h" #include "io/IStream.h" #include "base/Log.h" #include "base/IEventQueue.h" diff --git a/src/lib/server/ClientProxy1_0.h b/src/lib/server/ClientProxy1_0.h index e40f8d86..96fc4c8c 100644 --- a/src/lib/server/ClientProxy1_0.h +++ b/src/lib/server/ClientProxy1_0.h @@ -19,8 +19,8 @@ #pragma once #include "server/ClientProxy.h" -#include "synergy/Clipboard.h" -#include "synergy/protocol_types.h" +#include "core/Clipboard.h" +#include "core/protocol_types.h" class Event; class EventQueueTimer; diff --git a/src/lib/server/ClientProxy1_1.cpp b/src/lib/server/ClientProxy1_1.cpp index e445d322..ce6b7443 100644 --- a/src/lib/server/ClientProxy1_1.cpp +++ b/src/lib/server/ClientProxy1_1.cpp @@ -18,7 +18,7 @@ #include "server/ClientProxy1_1.h" -#include "synergy/ProtocolUtil.h" +#include "core/ProtocolUtil.h" #include "base/Log.h" #include diff --git a/src/lib/server/ClientProxy1_2.cpp b/src/lib/server/ClientProxy1_2.cpp index d6aca0f4..05f62f47 100644 --- a/src/lib/server/ClientProxy1_2.cpp +++ b/src/lib/server/ClientProxy1_2.cpp @@ -18,7 +18,7 @@ #include "server/ClientProxy1_2.h" -#include "synergy/ProtocolUtil.h" +#include "core/ProtocolUtil.h" #include "base/Log.h" // diff --git a/src/lib/server/ClientProxy1_3.cpp b/src/lib/server/ClientProxy1_3.cpp index 9f923595..3de7a9ee 100644 --- a/src/lib/server/ClientProxy1_3.cpp +++ b/src/lib/server/ClientProxy1_3.cpp @@ -18,7 +18,7 @@ #include "server/ClientProxy1_3.h" -#include "synergy/ProtocolUtil.h" +#include "core/ProtocolUtil.h" #include "base/Log.h" #include "base/IEventQueue.h" #include "base/TMethodEventJob.h" diff --git a/src/lib/server/ClientProxy1_4.cpp b/src/lib/server/ClientProxy1_4.cpp index 52f105df..49669f9f 100644 --- a/src/lib/server/ClientProxy1_4.cpp +++ b/src/lib/server/ClientProxy1_4.cpp @@ -19,7 +19,7 @@ #include "server/ClientProxy1_4.h" #include "server/Server.h" -#include "synergy/ProtocolUtil.h" +#include "core/ProtocolUtil.h" #include "base/Log.h" #include "base/IEventQueue.h" #include "base/TMethodEventJob.h" diff --git a/src/lib/server/ClientProxy1_5.cpp b/src/lib/server/ClientProxy1_5.cpp index 91560c08..812fe545 100644 --- a/src/lib/server/ClientProxy1_5.cpp +++ b/src/lib/server/ClientProxy1_5.cpp @@ -18,9 +18,9 @@ #include "server/ClientProxy1_5.h" #include "server/Server.h" -#include "synergy/FileChunk.h" -#include "synergy/StreamChunker.h" -#include "synergy/ProtocolUtil.h" +#include "core/FileChunk.h" +#include "core/StreamChunker.h" +#include "core/ProtocolUtil.h" #include "io/IStream.h" #include "base/TMethodEventJob.h" #include "base/Log.h" diff --git a/src/lib/server/ClientProxy1_6.cpp b/src/lib/server/ClientProxy1_6.cpp index deb70e13..f36a9f0c 100644 --- a/src/lib/server/ClientProxy1_6.cpp +++ b/src/lib/server/ClientProxy1_6.cpp @@ -18,9 +18,9 @@ #include "server/ClientProxy1_6.h" #include "server/Server.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/StreamChunker.h" -#include "synergy/ClipboardChunk.h" +#include "core/ProtocolUtil.h" +#include "core/StreamChunker.h" +#include "core/ClipboardChunk.h" #include "io/IStream.h" #include "base/TMethodEventJob.h" #include "base/Log.h" diff --git a/src/lib/server/ClientProxyUnknown.cpp b/src/lib/server/ClientProxyUnknown.cpp index 7df67c0f..bc0fd4a6 100644 --- a/src/lib/server/ClientProxyUnknown.cpp +++ b/src/lib/server/ClientProxyUnknown.cpp @@ -26,9 +26,9 @@ #include "server/ClientProxy1_4.h" #include "server/ClientProxy1_5.h" #include "server/ClientProxy1_6.h" -#include "synergy/protocol_types.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/XSynergy.h" +#include "core/protocol_types.h" +#include "core/ProtocolUtil.h" +#include "core/XSynergy.h" #include "io/IStream.h" #include "io/XIO.h" #include "base/Log.h" diff --git a/src/lib/server/Config.cpp b/src/lib/server/Config.cpp index e50cf1d2..c5cf8573 100644 --- a/src/lib/server/Config.cpp +++ b/src/lib/server/Config.cpp @@ -19,8 +19,8 @@ #include "server/Config.h" #include "server/Server.h" -#include "synergy/KeyMap.h" -#include "synergy/key_types.h" +#include "core/KeyMap.h" +#include "core/key_types.h" #include "net/XSocket.h" #include "base/IEventQueue.h" #include "common/stdistream.h" diff --git a/src/lib/server/Config.h b/src/lib/server/Config.h index 75b37203..5b2ab865 100644 --- a/src/lib/server/Config.h +++ b/src/lib/server/Config.h @@ -19,9 +19,9 @@ #pragma once #include "server/InputFilter.h" -#include "synergy/option_types.h" -#include "synergy/protocol_types.h" -#include "synergy/IPlatformScreen.h" +#include "core/option_types.h" +#include "core/protocol_types.h" +#include "core/IPlatformScreen.h" #include "net/NetworkAddress.h" #include "base/String.h" #include "base/XBase.h" diff --git a/src/lib/server/InputFilter.cpp b/src/lib/server/InputFilter.cpp index 363ded15..d9c68255 100644 --- a/src/lib/server/InputFilter.cpp +++ b/src/lib/server/InputFilter.cpp @@ -19,7 +19,7 @@ #include "server/InputFilter.h" #include "server/Server.h" #include "server/PrimaryClient.h" -#include "synergy/KeyMap.h" +#include "core/KeyMap.h" #include "base/EventQueue.h" #include "base/Log.h" #include "base/TMethodEventJob.h" diff --git a/src/lib/server/InputFilter.h b/src/lib/server/InputFilter.h index 99564176..601ced42 100644 --- a/src/lib/server/InputFilter.h +++ b/src/lib/server/InputFilter.h @@ -18,10 +18,10 @@ #pragma once -#include "synergy/key_types.h" -#include "synergy/mouse_types.h" -#include "synergy/protocol_types.h" -#include "synergy/IPlatformScreen.h" +#include "core/key_types.h" +#include "core/mouse_types.h" +#include "core/protocol_types.h" +#include "core/IPlatformScreen.h" #include "base/String.h" #include "common/stdmap.h" #include "common/stdset.h" diff --git a/src/lib/server/PrimaryClient.cpp b/src/lib/server/PrimaryClient.cpp index 76731228..63122f54 100644 --- a/src/lib/server/PrimaryClient.cpp +++ b/src/lib/server/PrimaryClient.cpp @@ -18,8 +18,8 @@ #include "server/PrimaryClient.h" -#include "synergy/Screen.h" -#include "synergy/Clipboard.h" +#include "core/Screen.h" +#include "core/Clipboard.h" #include "base/Log.h" // diff --git a/src/lib/server/PrimaryClient.h b/src/lib/server/PrimaryClient.h index f63bbf5c..112bc01b 100644 --- a/src/lib/server/PrimaryClient.h +++ b/src/lib/server/PrimaryClient.h @@ -19,7 +19,7 @@ #pragma once #include "server/BaseClientProxy.h" -#include "synergy/protocol_types.h" +#include "core/protocol_types.h" namespace synergy { class Screen; } diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp index 206b145c..2d071755 100644 --- a/src/lib/server/Server.cpp +++ b/src/lib/server/Server.cpp @@ -22,17 +22,17 @@ #include "server/ClientProxyUnknown.h" #include "server/PrimaryClient.h" #include "server/ClientListener.h" -#include "synergy/FileChunk.h" -#include "synergy/IPlatformScreen.h" -#include "synergy/DropHelper.h" -#include "synergy/option_types.h" -#include "synergy/protocol_types.h" -#include "synergy/XScreen.h" -#include "synergy/XSynergy.h" -#include "synergy/StreamChunker.h" -#include "synergy/KeyState.h" -#include "synergy/Screen.h" -#include "synergy/PacketStreamFilter.h" +#include "core/FileChunk.h" +#include "core/IPlatformScreen.h" +#include "core/DropHelper.h" +#include "core/option_types.h" +#include "core/protocol_types.h" +#include "core/XScreen.h" +#include "core/XSynergy.h" +#include "core/StreamChunker.h" +#include "core/KeyState.h" +#include "core/Screen.h" +#include "core/PacketStreamFilter.h" #include "net/TCPSocket.h" #include "net/IDataSocket.h" #include "net/IListenSocket.h" diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h index a9c5d239..e7e86a31 100644 --- a/src/lib/server/Server.h +++ b/src/lib/server/Server.h @@ -19,13 +19,13 @@ #pragma once #include "server/Config.h" -#include "synergy/clipboard_types.h" -#include "synergy/Clipboard.h" -#include "synergy/key_types.h" -#include "synergy/mouse_types.h" -#include "synergy/INode.h" -#include "synergy/DragInformation.h" -#include "synergy/ServerArgs.h" +#include "core/clipboard_types.h" +#include "core/Clipboard.h" +#include "core/key_types.h" +#include "core/mouse_types.h" +#include "core/INode.h" +#include "core/DragInformation.h" +#include "core/ServerArgs.h" #include "base/Event.h" #include "base/Stopwatch.h" #include "base/EventTypes.h" diff --git a/src/lib/synwinhk/synwinhk.cpp b/src/lib/synwinhk/synwinhk.cpp index eb6fd931..73dca739 100644 --- a/src/lib/synwinhk/synwinhk.cpp +++ b/src/lib/synwinhk/synwinhk.cpp @@ -18,7 +18,7 @@ #include "synwinhk/synwinhk.h" -#include "synergy/protocol_types.h" +#include "core/protocol_types.h" #include #include diff --git a/src/test/integtests/net/NetworkTests.cpp b/src/test/integtests/net/NetworkTests.cpp index 996ead1a..222ddb7f 100644 --- a/src/test/integtests/net/NetworkTests.cpp +++ b/src/test/integtests/net/NetworkTests.cpp @@ -29,8 +29,8 @@ #include "server/ClientListener.h" #include "server/ClientProxy.h" #include "client/Client.h" -#include "synergy/FileChunk.h" -#include "synergy/StreamChunker.h" +#include "core/FileChunk.h" +#include "core/StreamChunker.h" #include "net/SocketMultiplexer.h" #include "net/NetworkAddress.h" #include "net/TCPSocketFactory.h" diff --git a/src/test/mock/synergy/MockApp.h b/src/test/mock/synergy/MockApp.h index ba437b4d..ffffe9a2 100644 --- a/src/test/mock/synergy/MockApp.h +++ b/src/test/mock/synergy/MockApp.h @@ -19,7 +19,7 @@ #define TEST_ENV -#include "synergy/App.h" +#include "core/App.h" #include "test/global/gmock.h" diff --git a/src/test/mock/synergy/MockArgParser.h b/src/test/mock/synergy/MockArgParser.h index 66b14057..d44bcefb 100644 --- a/src/test/mock/synergy/MockArgParser.h +++ b/src/test/mock/synergy/MockArgParser.h @@ -19,7 +19,7 @@ #define TEST_ENV -#include "synergy/ArgParser.h" +#include "core/ArgParser.h" #include "test/global/gmock.h" diff --git a/src/test/mock/synergy/MockKeyMap.h b/src/test/mock/synergy/MockKeyMap.h index d1419ec4..ff6bef1b 100644 --- a/src/test/mock/synergy/MockKeyMap.h +++ b/src/test/mock/synergy/MockKeyMap.h @@ -18,7 +18,7 @@ #pragma once -#include "synergy/KeyMap.h" +#include "core/KeyMap.h" #include "test/global/gmock.h" diff --git a/src/test/mock/synergy/MockKeyState.h b/src/test/mock/synergy/MockKeyState.h index 052201c7..396d0be8 100644 --- a/src/test/mock/synergy/MockKeyState.h +++ b/src/test/mock/synergy/MockKeyState.h @@ -18,7 +18,7 @@ #pragma once -#include "synergy/KeyState.h" +#include "core/KeyState.h" #include "test/global/gmock.h" diff --git a/src/test/mock/synergy/MockScreen.h b/src/test/mock/synergy/MockScreen.h index 2ad2f8e3..a84f8141 100644 --- a/src/test/mock/synergy/MockScreen.h +++ b/src/test/mock/synergy/MockScreen.h @@ -19,7 +19,7 @@ #define TEST_ENV -#include "synergy/Screen.h" +#include "core/Screen.h" #include "test/global/gmock.h" diff --git a/src/test/unittests/synergy/ArgParserTests.cpp b/src/test/unittests/synergy/ArgParserTests.cpp index 504b690e..31095d68 100644 --- a/src/test/unittests/synergy/ArgParserTests.cpp +++ b/src/test/unittests/synergy/ArgParserTests.cpp @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" -#include "synergy/ArgsBase.h" +#include "core/ArgParser.h" +#include "core/ArgsBase.h" #include "test/global/gtest.h" diff --git a/src/test/unittests/synergy/ClientArgsParsingTests.cpp b/src/test/unittests/synergy/ClientArgsParsingTests.cpp index 7a4f9473..7342b693 100644 --- a/src/test/unittests/synergy/ClientArgsParsingTests.cpp +++ b/src/test/unittests/synergy/ClientArgsParsingTests.cpp @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" -#include "synergy/ClientArgs.h" +#include "core/ArgParser.h" +#include "core/ClientArgs.h" #include "test/mock/synergy/MockArgParser.h" #include "test/global/gtest.h" diff --git a/src/test/unittests/synergy/ClipboardChunkTests.cpp b/src/test/unittests/synergy/ClipboardChunkTests.cpp index 1e547a46..1834b6e5 100644 --- a/src/test/unittests/synergy/ClipboardChunkTests.cpp +++ b/src/test/unittests/synergy/ClipboardChunkTests.cpp @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#include "synergy/ClipboardChunk.h" -#include "synergy/protocol_types.h" +#include "core/ClipboardChunk.h" +#include "core/protocol_types.h" #include "test/global/gtest.h" diff --git a/src/test/unittests/synergy/ClipboardTests.cpp b/src/test/unittests/synergy/ClipboardTests.cpp index 2b1b8494..b6aec012 100644 --- a/src/test/unittests/synergy/ClipboardTests.cpp +++ b/src/test/unittests/synergy/ClipboardTests.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/Clipboard.h" +#include "core/Clipboard.h" #include "test/global/gtest.h" diff --git a/src/test/unittests/synergy/DeprecatedArgsParsingTests.cpp b/src/test/unittests/synergy/DeprecatedArgsParsingTests.cpp index 7996c99b..e7c549b7 100644 --- a/src/test/unittests/synergy/DeprecatedArgsParsingTests.cpp +++ b/src/test/unittests/synergy/DeprecatedArgsParsingTests.cpp @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" +#include "core/ArgParser.h" #include "test/global/gtest.h" diff --git a/src/test/unittests/synergy/GenericArgsParsingTests.cpp b/src/test/unittests/synergy/GenericArgsParsingTests.cpp index e2fa954a..f10dad52 100644 --- a/src/test/unittests/synergy/GenericArgsParsingTests.cpp +++ b/src/test/unittests/synergy/GenericArgsParsingTests.cpp @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" -#include "synergy/ArgsBase.h" +#include "core/ArgParser.h" +#include "core/ArgsBase.h" #include "test/mock/synergy/MockApp.h" #include "test/global/gtest.h" @@ -258,7 +258,6 @@ TEST(GenericArgsParsingTests, parseGenericArgs_noTrayCmd_disableTrayTrue) argParser.parseGenericArgs(argc, kNoTrayCmd, i); - EXPECT_EQ(true, argsBase.m_disableTray); EXPECT_EQ(1, i); } diff --git a/src/test/unittests/synergy/KeyMapTests.cpp b/src/test/unittests/synergy/KeyMapTests.cpp index 43847c11..dca1fbd9 100644 --- a/src/test/unittests/synergy/KeyMapTests.cpp +++ b/src/test/unittests/synergy/KeyMapTests.cpp @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/KeyMap.h" +#include "core/KeyMap.h" #include "test/global/gtest.h" #include "test/global/gmock.h" diff --git a/src/test/unittests/synergy/ServerArgsParsingTests.cpp b/src/test/unittests/synergy/ServerArgsParsingTests.cpp index cb330cb6..77a6ca0c 100644 --- a/src/test/unittests/synergy/ServerArgsParsingTests.cpp +++ b/src/test/unittests/synergy/ServerArgsParsingTests.cpp @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" -#include "synergy/ServerArgs.h" +#include "core/ArgParser.h" +#include "core/ServerArgs.h" #include "test/mock/synergy/MockArgParser.h" #include "test/global/gtest.h"