Fix spelling

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -18,7 +18,7 @@ body:
     id: version
     attributes:
       label: Version
-      description: What version of Barrier are you runnning?
+      description: What version of Barrier are you running?
       options:
         - v2.0.0-RC1
         - v2.0.0-RC2

README.md

@@ -107,7 +107,7 @@ A: Start the binary with the argument `--config <path_to_saved_configuration>`
 
 Q: After loading my configuration on the client the field 'Server IP' is still empty!
 
-A: Edit your configuration to include the servers ip adress manually with 
+A: Edit your configuration to include the server's ip address manually with
 	(...)
 	section: options
 		serverhostname=<AAA.BBB.CCC.DDD>

clean_build.bat

@@ -65,7 +65,7 @@ if exist bin\Debug (
     mkdir bin\Release\platforms
     copy %B_QT_FULLPATH%\plugins\platforms\qwindows.dll bin\Release\platforms\ > NUL
 ) else (
-    echo Remember to copy supporting binaries and confiuration files!
+    echo Remember to copy supporting binaries and configuration files!
 )
 
 echo Build completed successfully

doc/barrier.conf.example-advanced

@@ -47,7 +47,7 @@ section: links
 end
 
 # The aliases section is to map the full names of the computers to their logical names used in the screens section
-# One way to find the actual name of a comptuer is to run hostname from a command window
+# One way to find the actual name of a computer is to run hostname from a command window
 section: aliases
 	# Laptop is actually known as John-Smiths-MacBook-3.local
 	John-Smiths-MacBook-3.local:

res/Readme.txt

@@ -1,4 +1,4 @@
-Thank you for chosing Barrier!
+Thank you for choosing Barrier!
 https://github.com/debauchee/barrier/
 
 Barrier allows you to share your keyboard and mouse between computers over a network.

res/makeicon.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 ICNS_BASE=../dist/macos/bundle/Barrier.app/Contents/Resources
 if ! which magick >/dev/null 2>&1; then
-    echo "Need ImageMagic for this"
+    echo "Need ImageMagick for this"
     exit 10
 fi
 cd "$(dirname "$0")" || exit $?

src/cmd/barrierd/barrierd.rc

@@ -73,7 +73,7 @@ BEGIN
             VALUE "ProductName", "Barrier"
             VALUE "ProductVersion", BARRIER_VERSION
             VALUE "OriginalFilename", "barrierd.exe"
-            VALUE "FileDescription", "Open source KVM software deamon"
+            VALUE "FileDescription", "Open source KVM software daemon"
             VALUE "InternalName", "barrierd"
         END
     END

src/gui/src/MainWindow.cpp

@@ -624,7 +624,7 @@ QString MainWindow::configFilename()
     if (m_pRadioInternalConfig->isChecked())
     {
         // TODO: no need to use a temporary file, since we need it to
-        // be permenant (since it'll be used for Windows services, etc).
+        // be permanent (since it'll be used for Windows services, etc).
         m_pTempConfigFile = new QTemporaryFile();
         if (!m_pTempConfigFile->open())
         {
@@ -729,7 +729,7 @@ void MainWindow::stopBarrier()
 
 void MainWindow::stopService()
 {
-    // send empty command to stop service from laucning anything.
+    // send empty command to stop service from launching anything.
     m_IpcClient.sendCommand("", appConfig().elevateMode());
 }
 

src/gui/src/ServerConfigDialog.cpp

@@ -76,7 +76,7 @@ void ServerConfigDialog::showEvent(QShowEvent* event)
 
     if (!m_Message.isEmpty())
     {
-        // TODO: ideally this massage box should pop up after the dialog is shown
+        // TODO: ideally this message box should pop up after the dialog is shown
         QMessageBox::information(this, tr("Configure server"), m_Message);
     }
 }

src/gui/src/SetupWizard.cpp

@@ -37,7 +37,7 @@ SetupWizard::SetupWizard(MainWindow& mainWindow, bool startMain) :
 
 #elif defined(Q_OS_WIN)
 
-    // when areo is disabled on windows, the next/back buttons
+    // when aero is disabled on windows, the next/back buttons
     // are hidden (must be a qt bug) -- resizing the window
     // to +1 of the original height seems to fix this.
     // NOTE: calling setMinimumSize after this will break

src/gui/src/SslCertificate.cpp

@@ -106,7 +106,7 @@ void SslCertificate::generateCertificate()
         arguments.append("-x509");
         arguments.append("-nodes");
 
-        // valide duration
+        // valid duration
         arguments.append("-days");
         arguments.append(kCertificateLifetime);
 

src/lib/arch/win32/ArchInternetWindows.cpp

@@ -72,7 +72,7 @@ std::string ArchInternetWindows::urlEncode(const std::string& url)
 
     std::string result(buffer);
 
-    // the win32 url encoding funcitons are pretty useless (to us) and only
+    // the win32 url encoding functions 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).
     barrier::string::findReplaceAll(result, "+", "%2B");

src/lib/arch/win32/XArchWindows.cpp

@@ -83,7 +83,7 @@ XArchEvalWinsock::eval() const noexcept
         /* 10052 */{WSAENETRESET,        "The connection must be reset because the Windows Sockets implementation dropped it"},
         /* 10053 */{WSAECONNABORTED,    "The virtual circuit was aborted due to timeout or other failure"},
         /* 10054 */{WSAECONNRESET,        "The virtual circuit was reset by the remote side"},
-        /* 10055 */{WSAENOBUFS,            "No buffer space is available or a buffer deadlock has occured. The socket cannot be created"},
+        /* 10055 */{WSAENOBUFS,            "No buffer space is available or a buffer deadlock has occurred. The socket cannot be created"},
         /* 10056 */{WSAEISCONN,            "The socket is already connected"},
         /* 10057 */{WSAENOTCONN,        "The socket is not connected"},
         /* 10058 */{WSAESHUTDOWN,        "The socket has been shutdown"},
@@ -100,7 +100,7 @@ XArchEvalWinsock::eval() const noexcept
         /* 10069 */{WSAEDQUOT,            "Undocumented WinSock error code"},
         /* 10070 */{WSAESTALE,            "Undocumented WinSock error code"},
         /* 10071 */{WSAEREMOTE,            "Undocumented WinSock error code"},
-        /* 10091 */{WSASYSNOTREADY,        "Underlying network subsytem is not ready for network communication"},
+        /* 10091 */{WSASYSNOTREADY,        "Underlying network subsystem is not ready for network communication"},
         /* 10092 */{WSAVERNOTSUPPORTED,    "The version of WinSock API support requested is not provided in this implementation"},
         /* 10093 */{WSANOTINITIALISED,    "WinSock subsystem not properly initialized"},
         /* 10101 */{WSAEDISCON,            "Virtual circuit has gracefully terminated connection"},

src/lib/barrier/IScreenSaver.h

@@ -56,7 +56,7 @@ public:
 
     //! Deactivate screen saver
     /*!
-    Deactivate (i.e. hide) the screen saver, reseting the screen saver
+    Deactivate (i.e. hide) the screen saver, resetting the screen saver
     timer.
     */
     virtual void        deactivate() = 0;

src/lib/barrier/protocol_types.h

@@ -267,8 +267,8 @@ extern const char*        kMsgDSetOptions;
 // 2 means the file transfer is finished.
 extern const char*        kMsgDFileTransfer;
 
-// drag infomation:  primary <-> secondary
+// drag information:  primary <-> secondary
-// transfer drag infomation. The first 2 bytes are used for storing
+// transfer drag information. The first 2 bytes are used for storing
 // the number of dragging objects. Then the following string consists
 // of each object's directory.
 extern const char*        kMsgDDragInfo;

src/lib/base/Log.cpp

@@ -62,7 +62,7 @@ Log::Log()
 {
     assert(s_log == NULL);
 
-    // other initalization
+    // other initialization
     m_maxPriority = g_defaultMaxPriority;
     m_maxNewlineLength = 0;
     insert(new ConsoleLogOutputter);

src/lib/client/Client.h

@@ -119,7 +119,7 @@ public:
     */
     NetworkAddress        getServerAddress() const;
 
-    //! Return true if recieved file size is valid
+    //! Return true if received file size is valid
     bool                isReceivedFileSizeValid();
 
     //! Return expected file size

src/lib/common/win32/DataDirectories.cpp

@@ -45,7 +45,7 @@ const std::string& DataDirectories::global(const std::string& path)
 const std::string& DataDirectories::systemconfig()
 {
     // systemconfig() is a special case in that it will track the current value
-    // of global() unless and until it is explictly set otherwise
+    // of global() unless and until it is explicitly set otherwise
     // previously it would default to the windows folder which was horrible!
     if (_systemconfig.empty())
         return global();

src/lib/mt/Thread.h

@@ -25,7 +25,7 @@ class IJob;
 //! Thread handle
 /*!
 Creating a Thread creates a new context of execution (i.e. thread) that
-runs simulatenously with the calling thread.  A Thread is only a handle
+runs simultaneously with the calling thread.  A Thread is only a handle
 to a thread;  deleting a Thread does not cancel or destroy the thread it
 refers to and multiple Thread objects can refer to the same thread.
 
@@ -122,7 +122,7 @@ public:
     /*!
     Change the priority of the thread.  Normal priority is 0, 1 is
     the next lower, etc.  -1 is the next higher, etc. but boosting
-    the priority may not be permitted and will be silenty ignored.
+    the priority may not be permitted and will be silently ignored.
     */
     void                setPriority(int n);
 

src/lib/net/NetworkAddress.h

@@ -43,7 +43,7 @@ public:
     If \c hostname can be parsed as a numerical address then that's how
     it's used, otherwise it's used as a host name.  If \c hostname ends
     in ":[0-9]+" then that suffix is extracted and used as the port,
-    overridding the port parameter.  The resulting port must be a valid
+    overriding the port parameter.  The resulting port must be a valid
     port number (zero is not a valid port number) otherwise \c XSocketAddress
     is thrown with an error of \c XSocketAddress::kBadPort.  The hostname
     is not resolved by the c'tor;  use \c resolve to do that.

src/lib/net/SecureSocket.cpp

@@ -658,7 +658,7 @@ SecureSocket::disconnect()
 void SecureSocket::formatFingerprint(std::string& fingerprint, bool hex, bool separator)
 {
     if (hex) {
-        // to hexidecimal
+        // to hexadecimal
         barrier::string::toHex(fingerprint, 2);
     }
 
@@ -666,7 +666,7 @@ void SecureSocket::formatFingerprint(std::string& fingerprint, bool hex, bool se
     barrier::string::uppercase(fingerprint);
 
     if (separator) {
-        // add colon to separate each 2 charactors
+        // add colon to separate each 2 characters
         size_t separators = fingerprint.size() / 2;
         for (size_t i = 1; i < separators; i++) {
             fingerprint.insert(i * 3 - 1, ":");
@@ -830,7 +830,7 @@ SecureSocket::showSecureCipherInfo()
     }
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
-	// m_ssl->m_ssl->session->ciphers is not forward compatable,
+	// m_ssl->m_ssl->session->ciphers is not forward compatible,
 	// In future release of OpenSSL, it's not visible,
     STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers;
 #else

src/lib/platform/MSWindowsDesks.cpp

@@ -803,7 +803,7 @@ MSWindowsDesks::checkDesk()
 
     // if active desktop changed then tell the old and new desk threads
     // about the change.  don't switch desktops when the screensaver is
-    // active becaue we'd most likely switch to the screensaver desktop
+    // active because we'd most likely switch to the screensaver desktop
     // which would have the side effect of forcing the screensaver to
     // stop.
     if (name != m_activeDeskName && !m_screensaver->isActive()) {

src/lib/platform/MSWindowsKeyState.cpp

@@ -1330,7 +1330,7 @@ MSWindowsKeyState::getKeyID(UINT virtualKey, KeyButton button) const
 	if ((LOWORD(m_keyLayout) & 0xffffu) == 0x0412u) {	// 0x0412 : Korean Locale ID
 		if (virtualKey == VK_HANGUL || virtualKey == VK_HANJA) {
 			// If shift-space is used to change the input mode,
-			// the extented bit is not set. So add it to get right key id.
+			// the extended bit is not set. So add it to get right key id.
 			button |= 0x100u;
 		}
 	}

src/lib/platform/MSWindowsWatchdog.h

@@ -81,7 +81,7 @@ private:
 
 //! Relauncher error
 /*!
-An error occured in the process watchdog.
+An error occurred in the process watchdog.
 */
 class XMSWindowsWatchdogError : public XBarrier {
 public:

src/lib/platform/OSXClipboard.cpp

@@ -52,7 +52,7 @@ OSXClipboard::OSXClipboard() :
 
     OSStatus syncErr = PasteboardSynchronize(m_pboard);
     if (syncErr != noErr) {
-        LOG((CLOG_DEBUG "failed to syncronize clipboard: error %i", syncErr));
+        LOG((CLOG_DEBUG "failed to synchronize clipboard: error %i", syncErr));
     }
 }
 

src/lib/platform/OSXDragSimulator.m

@@ -68,7 +68,7 @@ fakeDragging(const char* str, int cursorX, int cursorY)
 
 	dispatch_async(dispatch_get_main_queue(), ^{
 	NSRect screen = [[NSScreen mainScreen] frame];
-	NSLog ( @"screen size: witdh = %f height = %f", screen.size.width, screen.size.height);
+	NSLog ( @"screen size: width = %f height = %f", screen.size.width, screen.size.height);
 	NSLog ( @"mouseLocation: %d %d", cursorX, cursorY);
 
 	int newPosX = 0;

src/lib/platform/OSXScreen.mm

@@ -538,7 +538,7 @@ OSXScreen::fakeMouseButton(ButtonID id, bool press)
 
     // As long as the click is within the time window and distance window
     // increase clickState (double click, triple click, etc)
-    // This will allow for higher than triple click but the quartz documenation
+    // This will allow for higher than triple click but the quartz documentation
     // does not specify that this should be limited to triple click
     if (press) {
         if ((ARCH->time() - m_lastClickTime) <= clickTime && diff <= maxDiff){
@@ -1618,7 +1618,7 @@ OSXScreen::userSwitchCallback(EventHandlerCallRef nextHandler,
 //
 // OSXScreen::watchSystemPowerThread(void*)
 //
-// main of thread monitoring system power (sleep/wakup) using a CFRunLoop
+// main of thread monitoring system power (sleep/wakeup) using a CFRunLoop
 //
 
 void

src/lib/platform/XWindowsScreenSaver.h

@@ -115,7 +115,7 @@ private:
     // the X display
     Display*            m_display;
 
-    // window to receive xscreensaver repsonses
+    // window to receive xscreensaver responses
     Window                m_xscreensaverSink;
 
     // the target for the events we generate

src/lib/server/Server.cpp

@@ -1136,9 +1136,9 @@ Server::processOptions()
 		return;
 	}
 
-	m_switchNeedsShift = false;		// it seems if i don't add these
+	m_switchNeedsShift = false;		// it seems if I don't add these
 	m_switchNeedsControl = false;	// lines, the 'reload config' option
-	m_switchNeedsAlt = false;		// doesnt' work correct.
+	m_switchNeedsAlt = false;		// doesn't work correct.
 
 	bool newRelativeMoves = m_relativeMoves;
 	for (Config::ScreenOptions::const_iterator index = options->begin();

src/lib/server/Server.h

@@ -167,7 +167,7 @@ public:
     */
     void getClients(std::vector<std::string>& list) const;
 
-    //! Return true if recieved file size is valid
+    //! Return true if received file size is valid
     bool                isReceivedFileSizeValid();
 
     //! Return expected file data size
@@ -357,7 +357,7 @@ private:
     // force the cursor off of \p client
     void                forceLeaveClient(BaseClientProxy* client);
 
-    // thread funciton for sending file
+    // thread function for sending file
     void                sendFileThread(void*);
 
     // thread function for writing file to drop directory