rebranding symless/synergy to debauchee/barrier

src/lib/client/CMakeLists.txt

@@ -1,4 +1,4 @@
-# synergy -- mouse and keyboard sharing utility
+# barrier -- mouse and keyboard sharing utility
 # Copyright (C) 2012-2016 Symless Ltd.
 # Copyright (C) 2009 Nick Bolton
 # 
@@ -17,7 +17,7 @@
 file(GLOB headers "*.h")
 file(GLOB sources "*.cpp")
 
-if (SYNERGY_ADD_HEADERS)
+if (BARRIER_ADD_HEADERS)
     list(APPEND sources ${headers})
 endif()
 

src/lib/client/Client.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -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 "barrier/Screen.h"
+#include "barrier/FileChunk.h"
+#include "barrier/DropHelper.h"
+#include "barrier/PacketStreamFilter.h"
+#include "barrier/ProtocolUtil.h"
+#include "barrier/protocol_types.h"
+#include "barrier/XBarrier.h"
+#include "barrier/StreamChunker.h"
+#include "barrier/IPlatformScreen.h"
 #include "mt/Thread.h"
 #include "net/TCPSocket.h"
 #include "net/IDataSocket.h"
@@ -53,7 +53,7 @@ Client::Client(
         IEventQueue* events,
         const String& name, const NetworkAddress& address,
         ISocketFactory* socketFactory,
-        synergy::Screen* screen,
+        barrier::Screen* screen,
         ClientArgs const& args) :
     m_mock(false),
     m_name(name),

src/lib/client/Client.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -18,29 +18,29 @@
 
 #pragma once
 
-#include "synergy/IClient.h"
+#include "barrier/IClient.h"
 
-#include "synergy/Clipboard.h"
-#include "synergy/DragInformation.h"
-#include "synergy/INode.h"
-#include "synergy/ClientArgs.h"
+#include "barrier/Clipboard.h"
+#include "barrier/DragInformation.h"
+#include "barrier/INode.h"
+#include "barrier/ClientArgs.h"
 #include "net/NetworkAddress.h"
 #include "base/EventTypes.h"
 #include "mt/CondVar.h"
 
 class EventQueueTimer;
-namespace synergy { class Screen; }
+namespace barrier { class Screen; }
 class ServerProxy;
 class IDataSocket;
 class ISocketFactory;
-namespace synergy { class IStream; }
+namespace barrier { class IStream; }
 class IEventQueue;
 class Thread;
 class TCPSocket;
 
-//! Synergy client
+//! Barrier client
 /*!
-This class implements the top-level client algorithms for synergy.
+This class implements the top-level client algorithms for barrier.
 */
 class Client : public IClient, public INode {
 public:
@@ -59,7 +59,7 @@ public:
     */
     Client(IEventQueue* events, const String& name,
            const NetworkAddress& address, ISocketFactory* socketFactory,
-           synergy::Screen* screen, ClientArgs const& args);
+           barrier::Screen* screen, ClientArgs const& args);
 
     ~Client();
 
@@ -201,8 +201,8 @@ private:
     String                m_name;
     NetworkAddress        m_serverAddress;
     ISocketFactory*        m_socketFactory;
-    synergy::Screen*    m_screen;
-    synergy::IStream*    m_stream;
+    barrier::Screen*    m_screen;
+    barrier::IStream*    m_stream;
     EventQueueTimer*    m_timer;
     ServerProxy*        m_server;
     bool                m_ready;

src/lib/client/ServerProxy.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -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 "barrier/FileChunk.h"
+#include "barrier/ClipboardChunk.h"
+#include "barrier/StreamChunker.h"
+#include "barrier/Clipboard.h"
+#include "barrier/ProtocolUtil.h"
+#include "barrier/option_types.h"
+#include "barrier/protocol_types.h"
 #include "io/IStream.h"
 #include "base/Log.h"
 #include "base/IEventQueue.h"
@@ -38,7 +38,7 @@
 // ServerProxy
 //
 
-ServerProxy::ServerProxy(Client* client, synergy::IStream* stream, IEventQueue* events) :
+ServerProxy::ServerProxy(Client* client, barrier::IStream* stream, IEventQueue* events) :
     m_client(client),
     m_stream(stream),
     m_seqNum(0),

src/lib/client/ServerProxy.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include "synergy/clipboard_types.h"
-#include "synergy/key_types.h"
+#include "barrier/clipboard_types.h"
+#include "barrier/key_types.h"
 #include "base/Event.h"
 #include "base/Stopwatch.h"
 #include "base/String.h"
@@ -28,7 +28,7 @@ class Client;
 class ClientInfo;
 class EventQueueTimer;
 class IClipboard;
-namespace synergy { class IStream; }
+namespace barrier { class IStream; }
 class IEventQueue;
 
 //! Proxy for server
@@ -42,7 +42,7 @@ public:
     Process messages from the server on \p stream and forward to
     \p client.
     */
-    ServerProxy(Client* client, synergy::IStream* stream, IEventQueue* events);
+    ServerProxy(Client* client, barrier::IStream* stream, IEventQueue* events);
     ~ServerProxy();
 
     //! @name manipulators
@@ -112,7 +112,7 @@ private:
     typedef EResult (ServerProxy::*MessageParser)(const UInt8*);
 
     Client*            m_client;
-    synergy::IStream*    m_stream;
+    barrier::IStream*    m_stream;
 
     UInt32                m_seqNum;