Skip to content

Commit

Permalink
Merge pull request #6069 from DimitriPapadopoulos/codespell
Browse files Browse the repository at this point in the history
Fix new typos found by codespell
  • Loading branch information
mgallien authored Sep 17, 2023
2 parents 2b4ad12 + 8a73a9a commit f8ad1f4
Show file tree
Hide file tree
Showing 16 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion doc/visualtour.rst
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Network

.. index:: proxy settings, SOCKS, bandwidth, throttling, limiting

This tab consolidates ``Proxy Settings`` and ``Bandwith Limiting``:
This tab consolidates ``Proxy Settings`` and ``Bandwidth Limiting``:

.. image:: images/settings_network.png
:scale: 50 %
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ - (void)processInBuffer

// Add NULL terminator, so we can use C string methods
if (firstSeparatorIndex.location == NSNotFound) {
NSLog(@"No separator found. Creating new buffer qith space for null terminator.");
NSLog(@"No separator found. Creating new buffer with space for null terminator.");

[_inBuffer appendBytes:terminator length:1];
nullTerminatorIndex = inBufferLength;
Expand Down
2 changes: 1 addition & 1 deletion src/common/pinstate.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ enum class PinState {

/** The file will never be synced to the cloud.
*
* Usefull for ignored files to indicate to the OS the file will never be
* Useful for ignored files to indicate to the OS the file will never be
* synced
*/
Excluded = 4,
Expand Down
4 changes: 2 additions & 2 deletions src/gui/accountstate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -567,10 +567,10 @@ void AccountState::slotCheckServerAvailibility()
|| state() == AccountState::SignedOut
|| state() == AccountState::MaintenanceMode
|| state() == AccountState::AskingCredentials) {
qCInfo(lcAccountState) << "Skipping server availibility check for account" << _account->davUser() << "with state" << state();
qCInfo(lcAccountState) << "Skipping server availability check for account" << _account->davUser() << "with state" << state();
return;
}
qCInfo(lcAccountState) << "Checking server availibility for account" << _account->davUser();
qCInfo(lcAccountState) << "Checking server availability for account" << _account->davUser();
const auto serverAvailibilityUrl = Utility::concatUrlPath(_account->url(), QLatin1String("/index.php/204"));
auto checkServerAvailibilityJob = _account->sendRequest(QByteArrayLiteral("GET"), serverAvailibilityUrl);
connect(checkServerAvailibilityJob, &SimpleNetworkJob::finishedSignal, this, [this](QNetworkReply *reply) {
Expand Down
2 changes: 1 addition & 1 deletion src/gui/folderman.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ void FolderMan::setupFolderFromOldConfigFile(const QString &fileNamePath, Accoun
auto legacyBlacklist = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList,
&ok);
if (!ok) {
qCInfo(lcFolderMan) << "There was a problem retriving the database selective sync for " << folder;
qCInfo(lcFolderMan) << "There was a problem retrieving the database selective sync for " << folder;
}

legacyBlacklist << settings.value(QLatin1String("blackList")).toStringList();
Expand Down
2 changes: 1 addition & 1 deletion src/gui/folderstatusmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ QStringList FolderStatusModel::createBlackList(const FolderStatusModel::SubFolde
result += createBlackList(root._subs.at(i), oldBlackList);
}
} else {
// We did not load from the server so we re-use the one from the old black list
// We did not load from the server so we reuse the one from the old black list
const QString path = root._path;
foreach (const QString &it, oldBlackList) {
if (it.startsWith(path))
Expand Down
2 changes: 1 addition & 1 deletion src/gui/folderwatcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ private slots:

QString findMatchingUnlockedFileInDir(const QString &dirPath, const QString &lockFileName);

/* Check if the path should be igored by the FolderWatcher. */
/* Check if the path should be ignored by the FolderWatcher. */
[[nodiscard]] bool pathIsIgnored(const QString &path) const;

/** Path of the expected test notification */
Expand Down
2 changes: 1 addition & 1 deletion src/gui/selectivesyncdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ QStringList SelectiveSyncWidget::createBlackList(QTreeWidgetItem *root) const
result += createBlackList(root->child(i));
}
} else {
// We did not load from the server so we re-use the one from the old black list
// We did not load from the server so we reuse the one from the old black list
QString path = root->data(0, Qt::UserRole).toString();
foreach (const QString &it, _oldBlackList) {
if (it.startsWith(path))
Expand Down
2 changes: 1 addition & 1 deletion src/libsync/account.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ QSslConfiguration Account::getOrCreateSslConfig()
// "An internal error number 1060 happened. SSL handshake failed, client certificate was requested: SSL error: sslv3 alert handshake failure"
QSslConfiguration sslConfig = QSslConfiguration::defaultConfiguration();

// Try hard to re-use session for different requests
// Try hard to reuse session for different requests
sslConfig.setSslOption(QSsl::SslOptionDisableSessionTickets, false);
sslConfig.setSslOption(QSsl::SslOptionDisableSessionSharing, false);
sslConfig.setSslOption(QSsl::SslOptionDisableSessionPersistence, false);
Expand Down
2 changes: 1 addition & 1 deletion src/libsync/creds/httpcredentials.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class OWNCLOUDSYNC_EXPORT HttpCredentials : public AbstractCredentials
QString fetchUser();
virtual bool sslIsTrusted() { return false; }

/* If we still have a valid refresh token, try to refresh it assynchronously and emit fetched()
/* If we still have a valid refresh token, try to refresh it asynchronously and emit fetched()
* otherwise return false
*/
bool refreshAccessToken();
Expand Down
2 changes: 1 addition & 1 deletion src/libsync/owncloudpropagator.h
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ class OWNCLOUDSYNC_EXPORT OwncloudPropagator : public QObject
/** The list of currently active jobs.
This list contains the jobs that are currently using resources and is used purely to
know how many jobs there is currently running for the scheduler.
Jobs add themself to the list when they do an assynchronous operation.
Jobs add themself to the list when they do an asynchronous operation.
Jobs can be several time on the list (example, when several chunks are uploaded in parallel)
*/
QList<PropagateItemJob *> _activeJobList;
Expand Down
4 changes: 2 additions & 2 deletions test/csync/std_tests/check_std_c_jhash.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ static void check_c_jhash_trials(void **state)
z=0;
for (i=0; i<hlen; ++i) { /*----------------------- for each input byte, */
for (j=0; j<8; ++j) { /*------------------------ for each input bit, */
for (m=1; m<8; ++m) { /*------------ for serveral possible initvals, */
for (m=1; m<8; ++m) { /*------------ for several possible initvals, */
for (l=0; l<HASHSTATE; ++l) e[l]=f[l]=g[l]=h[l]=x[l]=y[l]=~((uint32_t)0);

/*---- check that every output bit is affected by that input bit */
Expand Down Expand Up @@ -168,7 +168,7 @@ static void check_c_jhash64_trials(void **state)
z=0;
for (i=0; i<hlen; ++i) { /*----------------------- for each byte, */
for (j=0; j<8; ++j) { /*------------------------ for each bit, */
for (m=0; m<8; ++m) { /*-------- for serveral possible levels, */
for (m=0; m<8; ++m) { /*-------- for several possible levels, */
for (l=0; l<HASHSTATE; ++l) e[l]=f[l]=g[l]=h[l]=x[l]=y[l]=~((uint64_t)0);

/*---- check that every input bit affects every output bit */
Expand Down
2 changes: 1 addition & 1 deletion test/testsortedactivitylistmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ private slots:
QCOMPARE(sourceModel->rowCount(), sourceModel->maxPossibleActivities());

auto errorSyncFileItemActivity = exampleSyncFileItemActivity(accountState->account()->displayName(), {});
errorSyncFileItemActivity._message = QStringLiteral("Something went wrong and eveything exploded!");
errorSyncFileItemActivity._message = QStringLiteral("Something went wrong and everything exploded!");
errorSyncFileItemActivity._syncFileItemStatus = OCC::SyncFileItem::FatalError;

addActivity(model, &TestingALM::addSyncFileItemToActivityList, errorSyncFileItemActivity);
Expand Down
2 changes: 1 addition & 1 deletion test/testsynccfapi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1361,7 +1361,7 @@ private slots:
FakeFolder fakeFolder{FileInfo{}};
auto vfs = setupVfs(fakeFolder);

// Create a Windows shotcut (.lnk) file
// Create a Windows shortcut (.lnk) file
fakeFolder.remoteModifier().insert("linkfile.lnk");

QVERIFY(fakeFolder.syncOnce());
Expand Down
2 changes: 1 addition & 1 deletion test/testsyncengine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1671,7 +1671,7 @@ private slots:
fakeFolder.remoteModifier().insert(testUpperCaseFile);
QVERIFY(fakeFolder.syncOnce());

// we must get conflits
// we must get conflicts
conflicts = findCaseClashConflicts(fakeFolder.currentLocalState());
QCOMPARE(conflicts.size(), shouldHaveCaseClashConflict ? 1 : 0);

Expand Down
2 changes: 1 addition & 1 deletion test/testunifiedsearchlistmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class FakeProvider
QString _id;
QString _name;
qint32 _order = std::numeric_limits<qint32>::max();
quint32 _numItemsToInsert = 5; // how many fake resuls to insert
quint32 _numItemsToInsert = 5; // how many fake results to insert
};

// this will be used when initializing fake search results data for each provider
Expand Down

0 comments on commit f8ad1f4

Please sign in to comment.