rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#6151 Rename synergy lib to core lib

This commit is contained in:
Nick Bolton 2017-09-14 13:28:16 +01:00
parent ce02171eab
commit 4fe38023aa
77 changed files with 150 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/CMakeLists.txt
View File

@ -14,6 +14,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
add_subdirectory(core)
add_subdirectory(arch) add_subdirectory(arch)
add_subdirectory(base) add_subdirectory(base)
add_subdirectory(client) add_subdirectory(client)
@ -24,7 +25,6 @@ add_subdirectory(mt)
add_subdirectory(net) add_subdirectory(net)
add_subdirectory(platform) add_subdirectory(platform)
add_subdirectory(server) add_subdirectory(server)
add_subdirectory(synergy)
add_subdirectory(shared) add_subdirectory(shared)
if (WIN32) if (WIN32)

2
src/lib/arch/win32/ArchTaskBarWindows.cpp
View File

@ -21,7 +21,7 @@
#include "arch/IArchTaskBarReceiver.h" #include "arch/IArchTaskBarReceiver.h"
#include "arch/Arch.h" #include "arch/Arch.h"
#include "arch/XArch.h" #include "arch/XArch.h"
#include "synergy/win32/AppUtilWindows.h" #include "core/win32/AppUtilWindows.h"
#include <string.h> #include <string.h>
#include <shellapi.h> #include <shellapi.h>

2
src/lib/client/CMakeLists.txt
View File

@ -24,5 +24,5 @@ endif()
add_library(client STATIC ${sources}) add_library(client STATIC ${sources})
if (UNIX) if (UNIX)
target_link_libraries(client synlib io) target_link_libraries(client core io)
endif() endif()

18
src/lib/client/Client.cpp
View File

@ -19,15 +19,15 @@
#include "client/Client.h" #include "client/Client.h"
#include "client/ServerProxy.h" #include "client/ServerProxy.h"
#include "synergy/Screen.h" #include "core/Screen.h"
#include "synergy/FileChunk.h" #include "core/FileChunk.h"
#include "synergy/DropHelper.h" #include "core/DropHelper.h"
#include "synergy/PacketStreamFilter.h" #include "core/PacketStreamFilter.h"
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
#include "synergy/XSynergy.h" #include "core/XSynergy.h"
#include "synergy/StreamChunker.h" #include "core/StreamChunker.h"
#include "synergy/IPlatformScreen.h" #include "core/IPlatformScreen.h"
#include "mt/Thread.h" #include "mt/Thread.h"
#include "net/TCPSocket.h" #include "net/TCPSocket.h"
#include "net/IDataSocket.h" #include "net/IDataSocket.h"

10
src/lib/client/Client.h
View File

@ -18,12 +18,12 @@
#pragma once #pragma once
#include "synergy/IClient.h" #include "core/IClient.h"
#include "synergy/Clipboard.h" #include "core/Clipboard.h"
#include "synergy/DragInformation.h" #include "core/DragInformation.h"
#include "synergy/INode.h" #include "core/INode.h"
#include "synergy/ClientArgs.h" #include "core/ClientArgs.h"
#include "net/NetworkAddress.h" #include "net/NetworkAddress.h"
#include "base/EventTypes.h" #include "base/EventTypes.h"
#include "mt/CondVar.h" #include "mt/CondVar.h"

14
src/lib/client/ServerProxy.cpp
View File

@ -19,13 +19,13 @@
#include "client/ServerProxy.h" #include "client/ServerProxy.h"
#include "client/Client.h" #include "client/Client.h"
#include "synergy/FileChunk.h" #include "core/FileChunk.h"
#include "synergy/ClipboardChunk.h" #include "core/ClipboardChunk.h"
#include "synergy/StreamChunker.h" #include "core/StreamChunker.h"
#include "synergy/Clipboard.h" #include "core/Clipboard.h"
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "synergy/option_types.h" #include "core/option_types.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
#include "io/IStream.h" #include "io/IStream.h"
#include "base/Log.h" #include "base/Log.h"
#include "base/IEventQueue.h" #include "base/IEventQueue.h"

4
src/lib/client/ServerProxy.h
View File

@ -18,8 +18,8 @@
#pragma once #pragma once
#include "synergy/clipboard_types.h" #include "core/clipboard_types.h"
#include "synergy/key_types.h" #include "core/key_types.h"
#include "base/Event.h" #include "base/Event.h"
#include "base/Stopwatch.h" #include "base/Stopwatch.h"
#include "base/String.h" #include "base/String.h"

2
src/lib/ipc/CMakeLists.txt
View File

@ -24,5 +24,5 @@ endif()
add_library(ipc STATIC ${sources}) add_library(ipc STATIC ${sources})
if (UNIX) 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() endif()

2
src/lib/ipc/IpcClientProxy.cpp
View File

@ -20,7 +20,7 @@
#include "ipc/Ipc.h" #include "ipc/Ipc.h"
#include "ipc/IpcMessage.h" #include "ipc/IpcMessage.h"
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "io/IStream.h" #include "io/IStream.h"
#include "arch/Arch.h" #include "arch/Arch.h"
#include "base/TMethodEventJob.h" #include "base/TMethodEventJob.h"

2
src/lib/ipc/IpcServerProxy.cpp
View File

@ -20,7 +20,7 @@
#include "ipc/IpcMessage.h" #include "ipc/IpcMessage.h"
#include "ipc/Ipc.h" #include "ipc/Ipc.h"
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "io/IStream.h" #include "io/IStream.h"
#include "base/TMethodEventJob.h" #include "base/TMethodEventJob.h"
#include "base/Log.h" #include "base/Log.h"

2
src/lib/platform/CMakeLists.txt
View File

@ -40,7 +40,7 @@ add_library(platform STATIC ${sources})
target_link_libraries(platform client ${libs}) target_link_libraries(platform client ${libs})
if (UNIX) if (UNIX)
target_link_libraries(platform io net ipc synlib client ${libs}) target_link_libraries(platform io net ipc core client ${libs})
endif() endif()
if (APPLE) if (APPLE)

2
src/lib/platform/IOSXKeyResource.h
View File

@ -17,7 +17,7 @@
#pragma once #pragma once
#include "synergy/KeyState.h" #include "core/KeyState.h"
class IOSXKeyResource : public IInterface { class IOSXKeyResource : public IInterface {
public: public:

2
src/lib/platform/MSWindowsClipboard.h
View File

@ -19,7 +19,7 @@
#pragma once #pragma once
#include "platform/MSWindowsClipboardFacade.h" #include "platform/MSWindowsClipboardFacade.h"
#include "synergy/IClipboard.h" #include "core/IClipboard.h"
#include "common/stdvector.h" #include "common/stdvector.h"
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN

2
src/lib/platform/MSWindowsClipboardFacade.h
View File

@ -20,7 +20,7 @@
#include "platform/IMSWindowsClipboardFacade.h" #include "platform/IMSWindowsClipboardFacade.h"
#include "synergy/IClipboard.h" #include "core/IClipboard.h"
class MSWindowsClipboardFacade : public IMSWindowsClipboardFacade class MSWindowsClipboardFacade : public IMSWindowsClipboardFacade
{ {

4
src/lib/platform/MSWindowsDesks.cpp
View File

@ -20,8 +20,8 @@
#include "synwinhk/synwinhk.h" #include "synwinhk/synwinhk.h"
#include "platform/MSWindowsScreen.h" #include "platform/MSWindowsScreen.h"
#include "synergy/IScreenSaver.h" #include "core/IScreenSaver.h"
#include "synergy/XScreen.h" #include "core/XScreen.h"
#include "mt/Lock.h" #include "mt/Lock.h"
#include "mt/Thread.h" #include "mt/Thread.h"
#include "arch/win32/ArchMiscWindows.h" #include "arch/win32/ArchMiscWindows.h"

6
src/lib/platform/MSWindowsDesks.h
View File

@ -19,9 +19,9 @@
#pragma once #pragma once
#include "synwinhk/synwinhk.h" #include "synwinhk/synwinhk.h"
#include "synergy/key_types.h" #include "core/key_types.h"
#include "synergy/mouse_types.h" #include "core/mouse_types.h"
#include "synergy/option_types.h" #include "core/option_types.h"
#include "mt/CondVar.h" #include "mt/CondVar.h"
#include "mt/Mutex.h" #include "mt/Mutex.h"
#include "base/String.h" #include "base/String.h"

2
src/lib/platform/MSWindowsHook.cpp
View File

@ -18,7 +18,7 @@
#include "platform/MSWindowsHook.h" #include "platform/MSWindowsHook.h"
#include "synergy/XScreen.h" #include "core/XScreen.h"
#include "base/Log.h" #include "base/Log.h"
static const char* g_name = "synwinhk"; static const char* g_name = "synwinhk";

2
src/lib/platform/MSWindowsKeyState.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/KeyState.h" #include "core/KeyState.h"
#include "base/String.h" #include "base/String.h"
#include "common/stdvector.h" #include "common/stdvector.h"

12
src/lib/platform/MSWindowsScreen.cpp
View File

@ -25,12 +25,12 @@
#include "platform/MSWindowsEventQueueBuffer.h" #include "platform/MSWindowsEventQueueBuffer.h"
#include "platform/MSWindowsKeyState.h" #include "platform/MSWindowsKeyState.h"
#include "platform/MSWindowsScreenSaver.h" #include "platform/MSWindowsScreenSaver.h"
#include "synergy/Clipboard.h" #include "core/Clipboard.h"
#include "synergy/KeyMap.h" #include "core/KeyMap.h"
#include "synergy/XScreen.h" #include "core/XScreen.h"
#include "synergy/App.h" #include "core/App.h"
#include "synergy/ArgsBase.h" #include "core/ArgsBase.h"
#include "synergy/ClientApp.h" #include "core/ClientApp.h"
#include "mt/Lock.h" #include "mt/Lock.h"
#include "mt/Thread.h" #include "mt/Thread.h"
#include "arch/win32/ArchMiscWindows.h" #include "arch/win32/ArchMiscWindows.h"

4
src/lib/platform/MSWindowsScreen.h
View File

@ -19,8 +19,8 @@
#pragma once #pragma once
#include "platform/MSWindowsHook.h" #include "platform/MSWindowsHook.h"
#include "synergy/PlatformScreen.h" #include "core/PlatformScreen.h"
#include "synergy/DragInformation.h" #include "core/DragInformation.h"
#include "synwinhk/synwinhk.h" #include "synwinhk/synwinhk.h"
#include "mt/CondVar.h" #include "mt/CondVar.h"
#include "mt/Mutex.h" #include "mt/Mutex.h"

2
src/lib/platform/MSWindowsScreenSaver.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/IScreenSaver.h" #include "core/IScreenSaver.h"
#include "base/String.h" #include "base/String.h"
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN

2
src/lib/platform/MSWindowsSession.cpp
View File

@ -18,7 +18,7 @@
#include "platform/MSWindowsSession.h" #include "platform/MSWindowsSession.h"
#include "arch/win32/XArchWindows.h" #include "arch/win32/XArchWindows.h"
#include "synergy/XSynergy.h" #include "core/XSynergy.h"
#include "base/Log.h" #include "base/Log.h"
#include <Wtsapi32.h> #include <Wtsapi32.h>

4
src/lib/platform/MSWindowsWatchdog.cpp
View File

@ -22,8 +22,8 @@
#include "ipc/IpcServer.h" #include "ipc/IpcServer.h"
#include "ipc/IpcMessage.h" #include "ipc/IpcMessage.h"
#include "ipc/Ipc.h" #include "ipc/Ipc.h"
#include "synergy/App.h" #include "core/App.h"
#include "synergy/ArgsBase.h" #include "core/ArgsBase.h"
#include "mt/Thread.h" #include "mt/Thread.h"
#include "arch/win32/ArchDaemonWindows.h" #include "arch/win32/ArchDaemonWindows.h"
#include "arch/win32/XArchWindows.h" #include "arch/win32/XArchWindows.h"

2
src/lib/platform/MSWindowsWatchdog.h
View File

@ -19,7 +19,7 @@
#pragma once #pragma once
#include "platform/MSWindowsSession.h" #include "platform/MSWindowsSession.h"
#include "synergy/XSynergy.h" #include "core/XSynergy.h"
#include "arch/IArchMultithread.h" #include "arch/IArchMultithread.h"
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN

2
src/lib/platform/OSXClipboard.cpp
View File

@ -18,7 +18,7 @@
#include "platform/OSXClipboard.h" #include "platform/OSXClipboard.h"
#include "synergy/Clipboard.h" #include "core/Clipboard.h"
#include "platform/OSXClipboardUTF16Converter.h" #include "platform/OSXClipboardUTF16Converter.h"
#include "platform/OSXClipboardTextConverter.h" #include "platform/OSXClipboardTextConverter.h"
#include "platform/OSXClipboardBMPConverter.h" #include "platform/OSXClipboardBMPConverter.h"

2
src/lib/platform/OSXClipboard.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/IClipboard.h" #include "core/IClipboard.h"
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#include <vector> #include <vector>

2
src/lib/platform/OSXKeyState.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/KeyState.h" #include "core/KeyState.h"
#include "common/stdmap.h" #include "common/stdmap.h"
#include "common/stdset.h" #include "common/stdset.h"
#include "common/stdvector.h" #include "common/stdvector.h"

2
src/lib/platform/OSXMediaKeySimulator.h
View File

@ -19,7 +19,7 @@
#import <CoreFoundation/CoreFoundation.h> #import <CoreFoundation/CoreFoundation.h>
#include "synergy/key_types.h" #include "core/key_types.h"
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {

2
src/lib/platform/OSXMediaKeySupport.h
View File

@ -20,7 +20,7 @@
#import <CoreFoundation/CoreFoundation.h> #import <CoreFoundation/CoreFoundation.h>
#import <Carbon/Carbon.h> #import <Carbon/Carbon.h>
#include "synergy/key_types.h" #include "core/key_types.h"
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {

4
src/lib/platform/OSXScreen.h
View File

@ -19,8 +19,8 @@
#pragma once #pragma once
#include "platform/OSXClipboard.h" #include "platform/OSXClipboard.h"
#include "synergy/PlatformScreen.h" #include "core/PlatformScreen.h"
#include "synergy/DragInformation.h" #include "core/DragInformation.h"
#include "base/EventTypes.h" #include "base/EventTypes.h"
#include "common/stdmap.h" #include "common/stdmap.h"
#include "common/stdvector.h" #include "common/stdvector.h"

6
src/lib/platform/OSXScreen.mm
View File

@ -27,9 +27,9 @@
#include "platform/OSXDragSimulator.h" #include "platform/OSXDragSimulator.h"
#include "platform/OSXMediaKeySupport.h" #include "platform/OSXMediaKeySupport.h"
#include "platform/OSXPasteboardPeeker.h" #include "platform/OSXPasteboardPeeker.h"
#include "synergy/Clipboard.h" #include "core/Clipboard.h"
#include "synergy/KeyMap.h" #include "core/KeyMap.h"
#include "synergy/ClientApp.h" #include "core/ClientApp.h"
#include "mt/CondVar.h" #include "mt/CondVar.h"
#include "mt/Lock.h" #include "mt/Lock.h"
#include "mt/Mutex.h" #include "mt/Mutex.h"

2
src/lib/platform/OSXScreenSaver.cpp
View File

@ -19,7 +19,7 @@
#import "platform/OSXScreenSaver.h" #import "platform/OSXScreenSaver.h"
#import "platform/OSXScreenSaverUtil.h" #import "platform/OSXScreenSaverUtil.h"
#import "synergy/IPrimaryScreen.h" #import "core/IPrimaryScreen.h"
#import "base/Log.h" #import "base/Log.h"
#import "base/IEventQueue.h" #import "base/IEventQueue.h"

2
src/lib/platform/OSXScreenSaver.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/IScreenSaver.h" #include "core/IScreenSaver.h"
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>

2
src/lib/platform/OSXUchrKeyResource.h
View File

@ -17,7 +17,7 @@
#pragma once #pragma once
#include "synergy/KeyState.h" #include "core/KeyState.h"
#include "platform/IOSXKeyResource.h" #include "platform/IOSXKeyResource.h"
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>

4
src/lib/platform/XWindowsClipboard.h
View File

@ -18,8 +18,8 @@
#pragma once #pragma once
#include "synergy/clipboard_types.h" #include "core/clipboard_types.h"
#include "synergy/IClipboard.h" #include "core/IClipboard.h"
#include "common/stdmap.h" #include "common/stdmap.h"
#include "common/stdlist.h" #include "common/stdlist.h"
#include "common/stdvector.h" #include "common/stdvector.h"

2
src/lib/platform/XWindowsKeyState.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/KeyState.h" #include "core/KeyState.h"
#include "common/stdmap.h" #include "common/stdmap.h"
#include "common/stdvector.h" #include "common/stdvector.h"

6
src/lib/platform/XWindowsScreen.cpp
View File

@ -23,9 +23,9 @@
#include "platform/XWindowsKeyState.h" #include "platform/XWindowsKeyState.h"
#include "platform/XWindowsScreenSaver.h" #include "platform/XWindowsScreenSaver.h"
#include "platform/XWindowsUtil.h" #include "platform/XWindowsUtil.h"
#include "synergy/Clipboard.h" #include "core/Clipboard.h"
#include "synergy/KeyMap.h" #include "core/KeyMap.h"
#include "synergy/XScreen.h" #include "core/XScreen.h"
#include "arch/XArch.h" #include "arch/XArch.h"
#include "arch/Arch.h" #include "arch/Arch.h"
#include "base/Log.h" #include "base/Log.h"

4
src/lib/platform/XWindowsScreen.h
View File

@ -18,8 +18,8 @@
#pragma once #pragma once
#include "synergy/PlatformScreen.h" #include "core/PlatformScreen.h"
#include "synergy/KeyMap.h" #include "core/KeyMap.h"
#include "common/stdset.h" #include "common/stdset.h"
#include "common/stdvector.h" #include "common/stdvector.h"

2
src/lib/platform/XWindowsScreenSaver.cpp
View File

@ -19,7 +19,7 @@
#include "platform/XWindowsScreenSaver.h" #include "platform/XWindowsScreenSaver.h"
#include "platform/XWindowsUtil.h" #include "platform/XWindowsUtil.h"
#include "synergy/IPlatformScreen.h" #include "core/IPlatformScreen.h"
#include "base/Log.h" #include "base/Log.h"
#include "base/Event.h" #include "base/Event.h"
#include "base/IEventQueue.h" #include "base/IEventQueue.h"

2
src/lib/platform/XWindowsScreenSaver.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/IScreenSaver.h" #include "core/IScreenSaver.h"
#include "base/IEventQueue.h" #include "base/IEventQueue.h"
#include "common/stdmap.h" #include "common/stdmap.h"

2
src/lib/platform/XWindowsUtil.cpp
View File

@ -18,7 +18,7 @@
#include "platform/XWindowsUtil.h" #include "platform/XWindowsUtil.h"
#include "synergy/key_types.h" #include "core/key_types.h"
#include "mt/Thread.h" #include "mt/Thread.h"
#include "base/Log.h" #include "base/Log.h"
#include "base/String.h" #include "base/String.h"

2
src/lib/server/BaseClientProxy.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/IClient.h" #include "core/IClient.h"
#include "base/String.h" #include "base/String.h"
namespace synergy { class IStream; } namespace synergy { class IStream; }

2
src/lib/server/CMakeLists.txt
View File

@ -26,5 +26,5 @@ add_library(server STATIC ${sources})
target_link_libraries(server shared) target_link_libraries(server shared)
if (UNIX) if (UNIX)
target_link_libraries(server synlib) target_link_libraries(server core)
endif() endif()

2
src/lib/server/ClientListener.cpp
View File

@ -20,7 +20,7 @@
#include "server/ClientProxy.h" #include "server/ClientProxy.h"
#include "server/ClientProxyUnknown.h" #include "server/ClientProxyUnknown.h"
#include "synergy/PacketStreamFilter.h" #include "core/PacketStreamFilter.h"
#include "net/IDataSocket.h" #include "net/IDataSocket.h"
#include "net/IListenSocket.h" #include "net/IListenSocket.h"
#include "net/ISocketFactory.h" #include "net/ISocketFactory.h"

2
src/lib/server/ClientProxy.cpp
View File

@ -18,7 +18,7 @@
#include "server/ClientProxy.h" #include "server/ClientProxy.h"
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "io/IStream.h" #include "io/IStream.h"
#include "base/Log.h" #include "base/Log.h"
#include "base/EventQueue.h" #include "base/EventQueue.h"

4
src/lib/server/ClientProxy1_0.cpp
View File

@ -18,8 +18,8 @@
#include "server/ClientProxy1_0.h" #include "server/ClientProxy1_0.h"
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "synergy/XSynergy.h" #include "core/XSynergy.h"
#include "io/IStream.h" #include "io/IStream.h"
#include "base/Log.h" #include "base/Log.h"
#include "base/IEventQueue.h" #include "base/IEventQueue.h"

4
src/lib/server/ClientProxy1_0.h
View File

@ -19,8 +19,8 @@
#pragma once #pragma once
#include "server/ClientProxy.h" #include "server/ClientProxy.h"
#include "synergy/Clipboard.h" #include "core/Clipboard.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
class Event; class Event;
class EventQueueTimer; class EventQueueTimer;

2
src/lib/server/ClientProxy1_1.cpp
View File

@ -18,7 +18,7 @@
#include "server/ClientProxy1_1.h" #include "server/ClientProxy1_1.h"
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "base/Log.h" #include "base/Log.h"
#include <cstring> #include <cstring>

2
src/lib/server/ClientProxy1_2.cpp
View File

@ -18,7 +18,7 @@
#include "server/ClientProxy1_2.h" #include "server/ClientProxy1_2.h"
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "base/Log.h" #include "base/Log.h"
// //

2
src/lib/server/ClientProxy1_3.cpp
View File

@ -18,7 +18,7 @@
#include "server/ClientProxy1_3.h" #include "server/ClientProxy1_3.h"
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "base/Log.h" #include "base/Log.h"
#include "base/IEventQueue.h" #include "base/IEventQueue.h"
#include "base/TMethodEventJob.h" #include "base/TMethodEventJob.h"

2
src/lib/server/ClientProxy1_4.cpp
View File

@ -19,7 +19,7 @@
#include "server/ClientProxy1_4.h" #include "server/ClientProxy1_4.h"
#include "server/Server.h" #include "server/Server.h"
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "base/Log.h" #include "base/Log.h"
#include "base/IEventQueue.h" #include "base/IEventQueue.h"
#include "base/TMethodEventJob.h" #include "base/TMethodEventJob.h"

6
src/lib/server/ClientProxy1_5.cpp
View File

@ -18,9 +18,9 @@
#include "server/ClientProxy1_5.h" #include "server/ClientProxy1_5.h"
#include "server/Server.h" #include "server/Server.h"
#include "synergy/FileChunk.h" #include "core/FileChunk.h"
#include "synergy/StreamChunker.h" #include "core/StreamChunker.h"
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "io/IStream.h" #include "io/IStream.h"
#include "base/TMethodEventJob.h" #include "base/TMethodEventJob.h"
#include "base/Log.h" #include "base/Log.h"

6
src/lib/server/ClientProxy1_6.cpp
View File

@ -18,9 +18,9 @@
#include "server/ClientProxy1_6.h" #include "server/ClientProxy1_6.h"
#include "server/Server.h" #include "server/Server.h"
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "synergy/StreamChunker.h" #include "core/StreamChunker.h"
#include "synergy/ClipboardChunk.h" #include "core/ClipboardChunk.h"
#include "io/IStream.h" #include "io/IStream.h"
#include "base/TMethodEventJob.h" #include "base/TMethodEventJob.h"
#include "base/Log.h" #include "base/Log.h"

6
src/lib/server/ClientProxyUnknown.cpp
View File

@ -26,9 +26,9 @@
#include "server/ClientProxy1_4.h" #include "server/ClientProxy1_4.h"
#include "server/ClientProxy1_5.h" #include "server/ClientProxy1_5.h"
#include "server/ClientProxy1_6.h" #include "server/ClientProxy1_6.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "synergy/XSynergy.h" #include "core/XSynergy.h"
#include "io/IStream.h" #include "io/IStream.h"
#include "io/XIO.h" #include "io/XIO.h"
#include "base/Log.h" #include "base/Log.h"

4
src/lib/server/Config.cpp
View File

@ -19,8 +19,8 @@
#include "server/Config.h" #include "server/Config.h"
#include "server/Server.h" #include "server/Server.h"
#include "synergy/KeyMap.h" #include "core/KeyMap.h"
#include "synergy/key_types.h" #include "core/key_types.h"
#include "net/XSocket.h" #include "net/XSocket.h"
#include "base/IEventQueue.h" #include "base/IEventQueue.h"
#include "common/stdistream.h" #include "common/stdistream.h"

6
src/lib/server/Config.h
View File

@ -19,9 +19,9 @@
#pragma once #pragma once
#include "server/InputFilter.h" #include "server/InputFilter.h"
#include "synergy/option_types.h" #include "core/option_types.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
#include "synergy/IPlatformScreen.h" #include "core/IPlatformScreen.h"
#include "net/NetworkAddress.h" #include "net/NetworkAddress.h"
#include "base/String.h" #include "base/String.h"
#include "base/XBase.h" #include "base/XBase.h"

2
src/lib/server/InputFilter.cpp
View File

@ -19,7 +19,7 @@
#include "server/InputFilter.h" #include "server/InputFilter.h"
#include "server/Server.h" #include "server/Server.h"
#include "server/PrimaryClient.h" #include "server/PrimaryClient.h"
#include "synergy/KeyMap.h" #include "core/KeyMap.h"
#include "base/EventQueue.h" #include "base/EventQueue.h"
#include "base/Log.h" #include "base/Log.h"
#include "base/TMethodEventJob.h" #include "base/TMethodEventJob.h"

8
src/lib/server/InputFilter.h
View File

@ -18,10 +18,10 @@
#pragma once #pragma once
#include "synergy/key_types.h" #include "core/key_types.h"
#include "synergy/mouse_types.h" #include "core/mouse_types.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
#include "synergy/IPlatformScreen.h" #include "core/IPlatformScreen.h"
#include "base/String.h" #include "base/String.h"
#include "common/stdmap.h" #include "common/stdmap.h"
#include "common/stdset.h" #include "common/stdset.h"

4
src/lib/server/PrimaryClient.cpp
View File

@ -18,8 +18,8 @@
#include "server/PrimaryClient.h" #include "server/PrimaryClient.h"
#include "synergy/Screen.h" #include "core/Screen.h"
#include "synergy/Clipboard.h" #include "core/Clipboard.h"
#include "base/Log.h" #include "base/Log.h"
// //

2
src/lib/server/PrimaryClient.h
View File

@ -19,7 +19,7 @@
#pragma once #pragma once
#include "server/BaseClientProxy.h" #include "server/BaseClientProxy.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
namespace synergy { class Screen; } namespace synergy { class Screen; }

22
src/lib/server/Server.cpp
View File

@ -22,17 +22,17 @@
#include "server/ClientProxyUnknown.h" #include "server/ClientProxyUnknown.h"
#include "server/PrimaryClient.h" #include "server/PrimaryClient.h"
#include "server/ClientListener.h" #include "server/ClientListener.h"
#include "synergy/FileChunk.h" #include "core/FileChunk.h"
#include "synergy/IPlatformScreen.h" #include "core/IPlatformScreen.h"
#include "synergy/DropHelper.h" #include "core/DropHelper.h"
#include "synergy/option_types.h" #include "core/option_types.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
#include "synergy/XScreen.h" #include "core/XScreen.h"
#include "synergy/XSynergy.h" #include "core/XSynergy.h"
#include "synergy/StreamChunker.h" #include "core/StreamChunker.h"
#include "synergy/KeyState.h" #include "core/KeyState.h"
#include "synergy/Screen.h" #include "core/Screen.h"
#include "synergy/PacketStreamFilter.h" #include "core/PacketStreamFilter.h"
#include "net/TCPSocket.h" #include "net/TCPSocket.h"
#include "net/IDataSocket.h" #include "net/IDataSocket.h"
#include "net/IListenSocket.h" #include "net/IListenSocket.h"

14
src/lib/server/Server.h
View File

@ -19,13 +19,13 @@
#pragma once #pragma once
#include "server/Config.h" #include "server/Config.h"
#include "synergy/clipboard_types.h" #include "core/clipboard_types.h"
#include "synergy/Clipboard.h" #include "core/Clipboard.h"
#include "synergy/key_types.h" #include "core/key_types.h"
#include "synergy/mouse_types.h" #include "core/mouse_types.h"
#include "synergy/INode.h" #include "core/INode.h"
#include "synergy/DragInformation.h" #include "core/DragInformation.h"
#include "synergy/ServerArgs.h" #include "core/ServerArgs.h"
#include "base/Event.h" #include "base/Event.h"
#include "base/Stopwatch.h" #include "base/Stopwatch.h"
#include "base/EventTypes.h" #include "base/EventTypes.h"

2
src/lib/synwinhk/synwinhk.cpp
View File

@ -18,7 +18,7 @@
#include "synwinhk/synwinhk.h" #include "synwinhk/synwinhk.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
#include <zmouse.h> #include <zmouse.h>
#include <tchar.h> #include <tchar.h>

4
src/test/integtests/net/NetworkTests.cpp
View File

@ -29,8 +29,8 @@
#include "server/ClientListener.h" #include "server/ClientListener.h"
#include "server/ClientProxy.h" #include "server/ClientProxy.h"
#include "client/Client.h" #include "client/Client.h"
#include "synergy/FileChunk.h" #include "core/FileChunk.h"
#include "synergy/StreamChunker.h" #include "core/StreamChunker.h"
#include "net/SocketMultiplexer.h" #include "net/SocketMultiplexer.h"
#include "net/NetworkAddress.h" #include "net/NetworkAddress.h"
#include "net/TCPSocketFactory.h" #include "net/TCPSocketFactory.h"

2
src/test/mock/synergy/MockApp.h
View File

@ -19,7 +19,7 @@
#define TEST_ENV #define TEST_ENV
#include "synergy/App.h" #include "core/App.h"
#include "test/global/gmock.h" #include "test/global/gmock.h"

2
src/test/mock/synergy/MockArgParser.h
View File

@ -19,7 +19,7 @@
#define TEST_ENV #define TEST_ENV
#include "synergy/ArgParser.h" #include "core/ArgParser.h"
#include "test/global/gmock.h" #include "test/global/gmock.h"

2
src/test/mock/synergy/MockKeyMap.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/KeyMap.h" #include "core/KeyMap.h"
#include "test/global/gmock.h" #include "test/global/gmock.h"

2
src/test/mock/synergy/MockKeyState.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/KeyState.h" #include "core/KeyState.h"
#include "test/global/gmock.h" #include "test/global/gmock.h"

2
src/test/mock/synergy/MockScreen.h
View File

@ -19,7 +19,7 @@
#define TEST_ENV #define TEST_ENV
#include "synergy/Screen.h" #include "core/Screen.h"
#include "test/global/gmock.h" #include "test/global/gmock.h"

4
src/test/unittests/synergy/ArgParserTests.cpp
View File

@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ArgParser.h" #include "core/ArgParser.h"
#include "synergy/ArgsBase.h" #include "core/ArgsBase.h"
#include "test/global/gtest.h" #include "test/global/gtest.h"

4
src/test/unittests/synergy/ClientArgsParsingTests.cpp
View File

@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ArgParser.h" #include "core/ArgParser.h"
#include "synergy/ClientArgs.h" #include "core/ClientArgs.h"
#include "test/mock/synergy/MockArgParser.h" #include "test/mock/synergy/MockArgParser.h"
#include "test/global/gtest.h" #include "test/global/gtest.h"

4
src/test/unittests/synergy/ClipboardChunkTests.cpp
View File

@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ClipboardChunk.h" #include "core/ClipboardChunk.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
#include "test/global/gtest.h" #include "test/global/gtest.h"

2
src/test/unittests/synergy/ClipboardTests.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/Clipboard.h" #include "core/Clipboard.h"
#include "test/global/gtest.h" #include "test/global/gtest.h"

2
src/test/unittests/synergy/DeprecatedArgsParsingTests.cpp
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ArgParser.h" #include "core/ArgParser.h"
#include "test/global/gtest.h" #include "test/global/gtest.h"

5
src/test/unittests/synergy/GenericArgsParsingTests.cpp
View File

@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ArgParser.h" #include "core/ArgParser.h"
#include "synergy/ArgsBase.h" #include "core/ArgsBase.h"
#include "test/mock/synergy/MockApp.h" #include "test/mock/synergy/MockApp.h"
#include "test/global/gtest.h" #include "test/global/gtest.h"
@ -258,7 +258,6 @@ TEST(GenericArgsParsingTests, parseGenericArgs_noTrayCmd_disableTrayTrue)
argParser.parseGenericArgs(argc, kNoTrayCmd, i); argParser.parseGenericArgs(argc, kNoTrayCmd, i);
EXPECT_EQ(true, argsBase.m_disableTray);
EXPECT_EQ(1, i); EXPECT_EQ(1, i);
} }

2
src/test/unittests/synergy/KeyMapTests.cpp
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/KeyMap.h" #include "core/KeyMap.h"
#include "test/global/gtest.h" #include "test/global/gtest.h"
#include "test/global/gmock.h" #include "test/global/gmock.h"

4
src/test/unittests/synergy/ServerArgsParsingTests.cpp
View File

@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ArgParser.h" #include "core/ArgParser.h"
#include "synergy/ServerArgs.h" #include "core/ServerArgs.h"
#include "test/mock/synergy/MockArgParser.h" #include "test/mock/synergy/MockArgParser.h"
#include "test/global/gtest.h" #include "test/global/gtest.h"