rebranding symless/synergy to debauchee/barrier

src/lib/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
 # 
@@ -24,7 +24,7 @@ add_subdirectory(mt)
 add_subdirectory(net)
 add_subdirectory(platform)
 add_subdirectory(server)
-add_subdirectory(synergy)
+add_subdirectory(barrier)
 add_subdirectory(shared)
 
 if (WIN32)

src/lib/arch/Arch.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
  * 

src/lib/arch/Arch.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
  * 

src/lib/arch/ArchConsoleStd.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
  * 

src/lib/arch/ArchConsoleStd.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
  * 

src/lib/arch/ArchDaemonNone.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
  * 

src/lib/arch/ArchDaemonNone.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
  * 

src/lib/arch/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()
 
@@ -33,7 +33,7 @@ endif()
 list(APPEND sources ${arch_sources})
 list(APPEND headers ${arch_headers})
 
-if (SYNERGY_ADD_HEADERS)
+if (BARRIER_ADD_HEADERS)
     list(APPEND sources ${headers})
 endif()
 

src/lib/arch/IArchConsole.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
  * 
@@ -24,7 +24,7 @@
 //! Interface for architecture dependent console output
 /*!
 This interface defines the console operations required by
-synergy.  Each architecture must implement this interface.
+barrier.  Each architecture must implement this interface.
 */
 class IArchConsole : public IInterface {
 public:

src/lib/arch/IArchDaemon.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
  * 
@@ -23,7 +23,7 @@
 
 //! Interface for architecture dependent daemonizing
 /*!
-This interface defines the operations required by synergy for installing
+This interface defines the operations required by barrier for installing
 uninstalling daeamons and daemonizing a process.  Each architecture must
 implement this interface.
 */

src/lib/arch/IArchFile.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
  * 
@@ -25,7 +25,7 @@
 //! Interface for architecture dependent file system operations
 /*!
 This interface defines the file system operations required by
-synergy.  Each architecture must implement this interface.
+barrier.  Each architecture must implement this interface.
 */
 class IArchFile : public IInterface {
 public:
@@ -53,7 +53,7 @@ public:
 
     //! Get installed directory
     /*!
-    Returns the directory in which Synergy is installed.
+    Returns the directory in which Barrier is installed.
     */
     virtual std::string    getInstalledDirectory() = 0;
 

src/lib/arch/IArchLog.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
  * 
@@ -24,7 +24,7 @@
 //! Interface for architecture dependent logging
 /*!
 This interface defines the logging operations required by
-synergy.  Each architecture must implement this interface.
+barrier.  Each architecture must implement this interface.
 */
 class IArchLog : public IInterface {
 public:

src/lib/arch/IArchMultithread.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
  * 
@@ -66,7 +66,7 @@ typedef ArchThreadImpl* ArchThread;
 //! Interface for architecture dependent multithreading
 /*!
 This interface defines the multithreading operations required by
-synergy.  Each architecture must implement this interface.
+barrier.  Each architecture must implement this interface.
 */
 class IArchMultithread : public IInterface {
 public:

src/lib/arch/IArchNetwork.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
  * 
@@ -56,7 +56,7 @@ typedef ArchNetAddressImpl* ArchNetAddress;
 //! Interface for architecture dependent networking
 /*!
 This interface defines the networking operations required by
-synergy.  Each architecture must implement this interface.
+barrier.  Each architecture must implement this interface.
 */
 class IArchNetwork : public IInterface {
 public:

src/lib/arch/IArchSleep.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
  * 
@@ -23,7 +23,7 @@
 //! Interface for architecture dependent sleeping
 /*!
 This interface defines the sleep operations required by
-synergy.  Each architecture must implement this interface.
+barrier.  Each architecture must implement this interface.
 */
 class IArchSleep : public IInterface {
 public:

src/lib/arch/IArchString.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) 2011 Chris Schoeneman
  * 

src/lib/arch/IArchString.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
  * 
@@ -26,7 +26,7 @@
 //! Interface for architecture dependent string operations
 /*!
 This interface defines the string operations required by
-synergy.  Each architecture must implement this interface.
+barrier.  Each architecture must implement this interface.
 */
 class IArchString : public IInterface {
 public:

src/lib/arch/IArchSystem.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) 2004 Chris Schoeneman
  * 
@@ -43,21 +43,21 @@ public:
     virtual std::string getPlatformName() const = 0;
     //@}
 
-    //! Get a Synergy setting
+    //! Get a Barrier setting
     /*!
-    Reads a Synergy setting from the system.
+    Reads a Barrier setting from the system.
     */
     virtual std::string setting(const std::string& valueName) const = 0;
     //@}
 
-    //! Set a Synergy setting
+    //! Set a Barrier setting
     /*!
-    Writes a Synergy setting from the system.
+    Writes a Barrier setting from the system.
     */
     virtual void setting(const std::string& valueName, const std::string& valueString) const = 0;
     //@}
 
-    //! Get the pathnames of the libraries used by Synergy
+    //! Get the pathnames of the libraries used by Barrier
     /*
     Returns a string containing the full path names of all loaded libraries at the point it is called.
     */

src/lib/arch/IArchTaskBar.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) 2003 Chris Schoeneman
  * 
@@ -25,7 +25,7 @@ class IArchTaskBarReceiver;
 //! Interface for architecture dependent task bar control
 /*!
 This interface defines the task bar icon operations required
-by synergy.  Each architecture must implement this interface
+by barrier.  Each architecture must implement this interface
 though each operation can be a no-op.
 */
 class IArchTaskBar : public IInterface {

src/lib/arch/IArchTaskBarReceiver.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) 2003 Chris Schoeneman
  * 
@@ -27,7 +27,7 @@ class INode;
 //! Interface for architecture dependent task bar event handling
 /*!
 This interface defines the task bar icon event handlers required
-by synergy.  Each architecture must implement this interface
+by barrier.  Each architecture must implement this interface
 though each operation can be a no-op.
 */
 class IArchTaskBarReceiver : public IInterface {

src/lib/arch/IArchTime.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
  * 
@@ -23,7 +23,7 @@
 //! Interface for architecture dependent time operations
 /*!
 This interface defines the time operations required by
-synergy.  Each architecture must implement this interface.
+barrier.  Each architecture must implement this interface.
 */
 class IArchTime : public IInterface {
 public:

src/lib/arch/XArch.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
  * 

src/lib/arch/multibyte.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
  * 

src/lib/arch/unix/ArchConsoleUnix.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
  * 

src/lib/arch/unix/ArchConsoleUnix.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
  * 

src/lib/arch/unix/ArchDaemonUnix.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
  * 
@@ -46,7 +46,7 @@ ArchDaemonUnix::~ArchDaemonUnix()
 #ifdef __APPLE__
 
 // In Mac OS X, fork()'d child processes can't use most APIs (the frameworks
-// that Synergy uses in fact prevent it and make the process just up and die),
+// that Barrier uses in fact prevent it and make the process just up and die),
 // so need to exec a copy of the program that doesn't fork so isn't limited.
 int
 execSelfNonDaemonized()
@@ -54,14 +54,14 @@ execSelfNonDaemonized()
     extern char** NXArgv;
     char** selfArgv = NXArgv;
     
-    setenv("_SYNERGY_DAEMONIZED", "", 1);
+    setenv("_BARRIER_DAEMONIZED", "", 1);
     
     execvp(selfArgv[0], selfArgv);
     return 0;
 }
 
 bool alreadyDaemonized() {
-    return getenv("_SYNERGY_DAEMONIZED") != NULL;
+    return getenv("_BARRIER_DAEMONIZED") != NULL;
 }
 
 #endif

src/lib/arch/unix/ArchDaemonUnix.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
  * 
@@ -33,4 +33,4 @@ public:
     virtual int            daemonize(const char* name, DaemonFunc func);
 };
 
-#define CONFIG_FILE "/etc/synergy/synergyd.conf"
+#define CONFIG_FILE "/etc/barrier/barrierd.conf"

src/lib/arch/unix/ArchFileUnix.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
  * 
@@ -94,7 +94,7 @@ ArchFileUnix::getInstalledDirectory()
 #if WINAPI_XWINDOWS
     return "/usr/bin";
 #else
-    return "/Applications/Synergy.app/Contents/MacOS";
+    return "/Applications/Barrier.app/Contents/MacOS";
 #endif
 }
 
@@ -127,9 +127,9 @@ ArchFileUnix::getProfileDirectory()
     }
     else {
 #if WINAPI_XWINDOWS
-        dir = getUserDirectory().append("/.synergy");
+        dir = getUserDirectory().append("/.barrier");
 #else
-        dir = getUserDirectory().append("/Library/Synergy");
+        dir = getUserDirectory().append("/Library/Barrier");
 #endif
     }
     return dir;

src/lib/arch/unix/ArchFileUnix.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
  * 

src/lib/arch/unix/ArchInternetUnix.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2014-2016 Symless Ltd.
  *
  * This package is free software; you can redistribute it and/or
@@ -94,7 +94,7 @@ CurlFacade::get(const String& url)
     curl_easy_setopt(m_curl, CURLOPT_WRITEFUNCTION, curlWriteCallback);
 
     std::stringstream userAgent;
-    userAgent << "Synergy ";
+    userAgent << "Barrier ";
     userAgent << kVersion;
     curl_easy_setopt(m_curl, CURLOPT_USERAGENT, userAgent.str().c_str());
     

src/lib/arch/unix/ArchInternetUnix.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2014-2016 Symless Ltd.
  *
  * This package is free software; you can redistribute it and/or

src/lib/arch/unix/ArchLogUnix.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
  * 

src/lib/arch/unix/ArchLogUnix.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
  * 

src/lib/arch/unix/ArchMultithreadPosix.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
  * 
@@ -38,7 +38,7 @@
 
 #if !HAVE_PTHREAD_SIGNAL
     // boy, is this platform broken.  forget about pthread signal
-    // handling and let signals through to every process.  synergy
+    // handling and let signals through to every process.  barrier
     // will not terminate cleanly when it gets SIGTERM or SIGINT.
 #    define pthread_sigmask sigprocmask
 #    define pthread_kill(tid_, sig_) kill(0, (sig_))
@@ -644,7 +644,7 @@ ArchMultithreadPosix::insert(ArchThreadImpl* thread)
 
     // set thread id.  note that we don't worry about m_nextID
     // wrapping back to 0 and duplicating thread ID's since the
-    // likelihood of synergy running that long is vanishingly
+    // likelihood of barrier running that long is vanishingly
     // small.
     thread->m_id = ++m_nextID;
 

src/lib/arch/unix/ArchMultithreadPosix.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
  * 

src/lib/arch/unix/ArchNetworkBSD.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
  * 

src/lib/arch/unix/ArchNetworkBSD.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
  * 

src/lib/arch/unix/ArchSleepUnix.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
  * 

src/lib/arch/unix/ArchSleepUnix.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
  * 

src/lib/arch/unix/ArchStringUnix.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
  * 

src/lib/arch/unix/ArchStringUnix.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
  * 

src/lib/arch/unix/ArchSystemUnix.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) 2004 Chris Schoeneman
  * 

src/lib/arch/unix/ArchSystemUnix.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) 2004 Chris Schoeneman
  * 

src/lib/arch/unix/ArchTaskBarXWindows.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) 2003 Chris Schoeneman
  * 

src/lib/arch/unix/ArchTaskBarXWindows.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) 2003 Chris Schoeneman
  * 

src/lib/arch/unix/ArchTimeUnix.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
  * 

src/lib/arch/unix/ArchTimeUnix.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
  * 

src/lib/arch/unix/XArchUnix.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
  * 

src/lib/arch/unix/XArchUnix.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
  * 

src/lib/arch/vsnprintf.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
  * 

src/lib/arch/win32/ArchConsoleWindows.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
  * 

src/lib/arch/win32/ArchConsoleWindows.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
  * 

src/lib/arch/win32/ArchDaemonWindows.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
  * 
@@ -33,7 +33,7 @@ ArchDaemonWindows*        ArchDaemonWindows::s_daemon = NULL;
 ArchDaemonWindows::ArchDaemonWindows() :
 m_daemonThreadID(0)
 {
-    m_quitMessage = RegisterWindowMessage("SynergyDaemonExit");
+    m_quitMessage = RegisterWindowMessage("BarrierDaemonExit");
 }
 
 ArchDaemonWindows::~ArchDaemonWindows()

src/lib/arch/win32/ArchDaemonWindows.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
  * 
@@ -139,16 +139,16 @@ private:
     std::string            m_commandLine;
 };
 
-#define DEFAULT_DAEMON_NAME _T("Synergy")
-#define DEFAULT_DAEMON_INFO _T("Manages the Synergy foreground processes.")
+#define DEFAULT_DAEMON_NAME _T("Barrier")
+#define DEFAULT_DAEMON_INFO _T("Manages the Barrier foreground processes.")
 
-#define LEGACY_SERVER_DAEMON_NAME _T("Synergy Server")
-#define LEGACY_CLIENT_DAEMON_NAME _T("Synergy Client")
+#define LEGACY_SERVER_DAEMON_NAME _T("Barrier Server")
+#define LEGACY_CLIENT_DAEMON_NAME _T("Barrier Client")
 
 static const TCHAR* const g_daemonKeyPath[] = {
     _T("SOFTWARE"),
-    _T("The Synergy Project"),
-    _T("Synergy"),
+    _T("The Barrier Project"),
+    _T("Barrier"),
     _T("Service"),
     NULL
 };

src/lib/arch/win32/ArchFileWindows.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
  * 
@@ -169,7 +169,7 @@ ArchFileWindows::getProfileDirectory()
     }
 
     // HACK: append program name, this seems wrong.
-    dir.append("\\Synergy");
+    dir.append("\\Barrier");
 
     return dir;
 }

src/lib/arch/win32/ArchFileWindows.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
  * 

src/lib/arch/win32/ArchInternetWindows.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2014-2016 Symless Ltd.
  *
  * This package is free software; you can redistribute it and/or
@@ -76,8 +76,8 @@ ArchInternetWindows::urlEncode(const String& url)
     // the win32 url encoding funcitons are pretty useless (to us) and only
     // escape "unsafe" chars, but not + or =, so we need to replace these
     // manually (and probably many other chars).
-    synergy::string::findReplaceAll(result, "+", "%2B");
-    synergy::string::findReplaceAll(result, "=", "%3D");
+    barrier::string::findReplaceAll(result, "+", "%2B");
+    barrier::string::findReplaceAll(result, "=", "%3D");
 
     return result;
 }
@@ -146,7 +146,7 @@ void
 WinINetRequest::openSession()
 {
     std::stringstream userAgent;
-    userAgent << "Synergy ";
+    userAgent << "Barrier ";
     userAgent << kVersion;
 
     m_session = InternetOpen(

src/lib/arch/win32/ArchInternetWindows.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2014-2016 Symless Ltd.
  *
  * This package is free software; you can redistribute it and/or

src/lib/arch/win32/ArchLogWindows.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
  * 

src/lib/arch/win32/ArchLogWindows.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
  * 

src/lib/arch/win32/ArchMiscWindows.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
  * 

src/lib/arch/win32/ArchMiscWindows.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
  * 

src/lib/arch/win32/ArchMultithreadWindows.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
  * 

src/lib/arch/win32/ArchMultithreadWindows.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
  * 

src/lib/arch/win32/ArchNetworkWinsock.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
  * 

src/lib/arch/win32/ArchNetworkWinsock.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
  * 

src/lib/arch/win32/ArchSleepWindows.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
  * 

src/lib/arch/win32/ArchSleepWindows.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
  * 

src/lib/arch/win32/ArchStringWindows.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
  * 

src/lib/arch/win32/ArchStringWindows.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
  * 

src/lib/arch/win32/ArchSystemWindows.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) 2004 Chris Schoeneman
  * 
@@ -28,7 +28,7 @@
 
 static const char* s_settingsKeyNames[] = {
     _T("SOFTWARE"),
-    _T("Synergy"),
+    _T("Barrier"),
     NULL
 };
 

src/lib/arch/win32/ArchSystemWindows.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) 2004 Chris Schoeneman
  * 

src/lib/arch/win32/ArchTaskBarWindows.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) 2003 Chris Schoeneman
  * 
@@ -21,7 +21,7 @@
 #include "arch/IArchTaskBarReceiver.h"
 #include "arch/Arch.h"
 #include "arch/XArch.h"
-#include "synergy/win32/AppUtilWindows.h"
+#include "barrier/win32/AppUtilWindows.h"
 
 #include <string.h>
 #include <shellapi.h>
@@ -447,7 +447,7 @@ ArchTaskBarWindows::threadMainLoop()
     m_taskBarRestart        = RegisterWindowMessage(TEXT("TaskbarCreated"));
 
     // register a window class
-    LPCTSTR className = TEXT("SynergyTaskBar");
+    LPCTSTR className = TEXT("BarrierTaskBar");
     WNDCLASSEX classInfo;
     classInfo.cbSize        = sizeof(classInfo);
     classInfo.style         = CS_NOCLOSE;
@@ -466,7 +466,7 @@ ArchTaskBarWindows::threadMainLoop()
     // create window
     m_hwnd = CreateWindowEx(WS_EX_TOOLWINDOW,
                             className,
-                            TEXT("Synergy Task Bar"),
+                            TEXT("Barrier Task Bar"),
                             WS_POPUP,
                             0, 0, 1, 1,
                             NULL,

src/lib/arch/win32/ArchTaskBarWindows.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) 2003 Chris Schoeneman
  * 

src/lib/arch/win32/ArchTimeWindows.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
  * 

src/lib/arch/win32/ArchTimeWindows.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
  * 

src/lib/arch/win32/XArchWindows.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
  * 
@@ -38,7 +38,7 @@ XArchEvalWindows::eval() const throw()
                             0,
                             NULL) == 0) {
         cmsg = NULL;
-        return synergy::string::sprintf("Unknown error, code %d", m_error);
+        return barrier::string::sprintf("Unknown error, code %d", m_error);
     }
     std::string smsg(cmsg);
     LocalFree(cmsg);

src/lib/arch/win32/XArchWindows.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
  * 

src/lib/barrier/App.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
  * 
@@ -16,17 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "synergy/App.h"
+#include "barrier/App.h"
 
 #include "base/Log.h"
 #include "common/Version.h"
-#include "synergy/protocol_types.h"
+#include "barrier/protocol_types.h"
 #include "arch/Arch.h"
 #include "base/XBase.h"
 #include "arch/XArch.h"
 #include "base/log_outputters.h"
-#include "synergy/XSynergy.h"
-#include "synergy/ArgsBase.h"
+#include "barrier/XBarrier.h"
+#include "barrier/ArgsBase.h"
 #include "ipc/IpcServerProxy.h"
 #include "base/TMethodEventJob.h"
 #include "ipc/IpcMessage.h"
@@ -294,7 +294,7 @@ MinimalApp::foregroundStartup(int argc, char** argv)
     return 0;
 }
 
-synergy::Screen*
+barrier::Screen*
 MinimalApp::createScreen()
 {
     return NULL;

src/lib/barrier/App.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
  * 
@@ -19,23 +19,23 @@
 #pragma once
 
 #include "ipc/IpcClient.h"
-#include "synergy/IApp.h"
+#include "barrier/IApp.h"
 #include "base/String.h"
 #include "base/Log.h"
 #include "base/EventQueue.h"
 #include "common/common.h"
 
 #if SYSAPI_WIN32
-#include "synergy/win32/AppUtilWindows.h"
+#include "barrier/win32/AppUtilWindows.h"
 #elif SYSAPI_UNIX
-#include "synergy/unix/AppUtilUnix.h"
+#include "barrier/unix/AppUtilUnix.h"
 #endif
 
 class IArchTaskBarReceiver;
 class BufferedLogOutputter;
 class ILogOutputter;
 class FileLogOutputter;
-namespace synergy { class Screen; }
+namespace barrier { class Screen; }
 class IEventQueue;
 class SocketMultiplexer;
 
@@ -133,7 +133,7 @@ public:
     virtual void        startNode();
     virtual int            mainLoop();
     virtual int            foregroundStartup(int argc, char** argv);
-    virtual synergy::Screen*    
+    virtual barrier::Screen*    
                         createScreen();
     virtual void        loadConfig();
     virtual bool        loadConfig(const String& pathname);

src/lib/barrier/AppUtil.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
  * 
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  
-#include "synergy/AppUtil.h"
+#include "barrier/AppUtil.h"
 
 AppUtil* AppUtil::s_instance = nullptr;
  

src/lib/barrier/AppUtil.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/IAppUtil.h"
-#include "synergy/XSynergy.h"
+#include "barrier/IAppUtil.h"
+#include "barrier/XBarrier.h"
 
 class AppUtil : public IAppUtil {
 public:

src/lib/barrier/ArgParser.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2014-2016 Symless Ltd.
  *
  * This package is free software; you can redistribute it and/or
@@ -15,14 +15,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "synergy/ArgParser.h"
+#include "barrier/ArgParser.h"
 
-#include "synergy/StreamChunker.h"
-#include "synergy/App.h"
-#include "synergy/ServerArgs.h"
-#include "synergy/ClientArgs.h"
-#include "synergy/ToolArgs.h"
-#include "synergy/ArgsBase.h"
+#include "barrier/StreamChunker.h"
+#include "barrier/App.h"
+#include "barrier/ServerArgs.h"
+#include "barrier/ClientArgs.h"
+#include "barrier/ToolArgs.h"
+#include "barrier/ArgsBase.h"
 #include "base/Log.h"
 #include "base/String.h"
 
@@ -55,7 +55,7 @@ ArgParser::parseServerArgs(ServerArgs& args, int argc, const char* const* argv)
         }
         else if (isArg(i, argc, argv, "-a", "--address", 1)) {
             // save listen address
-            args.m_synergyAddress = argv[++i];
+            args.m_barrierAddress = argv[++i];
         }
         else if (isArg(i, argc, argv, "-c", "--config", 1)) {
             // save configuration file path
@@ -106,7 +106,7 @@ ArgParser::parseClientArgs(ClientArgs& args, int argc, const char* const* argv)
         }
         else {
             if (i + 1 == argc) {
-                args.m_synergyAddress = argv[i];
+                args.m_barrierAddress = argv[i];
                 return true;
             }
 
@@ -134,7 +134,7 @@ ArgParser::parsePlatformArg(ArgsBase& argsBase, const int& argc, const char* con
 {
 #if WINAPI_MSWINDOWS
     if (isArg(i, argc, argv, NULL, "--service")) {
-        LOG((CLOG_WARN "obsolete argument --service, use synergyd instead."));
+        LOG((CLOG_WARN "obsolete argument --service, use barrierd instead."));
         argsBase.m_shouldExit = true;
     }
     else if (isArg(i, argc, argv, NULL, "--exit-pause")) {
@@ -266,10 +266,10 @@ ArgParser::parseGenericArgs(int argc, const char* const* argv, int& i)
         argsBase().m_enableIpc = true;
     }
     else if (isArg(i, argc, argv, NULL, "--server")) {
-        // HACK: stop error happening when using portable (synergyp)
+        // HACK: stop error happening when using portable (barrierp)
     }
     else if (isArg(i, argc, argv, NULL, "--client")) {
-        // HACK: stop error happening when using portable (synergyp)
+        // HACK: stop error happening when using portable (barrierp)
     }
     else if (isArg(i, argc, argv, NULL, "--enable-drag-drop")) {
         bool useDragDrop = true;

src/lib/barrier/ArgParser.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2014-2016 Symless Ltd.
  * 
  * This package is free software; you can redistribute it and/or

src/lib/barrier/ArgsBase.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) 2012 Nick Bolton
  * 
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "synergy/ArgsBase.h"
+#include "barrier/ArgsBase.h"
 
 ArgsBase::ArgsBase() :
 #if SYSAPI_WIN32
@@ -41,7 +41,7 @@ m_disableTray(false),
 m_enableIpc(false),
 m_enableDragDrop(false),
 m_shouldExit(false),
-m_synergyAddress(),
+m_barrierAddress(),
 m_enableCrypto(false),
 m_profileDirectory(""),
 m_pluginDirectory("")

src/lib/barrier/ArgsBase.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) 2012 Nick Bolton
  * 
@@ -47,7 +47,7 @@ public:
     bool                m_disableXInitThreads;
 #endif
     bool                m_shouldExit;
-    String                m_synergyAddress;
+    String                m_barrierAddress;
     bool                m_enableCrypto;
     String                m_profileDirectory;
     String                m_pluginDirectory;

src/lib/barrier/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
 # 
@@ -29,7 +29,7 @@ endif()
 list(APPEND sources ${arch_sources})
 list(APPEND headers ${arch_headers})
 
-if (SYNERGY_ADD_HEADERS)
+if (BARRIER_ADD_HEADERS)
     list(APPEND sources ${headers})
 endif()
 

src/lib/barrier/Chunk.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2015-2016 Symless Ltd.
  * 
  * This package is free software; you can redistribute it and/or
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "synergy/Chunk.h"
+#include "barrier/Chunk.h"
 #include "base/String.h"
 
 Chunk::Chunk(size_t size): m_dataSize(0)

src/lib/barrier/Chunk.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2015-2016 Symless Ltd.
  * 
  * This package is free software; you can redistribute it and/or

src/lib/barrier/ClientApp.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
  * 
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "synergy/ClientApp.h"
+#include "barrier/ClientApp.h"
 
 #include "client/Client.h"
-#include "synergy/ArgParser.h"
-#include "synergy/protocol_types.h"
-#include "synergy/Screen.h"
-#include "synergy/XScreen.h"
-#include "synergy/ClientArgs.h"
+#include "barrier/ArgParser.h"
+#include "barrier/protocol_types.h"
+#include "barrier/Screen.h"
+#include "barrier/XScreen.h"
+#include "barrier/ClientArgs.h"
 #include "net/NetworkAddress.h"
 #include "net/TCPSocketFactory.h"
 #include "net/SocketMultiplexer.h"
@@ -85,9 +85,9 @@ ClientApp::parseArgs(int argc, const char* const* argv)
     }
     else {
         // save server address
-        if (!args().m_synergyAddress.empty()) {
+        if (!args().m_barrierAddress.empty()) {
             try {
-                *m_serverAddress = NetworkAddress(args().m_synergyAddress, kDefaultPort);
+                *m_serverAddress = NetworkAddress(args().m_barrierAddress, kDefaultPort);
                 m_serverAddress->resolve();
             }
             catch (XSocketAddress& e) {
@@ -129,7 +129,7 @@ ClientApp::help()
         HELP_COMMON_ARGS
         " <server-address>"
         "\n\n"
-        "Connect to a synergy mouse/keyboard sharing server.\n"
+        "Connect to a barrier mouse/keyboard sharing server.\n"
         "\n"
         HELP_COMMON_INFO_1
         WINAPI_INFO
@@ -153,9 +153,9 @@ const char*
 ClientApp::daemonName() const
 {
 #if SYSAPI_WIN32
-    return "Synergy Client";
+    return "Barrier Client";
 #elif SYSAPI_UNIX
-    return "synergyc";
+    return "barrierc";
 #endif
 }
 
@@ -169,18 +169,18 @@ ClientApp::daemonInfo() const
 #endif
 }
 
-synergy::Screen*
+barrier::Screen*
 ClientApp::createScreen()
 {
 #if WINAPI_MSWINDOWS
-    return new synergy::Screen(new MSWindowsScreen(
+    return new barrier::Screen(new MSWindowsScreen(
         false, args().m_noHooks, args().m_stopOnDeskSwitch, m_events), m_events);
 #elif WINAPI_XWINDOWS
-    return new synergy::Screen(new XWindowsScreen(
+    return new barrier::Screen(new XWindowsScreen(
         args().m_display, false, args().m_disableXInitThreads,
         args().m_yscroll, m_events), m_events);
 #elif WINAPI_CARBON
-    return new synergy::Screen(new OSXScreen(m_events, false), m_events);
+    return new barrier::Screen(new OSXScreen(m_events, false), m_events);
 #endif
 }
 
@@ -240,10 +240,10 @@ ClientApp::handleScreenError(const Event&, void*)
 }
 
 
-synergy::Screen*
+barrier::Screen*
 ClientApp::openClientScreen()
 {
-    synergy::Screen* screen = createScreen();
+    barrier::Screen* screen = createScreen();
     screen->setEnableDragDrop(argsBase().m_enableDragDrop);
     m_events->adoptHandler(m_events->forIScreen().error(),
         screen->getEventTarget(),
@@ -254,7 +254,7 @@ ClientApp::openClientScreen()
 
 
 void
-ClientApp::closeClientScreen(synergy::Screen* screen)
+ClientApp::closeClientScreen(barrier::Screen* screen)
 {
     if (screen != NULL) {
         m_events->removeHandler(m_events->forIScreen().error(),
@@ -333,7 +333,7 @@ ClientApp::handleClientDisconnected(const Event&, void*)
 
 Client*
 ClientApp::openClient(const String& name, const NetworkAddress& address,
-                synergy::Screen* screen)
+                barrier::Screen* screen)
 {
     Client* client = new Client(
         m_events,
@@ -394,7 +394,7 @@ bool
 ClientApp::startClient()
 {
     double retryTime;
-    synergy::Screen* clientScreen = NULL;
+    barrier::Screen* clientScreen = NULL;
     try {
         if (m_clientScreen == NULL) {
             clientScreen = openClientScreen();

src/lib/barrier/ClientApp.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,9 +18,9 @@
 
 #pragma once
 
-#include "synergy/App.h"
+#include "barrier/App.h"
 
-namespace synergy { class Screen; }
+namespace barrier { class Screen; }
 class Event;
 class Client;
 class NetworkAddress;
@@ -51,21 +51,21 @@ public:
     int foregroundStartup(int argc, char** argv);
     int standardStartup(int argc, char** argv);
     int runInner(int argc, char** argv, ILogOutputter* outputter, StartupFunc startup);
-    synergy::Screen* createScreen();
+    barrier::Screen* createScreen();
     void updateStatus();
     void updateStatus(const String& msg);
     void resetRestartTimeout();
     double nextRestartTimeout();
     void handleScreenError(const Event&, void*);
-    synergy::Screen* openClientScreen();
-    void closeClientScreen(synergy::Screen* screen);
+    barrier::Screen* openClientScreen();
+    void closeClientScreen(barrier::Screen* screen);
     void handleClientRestart(const Event&, void* vtimer);
     void scheduleClientRestart(double retryTime);
     void handleClientConnected(const Event&, void*);
     void handleClientFailed(const Event& e, void*);
     void handleClientDisconnected(const Event&, void*);
     Client* openClient(const String& name, const NetworkAddress& address, 
-                synergy::Screen* screen);
+                barrier::Screen* screen);
     void closeClient(Client* client);
     bool startClient();
     void stopClient();
@@ -78,6 +78,6 @@ public:
 
 private:
     Client*            m_client;
-    synergy::Screen*m_clientScreen;
+    barrier::Screen*m_clientScreen;
     NetworkAddress*    m_serverAddress;
 };

src/lib/barrier/ClientArgs.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2014-2016 Symless Ltd.
  * 
  * This package is free software; you can redistribute it and/or
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "synergy/ClientArgs.h"
+#include "barrier/ClientArgs.h"
 
 ClientArgs::ClientArgs() :
     m_yscroll(0)

src/lib/barrier/ClientArgs.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2014-2016 Symless Ltd.
  * 
  * This package is free software; you can redistribute it and/or
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "synergy/ArgsBase.h"
+#include "barrier/ArgsBase.h"
 
 class NetworkAddress;
 

src/lib/barrier/ClientTaskBarReceiver.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) 2003 Chris Schoeneman
  * 
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "synergy/ClientTaskBarReceiver.h"
+#include "barrier/ClientTaskBarReceiver.h"
 #include "client/Client.h"
 #include "mt/Lock.h"
 #include "base/String.h"
@@ -117,22 +117,22 @@ ClientTaskBarReceiver::getToolTip() const
 {
     switch (m_state) {
     case kNotRunning:
-        return synergy::string::sprintf("%s:  Not running", kAppVersion);
+        return barrier::string::sprintf("%s:  Not running", kAppVersion);
 
     case kNotWorking:
-        return synergy::string::sprintf("%s:  %s",
+        return barrier::string::sprintf("%s:  %s",
                                 kAppVersion, m_errorMessage.c_str());
 
     case kNotConnected:
-        return synergy::string::sprintf("%s:  Not connected:  %s",
+        return barrier::string::sprintf("%s:  Not connected:  %s",
                                 kAppVersion, m_errorMessage.c_str());
 
     case kConnecting:
-        return synergy::string::sprintf("%s:  Connecting to %s...",
+        return barrier::string::sprintf("%s:  Connecting to %s...",
                                 kAppVersion, m_server.c_str());
 
     case kConnected:
-        return synergy::string::sprintf("%s:  Connected to %s",
+        return barrier::string::sprintf("%s:  Connected to %s",
                                 kAppVersion, m_server.c_str());
 
     default:

src/lib/barrier/ClientTaskBarReceiver.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) 2003 Chris Schoeneman
  * 
@@ -26,7 +26,7 @@
 
 class IEventQueue;
 
-//! Implementation of IArchTaskBarReceiver for the synergy server
+//! Implementation of IArchTaskBarReceiver for the barrier server
 class ClientTaskBarReceiver : public IArchTaskBarReceiver {
 public:
     ClientTaskBarReceiver(IEventQueue* events);

src/lib/barrier/Clipboard.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
  * 
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "synergy/Clipboard.h"
+#include "barrier/Clipboard.h"
 
 //
 // Clipboard

src/lib/barrier/Clipboard.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,7 +18,7 @@
 
 #pragma once
 
-#include "synergy/IClipboard.h"
+#include "barrier/IClipboard.h"
 
 //! Memory buffer clipboard
 /*!

src/lib/barrier/ClipboardChunk.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2015-2016 Symless Ltd.
  * 
  * This package is free software; you can redistribute it and/or
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "synergy/ClipboardChunk.h"
+#include "barrier/ClipboardChunk.h"
 
-#include "synergy/ProtocolUtil.h"
-#include "synergy/protocol_types.h"
+#include "barrier/ProtocolUtil.h"
+#include "barrier/protocol_types.h"
 #include "io/IStream.h"
 #include "base/Log.h"
 #include <cstring>
@@ -84,7 +84,7 @@ ClipboardChunk::end(ClipboardID id, UInt32 sequence)
 }
 
 int
-ClipboardChunk::assemble(synergy::IStream* stream,
+ClipboardChunk::assemble(barrier::IStream* stream,
                     String& dataCached,
                     ClipboardID& id,
                     UInt32& sequence)
@@ -97,7 +97,7 @@ ClipboardChunk::assemble(synergy::IStream* stream,
     }
     
     if (mark == kDataStart) {
-        s_expectedSize = synergy::string::stringToSizeType(data);
+        s_expectedSize = barrier::string::stringToSizeType(data);
         LOG((CLOG_DEBUG "start receiving clipboard data"));
         dataCached.clear();
         return kStart;
@@ -123,7 +123,7 @@ ClipboardChunk::assemble(synergy::IStream* stream,
 }
 
 void
-ClipboardChunk::send(synergy::IStream* stream, void* data)
+ClipboardChunk::send(barrier::IStream* stream, void* data)
 {
     ClipboardChunk* clipboardData = static_cast<ClipboardChunk*>(data);
 

src/lib/barrier/ClipboardChunk.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2015-2016 Symless Ltd.
  * 
  * This package is free software; you can redistribute it and/or
@@ -17,14 +17,14 @@
 
 #pragma once
 
-#include "synergy/Chunk.h"
-#include "synergy/clipboard_types.h"
+#include "barrier/Chunk.h"
+#include "barrier/clipboard_types.h"
 #include "base/String.h"
 #include "common/basic_types.h"
 
 #define CLIPBOARD_CHUNK_META_SIZE 7
 
-namespace synergy {
+namespace barrier {
 class IStream;
 };
 
@@ -46,12 +46,12 @@ public:
                         end(ClipboardID id, UInt32 sequence);
 
     static int            assemble(
-                            synergy::IStream* stream,
+                            barrier::IStream* stream,
                             String& dataCached,
                             ClipboardID& id,
                             UInt32& sequence);
 
-    static void            send(synergy::IStream* stream, void* data);
+    static void            send(barrier::IStream* stream, void* data);
 
     static size_t        getExpectedSize() { return s_expectedSize; }
 

src/lib/barrier/DaemonApp.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) 2012 Nick Bolton
  * 
@@ -19,12 +19,12 @@
 // TODO: split this class into windows and unix to get rid
 // of all the #ifdefs!
 
-#include "synergy/DaemonApp.h"
+#include "barrier/DaemonApp.h"
 
-#include "synergy/App.h"
-#include "synergy/ArgParser.h"
-#include "synergy/ServerArgs.h"
-#include "synergy/ClientArgs.h"
+#include "barrier/App.h"
+#include "barrier/ArgParser.h"
+#include "barrier/ServerArgs.h"
+#include "barrier/ClientArgs.h"
 #include "ipc/IpcClientProxy.h"
 #include "ipc/IpcMessage.h"
 #include "ipc/IpcLogOutputter.h"
@@ -41,7 +41,7 @@
 
 #include "arch/win32/ArchMiscWindows.h"
 #include "arch/win32/XArchWindows.h"
-#include "synergy/Screen.h"
+#include "barrier/Screen.h"
 #include "platform/MSWindowsScreen.h"
 #include "platform/MSWindowsDebugOutputter.h"
 #include "platform/MSWindowsWatchdog.h"
@@ -159,9 +159,9 @@ DaemonApp::run(int argc, char** argv)
         }
         else {
 #if SYSAPI_WIN32
-            arch.daemonize("Synergy", winMainLoopStatic);
+            arch.daemonize("Barrier", winMainLoopStatic);
 #elif SYSAPI_UNIX
-            arch.daemonize("Synergy", unixMainLoopStatic);
+            arch.daemonize("Barrier", unixMainLoopStatic);
 #endif
         }
 
@@ -267,7 +267,7 @@ void
 DaemonApp::foregroundError(const char* message)
 {
 #if SYSAPI_WIN32
-    MessageBox(NULL, message, "Synergy Service", MB_OK | MB_ICONERROR);
+    MessageBox(NULL, message, "Barrier Service", MB_OK | MB_ICONERROR);
 #elif SYSAPI_UNIX
     cerr << message << endl;
 #endif
@@ -311,7 +311,7 @@ DaemonApp::handleIpcMessage(const Event& e, void*)
                 ServerArgs serverArgs;
                 ClientArgs clientArgs;
                 int argc = static_cast<int>(argsArray.size());
-                bool server = argsArray[0].find("synergys") != String::npos ? true : false;
+                bool server = argsArray[0].find("barriers") != String::npos ? true : false;
                 ArgsBase* argBase = NULL;
 
                 if (server) {