Skip to content

Commit

Permalink
Merge pull request #5860 from DimitriPapadopoulos/codespell
Browse files Browse the repository at this point in the history
Fix residual typos found by codespell
  • Loading branch information
mgallien authored Sep 16, 2023
2 parents 6ebc94f + 09521ed commit b5cb8ee
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Don't set up tray context menu on macOS, even if not building app bundle by @claucambra in https://github.com/nextcloud/desktop/pull/4988
* CI: check clang tidy in ci by @mgallien in https://github.com/nextcloud/desktop/pull/4995
* Check our code with clang-tidy by @mgallien in https://github.com/nextcloud/desktop/pull/4999
* Alway use constexpr for all text constants by @mgallien in https://github.com/nextcloud/desktop/pull/4996
* Always use constexpr for all text constants by @mgallien in https://github.com/nextcloud/desktop/pull/4996
* Switch AppImage CI to latest tag: client-appimage-6 by @mgallien in https://github.com/nextcloud/desktop/pull/5003
* Apply modernize-use-using via clang-tidy by @mgallien in https://github.com/nextcloud/desktop/pull/4993
* Use [[nodiscard]] by @mgallien in https://github.com/nextcloud/desktop/pull/4992
Expand Down
2 changes: 1 addition & 1 deletion admin/win/nsi/lib/fileassoc.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
; !insertmacro APP_ASSOCIATE "txt" "myapp.textfile" "Description of txt files" \
; "$INSTDIR\myapp.exe,0" "Open with myapp" "$INSTDIR\myapp.exe $\"%1$\""
;
; Never insert the APP_ASSOCIATE macro multiple times, it is only ment
; Never insert the APP_ASSOCIATE macro multiple times, it is only meant
; to associate an application with a single file and using the
; the "open" verb as default. To add more verbs (actions) to a file
; use the APP_ASSOCIATE_ADDVERB macro.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ class NextcloudItemMetadataTable: Object {
comparingMetadata.favorite == self.favorite
}

/// Returns false if the user is lokced out of the file. I.e. The file is locked but by somone else
/// Returns false if the user is lokced out of the file. I.e. The file is locked but by someone else
func canUnlock(as user: String) -> Bool {
return !lock || (lockOwner == user && lockOwnerType == 0)
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/tray/activitylistmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,8 @@ void ActivityListModel::ingestActivities(const QJsonArray &activities)
QDateTime oldestDate = QDateTime::currentDateTime();
oldestDate = oldestDate.addDays(static_cast<qint64>(_maxActivitiesDays) * -1);

for (const auto &activ : activities) {
const auto json = activ.toObject();
for (const auto &activity : activities) {
const auto json = activity.toObject();

auto a = Activity::fromActivityJson(json, _accountState->account());

Expand Down
2 changes: 1 addition & 1 deletion src/libsync/abstractnetworkjob.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class OWNCLOUDSYNC_EXPORT AbstractNetworkJob : public QObject
* This function reads the body of the reply and parses out the
* error information, if possible.
*
* \a body is optinally filled with the reply body.
* \a body is optionally filled with the reply body.
*
* Warning: Needs to call reply()->readAll().
*/
Expand Down
2 changes: 1 addition & 1 deletion src/libsync/discoveryphase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ static void propertyMapToRemoteInfo(const QMap<QString, QString> &map, RemoteInf
// S means shared with me.
// But for our purpose, we want to know if the file is shared. It does not matter
// if we are the owner or not.
// Piggy back on the persmission field
// Piggy back on the permission field
result.remotePerm.setPermission(RemotePermissions::IsShared);
result.sharedByMe = true;
}
Expand Down
2 changes: 1 addition & 1 deletion test/testpermissions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ private slots:
QVERIFY(currentLocalState.find("readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data" ));
// new still exist
QVERIFY(currentLocalState.find("readonlyDirectory_PERM_M_/newname_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data" ));
// but is not on server: so remove it locally for the future comarison
// but is not on server: so remove it locally for the future comparison
fakeFolder.localModifier().remove("readonlyDirectory_PERM_M_/newname_PERM_CK_");

//2.
Expand Down

0 comments on commit b5cb8ee

Please sign in to comment.