Merge 4da8adb4b1 into 653e4badeb

RELEASING.md

@@ -1,7 +1,7 @@
 Creating a release
 ==================
 
-This document is documentation intednded for maintainers of Barrier.
+This document is documentation intended for maintainers of Barrier.
 It documents the release process of Barrier.
 
 Step 1: Setup environment variables
@@ -58,7 +58,7 @@ Push the tag:
     git push origin master --tags
 
 
-Step 6: Draft a new release on Github
+Step 6: Draft a new release on GitHub
 -------------------------------------
 
 Go to https://github.com/buildbot/buildbot/releases and draft a new release.
@@ -68,7 +68,7 @@ Use git tag as the title of the release: `vX.Y.Z`.
 Use the release notes generated by the `towncrier` tool as the description of the releases.
 
 Upload the artifacts created by Azure pipelines as the binaries of the release. The following
-artifacts should be uploaded to Github:
+artifacts should be uploaded to GitHub:
 
  - the Barrier-X.Y.Z-release.dmg created by the newest Mac OS task (artifact name is
    "Mac Release Disk Image and App XYZ").

debian/changelog

@@ -254,7 +254,7 @@ barrier (2.3.2) disco; urgency=medium
   * add checks to osx_environment.sh
 
   [ Thomas A. F. Thorne ]
-  * Reduce Sysmtem Tray Retry Attempts
+  * Reduce System Tray Retry Attempts
   * Do Not Warn About Missing System Tray
 
   [ jwestfall ]
@@ -347,7 +347,7 @@ barrier (2.3.2) disco; urgency=medium
   * Feature: CMake now generates compile_commands.json
 
   [ Thomas Thorne ]
-  * Reference Only Microsoft Azue Pipelines In Readme.md
+  * Reference Only Microsoft Azure Pipelines In Readme.md
   * Delete .travis.yml As We Switch To Azure Pipelines
 
   [ Evan Maddock ]

dist/inno/scripts/lang/english.iss

@@ -11,7 +11,7 @@ en.depinstall_title=Installing dependencies
 en.depinstall_description=Please wait while Setup installs dependencies on your computer.
 en.depinstall_status=Installing %1...
 en.depinstall_missing=%1 must be installed before setup can continue. Please install %1 and run Setup again.
-en.depinstall_error=An error occured while installing the dependencies. Please restart the computer and run the setup again or install the following dependencies manually:%n
+en.depinstall_error=An error occurred while installing the dependencies. Please restart the computer and run the setup again or install the following dependencies manually:%n
 
 en.isxdl_langfile=
 

res/doxygen.cfg.in

@@ -57,7 +57,7 @@ CREATE_SUBDIRS         = NO
 # Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
 # Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
 # messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
 # Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
 
 OUTPUT_LANGUAGE        = English
@@ -282,7 +282,7 @@ TYPEDEF_HIDES_STRUCT   = NO
 # causing a significant performance penality.
 # If the system has enough physical memory increasing the cache will improve the
 # performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
+# a logarithmic scale so increasing the size by one will roughly double the
 # memory usage. The cache size is given by this formula:
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols
@@ -1078,7 +1078,7 @@ SEARCHENGINE           = NO
 # using Javascript. Doxygen will generate the search PHP script and index
 # file to put on the web server. The advantage of the server
 # based approach is that it scales better to large projects and allows
-# full text search. The disadvances is that it is more difficult to setup
+# full text search. The disadvantages is that it is more difficult to setup
 # and does not have live searching capabilities.
 
 SERVER_BASED_SEARCH    = NO
@@ -1479,7 +1479,7 @@ DOT_NUM_THREADS        = 0
 # directory and reference it in all dot files that doxygen generates. This
 # font does not include all possible unicode characters however, so when you need
 # these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
+# using DOT_FONTNAME. You need to make sure dot is able to find the font,
 # which can be done by putting it in a standard location or by setting the
 # DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
 # containing the font.

src/gui/src/AppConfig.h

@@ -27,7 +27,7 @@
 // this should be incremented each time a new page is added. this is
 // saved to settings when the user finishes running the wizard. if
 // the saved wizard version is lower than this number, the wizard
-// will be displayed. each version incrememnt should be described
+// will be displayed. each version increment should be described
 // here...
 //
 //   1: first version

src/gui/src/MainWindow.h

@@ -83,7 +83,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
             Info
         };
 
-        enum qRuningState {
+        enum qRunningState {
             kStarted,
             kStopped
         };
@@ -193,7 +193,7 @@ public slots:
         bool m_SuppressAutoConfigWarning;
         CommandProcess* m_BonjourInstall;
         bool m_SuppressEmptyServerWarning;
-        qRuningState m_ExpectedRunningState;
+        qRunningState m_ExpectedRunningState;
         QMutex m_StopDesktopMutex;
         SslCertificate* m_pSslCertificate;
         QStringList m_PendingClientNames;

src/gui/src/SetupWizard.h

@@ -30,7 +30,7 @@ class SetupWizard : public QWizard, public Ui::SetupWizardBase
     Q_OBJECT
 public:
     enum {
-        kMaximiumLoginAttemps = 3
+        kMaximumLoginAttempts = 3
     };
 
 public:

src/lib/arch/IArchDaemon.h

@@ -24,7 +24,7 @@
 //! Interface for architecture dependent daemonizing
 /*!
 This interface defines the operations required by barrier for installing
-uninstalling daeamons and daemonizing a process.  Each architecture must
+uninstalling daemons and daemonizing a process.  Each architecture must
 implement this interface.
 */
 class IArchDaemon : public IInterface {

src/lib/arch/IArchMultithread.h

@@ -187,7 +187,7 @@ public:
     //! Force a thread to exit
     /*!
     Causes \c thread to exit when it next calls a cancellation point.
-    A thread avoids cancellation as long as it nevers calls a
+    A thread avoids cancellation as long as it never calls a
     cancellation point.  Once it begins the cancellation process it
     must always let cancellation go to completion but may take as
     long as necessary to clean up.

src/lib/arch/IArchNetwork.h

@@ -178,7 +178,7 @@ public:
     Waits up to \c timeout seconds for some socket to become readable
     and/or writable (or indefinitely if \c timeout < 0).  Returns the
     number of sockets that were readable (if readability was being
-    queried) or writable (if writablility was being queried) and sets
+    queried) or writable (if writability was being queried) and sets
     the \c m_revents members of the entries.  \c kPOLLERR and \c kPOLLNVAL
     are set in \c m_revents as appropriate.  If a socket indicates
     \c kPOLLERR then \c throwErrorOnSocket() can be used to determine

src/lib/arch/IArchTaskBarReceiver.h

@@ -85,7 +85,7 @@ public:
     //! Get tooltip
     /*!
     Returns the tool tip to display in the task bar.  The interface
-    to set the tooltip is left to sublclasses.  Getting and setting
+    to set the tooltip is left to subclasses.  Getting and setting
     the icon must be thread safe.
     */
     virtual std::string getToolTip() const = 0;

src/lib/barrier/ArgParser.cpp

@@ -473,7 +473,7 @@ ArgParser::assembleCommand(std::vector<String>& argsArray,  String ignoreArg, in
         }
 
         result.append(*it);
-        // add space to saperate args
+        // add space to separate args
         result.append(" ");
     }
 

src/lib/barrier/ClientApp.cpp

@@ -193,7 +193,7 @@ ClientApp::updateStatus(const String& msg)
 void
 ClientApp::resetRestartTimeout()
 {
-    // retry time can nolonger be changed
+    // retry time can no longer be changed
     //s_retryTime = 0.0;
 }
 

src/lib/barrier/KeyMap.cpp

@@ -735,7 +735,7 @@ KeyMap::keyForModifier(KeyButton button, SInt32 group,
 
     // find a key that generates the given modifier in the given group
     // but doesn't use the given button, presumably because we're trying
-    // to generate a KeyID that's only bound the the given button.
+    // to generate a KeyID that's only bound the given button.
     // this is important when a shift button is modified by shift;  we
     // must use the other shift button to do the shifting.
     const ModifierKeyItemList& items =

src/lib/barrier/XBarrier.h

@@ -111,7 +111,7 @@ private:
     std::string                m_name;
 };
 
-//! Generic exit eception
+//! Generic exit exception
 /*!
 Thrown when we want to abort, with the opportunity to clean up. This is a
 little bit of a hack, but it's a better way of exiting, than just calling

src/lib/base/EventTypes.cpp

@@ -201,5 +201,5 @@ REGISTER_EVENT(Clipboard, clipboardSending)
 //
 
 REGISTER_EVENT(File, fileChunkSending)
-REGISTER_EVENT(File, fileRecieveCompleted)
+REGISTER_EVENT(File, fileReceiveCompleted)
 REGISTER_EVENT(File, keepAlive)

src/lib/base/EventTypes.h

@@ -745,7 +745,7 @@ class FileEvents : public EventTypes {
 public:
     FileEvents() :
         m_fileChunkSending(Event::kUnknown),
-        m_fileRecieveCompleted(Event::kUnknown),
+        m_fileReceiveCompleted(Event::kUnknown),
         m_keepAlive(Event::kUnknown) { }
 
     //! @name accessors
@@ -755,7 +755,7 @@ public:
     Event::Type        fileChunkSending();
 
     //! Completed receiving a file
-    Event::Type        fileRecieveCompleted();
+    Event::Type        fileReceiveCompleted();
 
     //! Send a keep alive
     Event::Type        keepAlive();
@@ -764,6 +764,6 @@ public:
 
 private:
     Event::Type        m_fileChunkSending;
-    Event::Type        m_fileRecieveCompleted;
+    Event::Type        m_fileReceiveCompleted;
     Event::Type        m_keepAlive;
 };

src/lib/base/String.h

@@ -71,9 +71,9 @@ Finds the last dot and remove all characters from the dot to the end
 */
 std::string removeFileExt(std::string filename);
 
-//! Convert into hexdecimal
+//! Convert into hexadecimal
 /*!
-Convert each character in \c subject into hexdecimal form with \c width
+Convert each character in \c subject into hexadecimal form with \c width
 */
 std::string to_hex(const std::vector<std::uint8_t>& subject, int width, const char fill = '0');
 
@@ -86,9 +86,9 @@ Convert each character in \c subject to uppercase
 */
 void uppercase(std::string& subject);
 
-//! Remove all specific char in suject
+//! Remove all specific char in subject
 /*!
-Remove all specific \c c in \c suject
+Remove all specific \c c in \c subject
 */
 void removeChar(std::string& subject, const char c);
 
@@ -112,7 +112,7 @@ std::vector<std::string> splitString(std::string string, const char c);
 
 //! Case-insensitive comparisons
 /*!
-This class provides case-insensitve comparison functions.
+This class provides case-insensitive comparison functions.
 */
 class CaselessCmp {
     public:

src/lib/base/log_outputters.cpp

@@ -290,39 +290,39 @@ void
 FileLogOutputter::show(bool showIfEmpty) {}
 
 //
-// MesssageBoxLogOutputter
+// MessageBoxLogOutputter
 //
 
-MesssageBoxLogOutputter::MesssageBoxLogOutputter()
+MessageBoxLogOutputter::MessageBoxLogOutputter()
 {
     // do nothing
 }
 
-MesssageBoxLogOutputter::~MesssageBoxLogOutputter()
+MessageBoxLogOutputter::~MessageBoxLogOutputter()
 {
     // do nothing
 }
 
 void
-MesssageBoxLogOutputter::open(const char* title)
+MessageBoxLogOutputter::open(const char* title)
 {
     // do nothing
 }
 
 void
-MesssageBoxLogOutputter::close()
+MessageBoxLogOutputter::close()
 {
     // do nothing
 }
 
 void
-MesssageBoxLogOutputter::show(bool showIfEmpty)
+MessageBoxLogOutputter::show(bool showIfEmpty)
 {
     // do nothing
 }
 
 bool
-MesssageBoxLogOutputter::write(ELevel level, const char* msg)
+MessageBoxLogOutputter::write(ELevel level, const char* msg)
 {
     // don't spam user with messages.
     if (level > kERROR) {

src/lib/base/log_outputters.h

@@ -159,10 +159,10 @@ private:
 /*!
 The level for each message is ignored.
 */
-class MesssageBoxLogOutputter : public ILogOutputter {
+class MessageBoxLogOutputter : public ILogOutputter {
 public:
-    MesssageBoxLogOutputter();
-    virtual ~MesssageBoxLogOutputter();
+    MessageBoxLogOutputter();
+    virtual ~MessageBoxLogOutputter();
 
     // ILogOutputter overrides
     virtual void        open(const char* title);

src/lib/client/Client.cpp

@@ -90,10 +90,10 @@ Client::Client(IEventQueue* events, const std::string& name, const NetworkAddres
                                 this,
                                 new TMethodEventJob<Client>(this,
                                     &Client::handleFileChunkSending));
-        m_events->adoptHandler(m_events->forFile().fileRecieveCompleted(),
+        m_events->adoptHandler(m_events->forFile().fileReceiveCompleted(),
                                 this,
                                 new TMethodEventJob<Client>(this,
-                                    &Client::handleFileRecieveCompleted));
+                                    &Client::handleFileReceiveCompleted));
     }
 }
 
@@ -140,7 +140,7 @@ Client::connect()
         // Priddy.
         m_serverAddress.resolve();
 
-        // m_serverAddress will be null if the hostname address is not reolved
+        // m_serverAddress will be null if the hostname address is not resolved
         if (m_serverAddress.getAddress() != NULL) {
           // to help users troubleshoot, show server host name (issue: 60)
           LOG((CLOG_NOTE "connecting to '%s': %s:%i",
@@ -750,13 +750,13 @@ Client::handleFileChunkSending(const Event& event, void*)
 }
 
 void
-Client::handleFileRecieveCompleted(const Event& event, void*)
+Client::handleFileReceiveCompleted(const Event& event, void*)
 {
-    onFileRecieveCompleted();
+    onFileReceiveCompleted();
 }
 
 void
-Client::onFileRecieveCompleted()
+Client::onFileReceiveCompleted()
 {
     if (isReceivedFileSizeValid()) {
         m_writeToDropDirThread = new Thread([this](){ write_to_drop_dir_thread(); });

src/lib/client/Client.h

@@ -189,9 +189,9 @@ private:
     void                handleSuspend(const Event& event, void*);
     void                handleResume(const Event& event, void*);
     void                handleFileChunkSending(const Event&, void*);
-    void                handleFileRecieveCompleted(const Event&, void*);
+    void                handleFileReceiveCompleted(const Event&, void*);
     void                handleStopRetry(const Event&, void*);
-    void                onFileRecieveCompleted();
+    void                onFileReceiveCompleted();
     void                sendClipboardThread(void*);
 
 public:

src/lib/client/ServerProxy.cpp

@@ -879,7 +879,7 @@ ServerProxy::fileChunkReceived()
                     m_client->getExpectedFileSize());
 
     if (result == kFinish) {
-        m_events->addEvent(Event(m_events->forFile().fileRecieveCompleted(), m_client));
+        m_events->addEvent(Event(m_events->forFile().fileReceiveCompleted(), m_client));
     }
     else if (result == kStart) {
         if (m_client->getDragFileList().size() > 0) {

src/lib/net/SecureSocket.cpp

@@ -634,7 +634,7 @@ SecureSocket::checkResult(int status, int& retry)
                 LOG((CLOG_ERR "eof violates ssl protocol"));
             }
             else if (status == -1) {
-                // underlying socket I/O reproted an error
+                // underlying socket I/O reported an error
                 try {
                     ARCH->throwErrorOnSocket(getSocket());
                 }

src/lib/platform/MSWindowsUtil.cpp

@@ -65,7 +65,7 @@ std::string MSWindowsUtil::getErrorString(HINSTANCE hinstance, DWORD error, DWOR
 This is a quick and dirty iterative CreateDirectory() wrapper that does zero
 error checking. A much better cross-platform option exists in C++17 via
 std::filesystem. If/when the project is updated to use 17 this function should
-absolutley be replaced!
+absolutely be replaced!
 
 */
 

src/lib/platform/MSWindowsWatchdog.cpp

@@ -525,7 +525,7 @@ MSWindowsWatchdog::shutdownExistingProcesses()
             if (err != ERROR_NO_MORE_FILES) {
 
                 // only worry about error if it's not the end of the snapshot
-                LOG((CLOG_ERR "could not get subsiquent process entry"));
+                LOG((CLOG_ERR "could not get subsequent process entry"));
                 throw XArch(new XArchEvalWindows);
             }
         }

src/lib/platform/OSXKeyState.cpp

@@ -617,7 +617,7 @@ OSXKeyState::fakeKey(const Keystroke& keystroke)
 void
 OSXKeyState::getKeyMapForSpecialKeys(barrier::KeyMap& keyMap, SInt32 group) const
 {
-    // special keys are insensitive to modifers and none are dead keys
+    // special keys are insensitive to modifiers and none are dead keys
     barrier::KeyMap::KeyItem item;
     for (size_t i = 0; i < sizeof(s_controlKeys) /
                                 sizeof(s_controlKeys[0]); ++i) {

src/lib/platform/OSXScreen.mm

@@ -58,7 +58,7 @@ enum {
 
 // TODO: upgrade deprecated function usage in these functions.
 void setZeroSuppressionInterval();
-void avoidSupression();
+void avoidSuppression();
 void logCursorVisibility();
 void avoidHesitatingCursor();
 
@@ -588,7 +588,7 @@ void OSXScreen::get_drop_target_thread()
 #if defined(MAC_OS_X_VERSION_10_7)
 	char* cstr = NULL;
 
-	// wait for 5 secs for the drop destinaiton string to be filled.
+	// wait for 5 secs for the drop destination string to be filled.
 	UInt32 timeout = ARCH->time() + 5;
 
 	while (ARCH->time() < timeout) {
@@ -848,7 +848,7 @@ OSXScreen::enter()
 			IOObjectRelease(entry);
 		}
 
-		avoidSupression();
+		avoidSuppression();
 	}
 
 	// now on screen
@@ -2124,17 +2124,17 @@ setZeroSuppressionInterval()
 }
 
 void
-avoidSupression()
+avoidSuppression()
 {
 	// avoid suppression of local hardware events
 	// stkamp@users.sourceforge.net
-	CGSetLocalEventsFilterDuringSupressionState(
+	CGSetLocalEventsFilterDuringSuppressionState(
 							kCGEventFilterMaskPermitAllEvents,
-							kCGEventSupressionStateSupressionInterval);
-	CGSetLocalEventsFilterDuringSupressionState(
+							kCGEventSuppressionStateSuppressionInterval);
+	CGSetLocalEventsFilterDuringSuppressionState(
 							(kCGEventFilterMaskPermitLocalKeyboardEvents |
 							kCGEventFilterMaskPermitSystemDefinedEvents),
-							kCGEventSupressionStateRemoteMouseDrag);
+							kCGEventSuppressionStateRemoteMouseDrag);
 }
 
 void

src/lib/platform/XWindowsKeyState.cpp

@@ -637,7 +637,7 @@ XWindowsKeyState::updateKeysymMapXKB(barrier::KeyMap& keyMap)
                     (type->preserve[j].mask & LockMask) != 0) {
                     // sensitive caps lock and we preserve caps-lock.
                     // preserving caps-lock means we Xlib functions would
-                    // yield the capitialized KeySym so we'll adjust the
+                    // yield the capitalized KeySym so we'll adjust the
                     // level accordingly.
                     if ((level ^ 1) < type->num_levels) {
                         level ^= 1;

src/lib/server/ClientProxy1_5.cpp

@@ -89,7 +89,7 @@ ClientProxy1_5::fileChunkReceived()
 
 
     if (result == kFinish) {
-        m_events->addEvent(Event(m_events->forFile().fileRecieveCompleted(), server));
+        m_events->addEvent(Event(m_events->forFile().fileReceiveCompleted(), server));
     }
     else if (result == kStart) {
         if (server->getFakeDragFileList().size() > 0) {

src/lib/server/Server.cpp

@@ -191,10 +191,10 @@ Server::Server(
 								this,
 								new TMethodEventJob<Server>(this,
 									&Server::handleFileChunkSendingEvent));
-		m_events->adoptHandler(m_events->forFile().fileRecieveCompleted(),
+		m_events->adoptHandler(m_events->forFile().fileReceiveCompleted(),
 								this,
 								new TMethodEventJob<Server>(this,
-									&Server::handleFileRecieveCompletedEvent));
+									&Server::handleFileReceiveCompletedEvent));
 	}
 
 	// add connection
@@ -1528,9 +1528,9 @@ Server::handleFileChunkSendingEvent(const Event& event, void*)
 }
 
 void
-Server::handleFileRecieveCompletedEvent(const Event& event, void*)
+Server::handleFileReceiveCompletedEvent(const Event& event, void*)
 {
-	onFileRecieveCompleted();
+	onFileReceiveCompleted();
 }
 
 void
@@ -2078,7 +2078,7 @@ Server::onFileChunkSending(const void* data)
 }
 
 void
-Server::onFileRecieveCompleted()
+Server::onFileReceiveCompleted()
 {
 	if (isReceivedFileSizeValid()) {
         m_writeToDropDirThread = new Thread([this]() { write_to_drop_dir_thread(); });

src/lib/server/Server.h

@@ -315,7 +315,7 @@ private:
     void                handleFakeInputBeginEvent(const Event&, void*);
     void                handleFakeInputEndEvent(const Event&, void*);
     void                handleFileChunkSendingEvent(const Event&, void*);
-    void                handleFileRecieveCompletedEvent(const Event&, void*);
+    void                handleFileReceiveCompletedEvent(const Event&, void*);
 
     // event processing
     void                onClipboardChanged(BaseClientProxy* sender,
@@ -332,7 +332,7 @@ private:
     void                onMouseMoveSecondary(SInt32 dx, SInt32 dy);
     void                onMouseWheel(SInt32 xDelta, SInt32 yDelta);
     void                onFileChunkSending(const void* data);
-    void                onFileRecieveCompleted();
+    void                onFileReceiveCompleted();
 
     // add client to list and attach event handlers for client
     bool                addClient(BaseClientProxy*);

src/test/integtests/net/NetworkTests.cpp

@@ -85,16 +85,16 @@ public:
     void                sendMockData(void* eventTarget);
 
     void                sendToClient_mockData_handleClientConnected(const Event&, void* vlistener);
-    void                sendToClient_mockData_fileRecieveCompleted(const Event&, void*);
+    void                sendToClient_mockData_fileReceiveCompleted(const Event&, void*);
 
     void                sendToClient_mockFile_handleClientConnected(const Event&, void* vlistener);
-    void                sendToClient_mockFile_fileRecieveCompleted(const Event& event, void*);
+    void                sendToClient_mockFile_fileReceiveCompleted(const Event& event, void*);
 
     void                sendToServer_mockData_handleClientConnected(const Event&, void* vlistener);
-    void                sendToServer_mockData_fileRecieveCompleted(const Event& event, void*);
+    void                sendToServer_mockData_fileReceiveCompleted(const Event& event, void*);
 
     void                sendToServer_mockFile_handleClientConnected(const Event&, void* vlistener);
-    void                sendToServer_mockFile_fileRecieveCompleted(const Event& event, void*);
+    void                sendToServer_mockFile_fileReceiveCompleted(const Event& event, void*);
 
 public:
     TestEventQueue        m_events;
@@ -150,16 +150,16 @@ TEST_F(NetworkTests, sendToClient_mockData)
     Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, clientArgs);
 
     m_events.adoptHandler(
-        m_events.forFile().fileRecieveCompleted(), &client,
+        m_events.forFile().fileReceiveCompleted(), &client,
         new TMethodEventJob<NetworkTests>(
-            this, &NetworkTests::sendToClient_mockData_fileRecieveCompleted));
+            this, &NetworkTests::sendToClient_mockData_fileReceiveCompleted));
 
     client.connect();
 
     m_events.initQuitTimeout(10);
     m_events.loop();
     m_events.removeHandler(m_events.forClientListener().connected(), &listener);
-    m_events.removeHandler(m_events.forFile().fileRecieveCompleted(), &client);
+    m_events.removeHandler(m_events.forFile().fileReceiveCompleted(), &client);
     m_events.cleanupQuitTimeout();
 }
 
@@ -209,16 +209,16 @@ TEST_F(NetworkTests, sendToClient_mockFile)
     Client client(&m_events, "stub", serverAddress, clientSocketFactory, &clientScreen, clientArgs);
 
     m_events.adoptHandler(
-        m_events.forFile().fileRecieveCompleted(), &client,
+        m_events.forFile().fileReceiveCompleted(), &client,
         new TMethodEventJob<NetworkTests>(
-            this, &NetworkTests::sendToClient_mockFile_fileRecieveCompleted));
+            this, &NetworkTests::sendToClient_mockFile_fileReceiveCompleted));
 
     client.connect();
 
     m_events.initQuitTimeout(10);
     m_events.loop();
     m_events.removeHandler(m_events.forClientListener().connected(), &listener);
-    m_events.removeHandler(m_events.forFile().fileRecieveCompleted(), &client);
+    m_events.removeHandler(m_events.forFile().fileReceiveCompleted(), &client);
     m_events.cleanupQuitTimeout();
 }
 
@@ -266,16 +266,16 @@ TEST_F(NetworkTests, sendToServer_mockData)
             this, &NetworkTests::sendToServer_mockData_handleClientConnected, &client));
 
     m_events.adoptHandler(
-        m_events.forFile().fileRecieveCompleted(), &server,
+        m_events.forFile().fileReceiveCompleted(), &server,
         new TMethodEventJob<NetworkTests>(
-            this, &NetworkTests::sendToServer_mockData_fileRecieveCompleted));
+            this, &NetworkTests::sendToServer_mockData_fileReceiveCompleted));
 
     client.connect();
 
     m_events.initQuitTimeout(10);
     m_events.loop();
     m_events.removeHandler(m_events.forClientListener().connected(), &listener);
-    m_events.removeHandler(m_events.forFile().fileRecieveCompleted(), &server);
+    m_events.removeHandler(m_events.forFile().fileReceiveCompleted(), &server);
     m_events.cleanupQuitTimeout();
 }
 
@@ -324,16 +324,16 @@ TEST_F(NetworkTests, sendToServer_mockFile)
             this, &NetworkTests::sendToServer_mockFile_handleClientConnected, &client));
 
     m_events.adoptHandler(
-        m_events.forFile().fileRecieveCompleted(), &server,
+        m_events.forFile().fileReceiveCompleted(), &server,
         new TMethodEventJob<NetworkTests>(
-            this, &NetworkTests::sendToServer_mockFile_fileRecieveCompleted));
+            this, &NetworkTests::sendToServer_mockFile_fileReceiveCompleted));
 
     client.connect();
 
     m_events.initQuitTimeout(10);
     m_events.loop();
     m_events.removeHandler(m_events.forClientListener().connected(), &listener);
-    m_events.removeHandler(m_events.forFile().fileRecieveCompleted(), &server);
+    m_events.removeHandler(m_events.forFile().fileReceiveCompleted(), &server);
     m_events.cleanupQuitTimeout();
 }
 
@@ -356,7 +356,7 @@ NetworkTests::sendToClient_mockData_handleClientConnected(const Event&, void* vl
 }
 
 void
-NetworkTests::sendToClient_mockData_fileRecieveCompleted(const Event& event, void*)
+NetworkTests::sendToClient_mockData_fileReceiveCompleted(const Event& event, void*)
 {
     Client* client = static_cast<Client*>(event.getTarget());
     EXPECT_TRUE(client->isReceivedFileSizeValid());
@@ -383,7 +383,7 @@ NetworkTests::sendToClient_mockFile_handleClientConnected(const Event&, void* vl
 }
 
 void
-NetworkTests::sendToClient_mockFile_fileRecieveCompleted(const Event& event, void*)
+NetworkTests::sendToClient_mockFile_fileReceiveCompleted(const Event& event, void*)
 {
     Client* client = static_cast<Client*>(event.getTarget());
     EXPECT_TRUE(client->isReceivedFileSizeValid());
@@ -399,7 +399,7 @@ NetworkTests::sendToServer_mockData_handleClientConnected(const Event&, void* vc
 }
 
 void
-NetworkTests::sendToServer_mockData_fileRecieveCompleted(const Event& event, void*)
+NetworkTests::sendToServer_mockData_fileReceiveCompleted(const Event& event, void*)
 {
     Server* server = static_cast<Server*>(event.getTarget());
     EXPECT_TRUE(server->isReceivedFileSizeValid());
@@ -415,7 +415,7 @@ NetworkTests::sendToServer_mockFile_handleClientConnected(const Event&, void* vc
 }
 
 void
-NetworkTests::sendToServer_mockFile_fileRecieveCompleted(const Event& event, void*)
+NetworkTests::sendToServer_mockFile_fileReceiveCompleted(const Event& event, void*)
 {
     Server* server = static_cast<Server*>(event.getTarget());
     EXPECT_TRUE(server->isReceivedFileSizeValid());

src/test/unittests/barrier/GenericArgsParsingTests.cpp

@@ -95,33 +95,33 @@ TEST(GenericArgsParsingTests, parseGenericArgs_logFileCmdWithSpace_saveLogFilena
     EXPECT_EQ(2, i);
 }
 
-TEST(GenericArgsParsingTests, parseGenericArgs_noDeamonCmd_daemonFalse)
+TEST(GenericArgsParsingTests, parseGenericArgs_noDaemonCmd_daemonFalse)
 {
     int i = 1;
     const int argc = 2;
-    const char* kNoDeamonCmd[argc] = { "stub", "-f" };
+    const char* kNoDaemonCmd[argc] = { "stub", "-f" };
 
     ArgParser argParser(NULL);
     ArgsBase argsBase;
     argParser.setArgsBase(argsBase);
 
-    argParser.parseGenericArgs(argc, kNoDeamonCmd, i);
+    argParser.parseGenericArgs(argc, kNoDaemonCmd, i);
 
     EXPECT_FALSE(argsBase.m_daemon);
     EXPECT_EQ(1, i);
 }
 
-TEST(GenericArgsParsingTests, parseGenericArgs_deamonCmd_daemonTrue)
+TEST(GenericArgsParsingTests, parseGenericArgs_daemonCmd_daemonTrue)
 {
     int i = 1;
     const int argc = 2;
-    const char* kDeamonCmd[argc] = { "stub", "--daemon" };
+    const char* kDaemonCmd[argc] = { "stub", "--daemon" };
 
     ArgParser argParser(NULL);
     ArgsBase argsBase;
     argParser.setArgsBase(argsBase);
 
-    argParser.parseGenericArgs(argc, kDeamonCmd, i);
+    argParser.parseGenericArgs(argc, kDaemonCmd, i);
 
     EXPECT_EQ(true, argsBase.m_daemon);
     EXPECT_EQ(1, i);

src/test/unittests/barrier/KeyStateTests.cpp

@@ -216,7 +216,7 @@ TEST(KeyStateTests, updateKeyState_activeModifiers_maskNotSet)
     ASSERT_EQ(0, actual);
 }
 
-TEST(KeyStateTests, updateKeyState_activeModifiers_keyMapGotModifers)
+TEST(KeyStateTests, updateKeyState_activeModifiers_keyMapGotModifiers)
 {
     MockKeyMap keyMap;
     MockEventQueue eventQueue;
@@ -252,7 +252,7 @@ TEST(KeyStateTests, setHalfDuplexMask_numLock_halfDuplexNumLockAdded)
     keyState.setHalfDuplexMask(KeyModifierNumLock);
 }
 
-TEST(KeyStateTests, setHalfDuplexMask_scrollLock_halfDuplexScollLockAdded)
+TEST(KeyStateTests, setHalfDuplexMask_scrollLock_halfDuplexScrollLockAdded)
 {
     MockKeyMap keyMap;
     MockEventQueue eventQueue;

src/test/unittests/base/StringTests.cpp

@@ -99,7 +99,7 @@ TEST(StringTests, uppercase_lowercaseInput_uppercaseOutput)
     EXPECT_EQ("12FOO3BAR", subject);
 }
 
-TEST(StringTests, removeChar_inputString_removeAllSpecifiedCharactors)
+TEST(StringTests, removeChar_inputString_removeAllSpecifiedCharacters)
 {
     String subject = "foobar";
     const char c = 'o';