Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spelling #1668

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
0926570
spelling: absolutely
jsoref May 6, 2022
a55ae16
spelling: attempts
jsoref May 6, 2022
f8a107e
spelling: azure
jsoref May 6, 2022
5e6cc0a
spelling: capitalized
jsoref May 6, 2022
0cfcf4b
spelling: characters
jsoref May 6, 2022
c3cbbb9
spelling: cyrillic
jsoref May 6, 2022
3e8f515
spelling: daemon
jsoref May 6, 2022
eef8f99
spelling: daemons
jsoref May 6, 2022
bbd6307
spelling: destination
jsoref May 6, 2022
c3d6c7a
spelling: disadvantages
jsoref May 6, 2022
12b499d
spelling: exception
jsoref May 6, 2022
d180a83
spelling: github
jsoref May 6, 2022
11bce11
spelling: hexadecimal
jsoref May 6, 2022
b2df399
spelling: increment
jsoref May 6, 2022
fdada4b
spelling: insensitive
jsoref May 6, 2022
15fa14d
spelling: intended
jsoref May 6, 2022
915d2f8
spelling: maximum
jsoref May 6, 2022
57a9a87
spelling: message
jsoref May 6, 2022
a9a31bb
spelling: modifiers
jsoref May 6, 2022
6e80c80
spelling: need
jsoref May 6, 2022
49dd16e
spelling: never
jsoref May 6, 2022
0216a8e
spelling: no longer
jsoref May 6, 2022
b00fa07
spelling: occurred
jsoref May 6, 2022
754d854
spelling: receive
jsoref May 6, 2022
f02ffd2
spelling: reported
jsoref May 6, 2022
982e096
spelling: resolved
jsoref May 6, 2022
fa30cea
spelling: roughly
jsoref May 6, 2022
7250bbc
spelling: running
jsoref May 6, 2022
0952ce7
spelling: scroll
jsoref May 6, 2022
c677f06
spelling: separate
jsoref May 6, 2022
c654415
spelling: subclasses
jsoref May 6, 2022
8414713
spelling: subject
jsoref May 6, 2022
1ccc2ea
spelling: subsequent
jsoref May 6, 2022
1466976
spelling: suppression
jsoref May 6, 2022
769e4f3
spelling: system
jsoref May 6, 2022
ff56faa
spelling: the
jsoref May 6, 2022
4da8adb
spelling: writability
jsoref May 6, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions RELEASING.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Brand

-------------------------------------

Go to https://github.com/buildbot/buildbot/releases and draft a new release.
Expand All @@ -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").
Expand Down
4 changes: 2 additions & 2 deletions debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down Expand Up @@ -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 ]
Expand Down
2 changes: 1 addition & 1 deletion dist/inno/scripts/lang/english.iss
Original file line number Diff line number Diff line change
Expand Up @@ -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=

Expand Down
8 changes: 4 additions & 4 deletions res/doxygen.cfg.in
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The doxygen file should probably be skipped... I keep running into it. (I actually intentionally didn't correct Javascript -> JavaScript)

Happy to drop this file or any others...

# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.

OUTPUT_LANGUAGE = English
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/gui/src/AppConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/gui/src/MainWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
Info
};

enum qRuningState {
enum qRunningState {
kStarted,
kStopped
};
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/src/SetupWizard.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class SetupWizard : public QWizard, public Ui::SetupWizardBase
Q_OBJECT
public:
enum {
kMaximiumLoginAttemps = 3
kMaximumLoginAttempts = 3
};

public:
Expand Down
2 changes: 1 addition & 1 deletion src/lib/arch/IArchDaemon.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/arch/IArchMultithread.h
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ class IArchMultithread : public IInterface {
//! 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.
Expand Down
2 changes: 1 addition & 1 deletion src/lib/arch/IArchNetwork.h
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class IArchNetwork : public IInterface {
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
Expand Down
2 changes: 1 addition & 1 deletion src/lib/arch/IArchTaskBarReceiver.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class IArchTaskBarReceiver : public IInterface {
//! 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;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/barrier/ArgParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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(" ");
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib/barrier/ClientApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib/barrier/KeyMap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicate word handling is a relatively new thing for me, but I think this is right.

// 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 =
Expand Down
2 changes: 1 addition & 1 deletion src/lib/barrier/XBarrier.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class XUnknownClient : public XBarrier {
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
Expand Down
2 changes: 1 addition & 1 deletion src/lib/base/EventTypes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -201,5 +201,5 @@ REGISTER_EVENT(Clipboard, clipboardSending)
//

REGISTER_EVENT(File, fileChunkSending)
REGISTER_EVENT(File, fileRecieveCompleted)
REGISTER_EVENT(File, fileReceiveCompleted)
REGISTER_EVENT(File, keepAlive)
6 changes: 3 additions & 3 deletions src/lib/base/EventTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -755,7 +755,7 @@ class FileEvents : public EventTypes {
Event::Type fileChunkSending();

//! Completed receiving a file
Event::Type fileRecieveCompleted();
Event::Type fileReceiveCompleted();

//! Send a keep alive
Event::Type keepAlive();
Expand All @@ -764,6 +764,6 @@ class FileEvents : public EventTypes {

private:
Event::Type m_fileChunkSending;
Event::Type m_fileRecieveCompleted;
Event::Type m_fileReceiveCompleted;
Event::Type m_keepAlive;
};
10 changes: 5 additions & 5 deletions src/lib/base/String.h
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand All @@ -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);

Expand All @@ -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:
Expand Down
14 changes: 7 additions & 7 deletions src/lib/base/log_outputters.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions src/lib/base/log_outputters.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ class BufferedLogOutputter : public ILogOutputter {
/*!
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);
Expand Down
12 changes: 6 additions & 6 deletions src/lib/client/Client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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(); });
Expand Down
4 changes: 2 additions & 2 deletions src/lib/client/Client.h
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,9 @@ class Client : public IClient, public INode {
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:
Expand Down
2 changes: 1 addition & 1 deletion src/lib/client/ServerProxy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/net/SecureSocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
Loading