#6151 Rename synergy lib to core lib

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 <http://www.gnu.org/licenses/>.
 
+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)

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 <string.h>
 #include <shellapi.h>

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()

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"

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"

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"

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"

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()

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"

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"

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)

src/lib/platform/IOSXKeyResource.h

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

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

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
 {

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"

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"

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";

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"
 

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"

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"

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

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 <Wtsapi32.h>

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"

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

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"

src/lib/platform/OSXClipboard.h

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

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"

src/lib/platform/OSXMediaKeySimulator.h

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

src/lib/platform/OSXMediaKeySupport.h

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

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"

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"

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"
 

src/lib/platform/OSXScreenSaver.h

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

src/lib/platform/OSXUchrKeyResource.h

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

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"

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"
 

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"

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"
 

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"

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"
 

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"

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; }

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()

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"

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"

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"

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;

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 <cstring>

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"
 
 //

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 
 //

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; }
 

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"

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"

src/lib/synwinhk/synwinhk.cpp

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

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"

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"
 

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"
 

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"
 

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"
 

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"
 

src/test/unittests/synergy/ArgParserTests.cpp

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

src/test/unittests/synergy/ClientArgsParsingTests.cpp

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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"

src/test/unittests/synergy/ClipboardChunkTests.cpp

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

src/test/unittests/synergy/ClipboardTests.cpp

@@ -16,7 +16,7 @@
  * 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"
 

src/test/unittests/synergy/DeprecatedArgsParsingTests.cpp

@@ -15,7 +15,7 @@
  * 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"
 

src/test/unittests/synergy/GenericArgsParsingTests.cpp

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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);
 }
 

src/test/unittests/synergy/KeyMapTests.cpp

@@ -15,7 +15,7 @@
  * 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/gmock.h"

src/test/unittests/synergy/ServerArgsParsingTests.cpp

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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"