Spelling

.craft.ini

@@ -3,9 +3,9 @@ Branch = master
 ShallowClone = False
 
 # Variables defined here override the default value
-# The variable names are casesensitive
+# The variable names are case-sensitive
 [Variables]
-#Values need to be overwritten to create a chache
+#Values need to be overwritten to create a cache
 UseCache = True
 CreateCache = True
 
@@ -17,7 +17,7 @@ QtVersion = 5.15.2
 CachePatchLvl = 5
 
 # set WORKSPACE to cwd, override on ci
-# with legacy fallbac APPVEYOR_BUILD_FOLDER
+# with legacy fallback APPVEYOR_BUILD_FOLDER
 WORKSPACE = ${Variables:APPVEYOR_BUILD_FOLDER}
 APPVEYOR_BUILD_FOLDER = ${Variables:Root}
 CiBuild = True

CONTRIBUTING.md

@@ -8,7 +8,7 @@ We are also available on [IRC][irc].
 * __Important__: When reporting an issue provide as much requested information as possible, we :heart: log files.
 * __SECURITY__: Report any potential security bug to security@owncloud.com following our [security policy](https://owncloud.com/security/) instead of filing an issue in our bug tracker
 * This repository is *only* for issues within the ownCloud desktop client. 
-  Issues in other components should be reported in their own repositores: 
+  Issues in other components should be reported in their own repositories: 
   - [ownCloud server](https://github.com/owncloud/core/issues)
   - [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar,
     Contacts...)

admin/osx/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-# Check if varialbe MAC_INSTALLER_BACKGROUND_FILE is defined. That might come
+# Check if variable MAC_INSTALLER_BACKGROUND_FILE is defined. That might come
 # from the OEM.cmake for branded clients or from OWNCLOUD.cmake for the non
 # branded client.
 # Make sure that the MAC_INSTALLER_BACKGROUND_FILE contains the full path, ie.

admin/osx/macosx.pkgproj.cmake

@@ -590,7 +590,7 @@
 			<dict>
 				<key>ALIGNMENT</key>
 				<integer>6</integer>
-				<key>APPAREANCES</key>
+				<key>APPEARANCES</key>
 				<dict>
 					<key>DARK_AQUA</key>
 					<dict>
@@ -642,7 +642,7 @@
 				<integer>0</integer>
 				<key>SCALING</key>
 				<integer>0</integer>
-				<key>SHARED_SETTINGS_FOR_ALL_APPAREANCES</key>
+				<key>SHARED_SETTINGS_FOR_ALL_APPEARANCES</key>
 				<true/>
 			</dict>
 			<key>INSTALLATION TYPE</key>

admin/osx/pre_install.sh.cmake

@@ -6,7 +6,7 @@
 # BASH_XTRACEFD=1
 # set -x
 
-# don't grep in one line, to avaoid grepping the grep process...
+# don't grep in one line, to avoid grepping the grep process...
 PROCESSES=$(ps aux)
 OC_INSTANCE=$(echo "${PROCESSES}" | grep "/Applications/@APPLICATION_EXECUTABLE@.app/Contents/MacOS/@APPLICATION_EXECUTABLE@")
 

changelog/2.10.1_2022-04-05/9236

@@ -1,4 +1,4 @@
-Bugfix: Client warns about non exisitng files
+Bugfix: Client warns about nonexistent files
 
 We fixed a bug where the client warns about ignored files that where added to the DB in previous versions of the client and do no longer exist.
 

changelog/2.10.1_2022-04-05/9375

@@ -1,4 +1,4 @@
-Bugfix: Raise ssl issue dialoig above the wizard
+Bugfix: Raise ssl issue dialog above the wizard
 
 Under certain conditions it was possible that the ssl dialog was hidden behind the wizard.
 

changelog/2.10.1_2022-04-05/9383

@@ -1,7 +1,7 @@
 Bugfix: Don't reset change time on upload
 
 We fixed a bug where we reset the change time of Windows placeholder files to the value in the database during uploads.
-This cold cause other applications to detect non existing changes in that file.
+This cold cause other applications to detect nonexistent changes in that file.
 
 https://github.com/owncloud/client/issues/9383
 https://github.com/owncloud/client-desktop-vfs-win/pull/16

changelog/2.10.1_2022-04-05/9533

@@ -1,4 +1,4 @@
-Bugfix: Possible crash when removing non exisitng folder
+Bugfix: Possible crash when removing nonexistent folder
 
 
 https://github.com/owncloud/client/issues/9533

resources/font-awesome/update_color.ps1

@@ -6,7 +6,7 @@ $COLOR=$Args[0]
 Write-Host "Color:" $COLOR
 if (-not $COLOR) {
     Write-Host "Please specify color"
-    Write-Host "update_corlor.ps1 `"#B5B6BB`""
+    Write-Host "update_color.ps1 `"#B5B6BB`""
     exit(1)
 }
 Get-ChildItem "*.svg" | % {

shell_integration/dolphin/ownclouddolphinactionplugin.cpp

@@ -66,7 +66,7 @@ class OwncloudDolphinPluginAction : public KAbstractFileItemActionPlugin
 
         auto menu = new QMenu(parentWidget);
         QEventLoop loop;
-        auto con = connect(helper, &OwncloudDolphinPluginHelper::commandRecieved, this, [&](const QByteArray &cmd) {
+        auto con = connect(helper, &OwncloudDolphinPluginHelper::commandReceived, this, [&](const QByteArray &cmd) {
             if (cmd.startsWith("GET_MENU_ITEMS:END")) {
                 loop.quit();
             } else if (cmd.startsWith("MENU_ITEM:")) {

shell_integration/dolphin/ownclouddolphinoverlayplugin.cpp

@@ -37,8 +37,8 @@ class OwncloudDolphinPlugin : public KOverlayIconPlugin
 
     OwncloudDolphinPlugin() {
         auto helper = OwncloudDolphinPluginHelper::instance();
-        QObject::connect(helper, &OwncloudDolphinPluginHelper::commandRecieved,
-                         this, &OwncloudDolphinPlugin::slotCommandRecieved);
+        QObject::connect(helper, &OwncloudDolphinPluginHelper::commandReceived,
+            this, &OwncloudDolphinPlugin::slotCommandReceived);
     }
 
     QStringList getOverlays(const QUrl& url) override {
@@ -80,8 +80,8 @@ class OwncloudDolphinPlugin : public KOverlayIconPlugin
         return r;
     }
 
-    void slotCommandRecieved(const QByteArray &line) {
-
+    void slotCommandReceived(const QByteArray &line)
+    {
         QList<QByteArray> tokens = line.split(':');
         if (tokens.count() != 3)
             return;

shell_integration/dolphin/ownclouddolphinpluginhelper.cpp

@@ -161,6 +161,6 @@ void OwncloudDolphinPluginHelper::slotReadyRead()
             }
         }
 
-        emit commandRecieved(line);
+        emit commandReceived(line);
     }
 }

shell_integration/dolphin/ownclouddolphinpluginhelper.h

@@ -55,7 +55,7 @@ class OWNCLOUDDOLPHINPLUGINHELPER_EXPORT OwncloudDolphinPluginHelper : public QO
     QByteArray version() { return _version; }
 
 signals:
-    void commandRecieved(const QByteArray &cmd);
+    void commandReceived(const QByteArray &cmd);
 
 protected:
     void timerEvent(QTimerEvent*) override;

shell_integration/icons/nopadding/SVG/generate_windows_ico.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Dimensions taken from https://www.apriorit.com/dev-blog/357-shell-extentions-basics-samples-common-problems#_Toc408244375
+# Dimensions taken from https://www.apriorit.com/dev-blog/357-shell-extensions-basics-samples-common-problems#_Toc408244375
 convert -background transparent attention.svg -gravity SouthWest \( -clone 0 -resize 10x10 -extent 16x16 \) \( -clone 0 -resize 16x16 -extent 32x32 \) \( -clone 0 -resize 24x24 -extent 48x48 \) \( -clone 0 -resize 128x128 -extent 256x256 \) -delete 0 ../../../windows/OCOverlays/ico/Warning.ico
 convert -background transparent error.svg -gravity SouthWest \( -clone 0 -resize 10x10 -extent 16x16 \) \( -clone 0 -resize 16x16 -extent 32x32 \) \( -clone 0 -resize 24x24 -extent 48x48 \) \( -clone 0 -resize 128x128 -extent 256x256 \) -delete 0 ../../../windows/OCOverlays/ico/Error.ico
 convert -background transparent ok.svg -gravity SouthWest \( -clone 0 -resize 10x10 -extent 16x16 \) \( -clone 0 -resize 16x16 -extent 32x32 \) \( -clone 0 -resize 24x24 -extent 48x48 \) \( -clone 0 -resize 128x128 -extent 256x256 \) -delete 0 ../../../windows/OCOverlays/ico/OK.ico

shell_integration/nautilus/syncstate.py

@@ -107,7 +107,7 @@ def _connectToSocketServer(self):
                 return False  # Don't run again
             except Exception as e:
                 print("Could not connect to unix socket " + sock_file + ". " + str(e))
-        except Exception as e:  # Bad habbit
+        except Exception as e:  # Bad habit
             print("Connect could not be established, try again later.")
             self._sock.close()
 

shell_integration/windows/3rdparty/nlohmann-json/json.hpp

@@ -22282,7 +22282,7 @@ class basic_json
     /*!
     @brief updates a JSON object from another object, overwriting existing keys
 
-    Inserts all values from from range `[first, last)` and overwrites existing
+    Inserts all values from range `[first, last)` and overwrites existing
     keys.
 
     @param[in] first begin of the range of elements to insert

shell_integration/windows/OCContextMenu/OCContextMenu.cpp

@@ -118,7 +118,7 @@ IFACEMETHODIMP OCContextMenu::Initialize(
 
 #pragma region IContextMenu
 
-void InsertSeperator(HMENU hMenu, UINT indexMenu)
+void InsertSeparator(HMENU hMenu, UINT indexMenu)
 {
     // Add a separator.
     MENUITEMINFO sep = { sizeof(sep) };
@@ -140,7 +140,7 @@ IFACEMETHODIMP OCContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT
         return MAKE_HRESULT(SEVERITY_SUCCESS, 0, USHORT(0));
     }
 
-    InsertSeperator(hMenu, indexMenu++);
+    InsertSeparator(hMenu, indexMenu++);
 
     HMENU hSubmenu = CreateMenu();
     {
@@ -157,7 +157,7 @@ IFACEMETHODIMP OCContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT
         if (!InsertMenuItem(hMenu, indexMenu++, TRUE, &mii))
             return HRESULT_FROM_WIN32(GetLastError());
     }
-    InsertSeperator(hMenu, indexMenu++);
+    InsertSeparator(hMenu, indexMenu++);
 
     UINT indexSubMenu = 0;
     for (auto &item : m_info.menuItems) {

shell_integration/windows/OCOverlays/OCOverlay.cpp

@@ -101,8 +101,8 @@ IFACEMETHODIMP_(ULONG) OCOverlay::Release()
 
 IFACEMETHODIMP OCOverlay::GetPriority(int *pPriority)
 {
-    // this defines which handler has prededence, so
-    // we order this in terms of likelyhood
+    // this defines which handler has precedence, so
+    // we order this in terms of likelihood
     switch (_state) {
     case State_OK:
         *pPriority = 0; break;

src/common/filesystembase.cpp

@@ -177,7 +177,7 @@ bool FileSystem::uncheckedRenameReplace(const QString &originFileName,
 #ifndef Q_OS_WIN
     bool success;
     QFile orig(originFileName);
-    // We want a rename that also overwites.  QFile::rename does not overwite.
+    // We want a rename that also overwrites.  QFile::rename does not overwrite.
     // Qt 5.1 has QSaveFile::renameOverwrite we could use.
     // ### FIXME
     success = true;

src/common/fixedsizeringbuffer.h

@@ -22,7 +22,7 @@
 namespace OCC {
 
 /**
- * A Fixed sized ring buffer optimized on continouous insertion
+ * A Fixed sized ring buffer optimized on continuous insertion
  */
 template <typename TYPE>
 class FixedSizeRingBuffer

src/common/syncjournaldb.cpp

@@ -17,14 +17,14 @@
  */
 
 #include <QCryptographicHash>
+#include <QDir>
+#include <QElapsedTimer>
 #include <QFile>
 #include <QLoggingCategory>
 #include <QStringList>
-#include <QElapsedTimer>
 #include <QUrl>
-#include <QDir>
-#include <sqlite3.h>
 #include <cstring>
+#include <sqlite3.h>
 
 #include "common/asserts.h"
 #include "common/checksums.h"
@@ -354,14 +354,16 @@ bool SyncJournalDb::checkConnect()
         }
     }
 
-    sqlite3_create_function(_db.sqliteDb(), "parent_hash", 1, SQLITE_UTF8 | SQLITE_DETERMINISTIC, nullptr,
-                                [] (sqlite3_context *ctx,int, sqlite3_value **argv) {
-                                    auto text = reinterpret_cast<const char*>(sqlite3_value_text(argv[0]));
-                                    const char *end = std::strrchr(text, '/');
-                                    if (!end) end = text;
-                                    sqlite3_result_int64(ctx, c_jhash64(reinterpret_cast<const uint8_t*>(text),
-                                                                        end - text, 0));
-                                }, nullptr, nullptr);
+    sqlite3_create_function(
+        _db.sqliteDb(), "parent_hash", 1, SQLITE_UTF8 | SQLITE_DETERMINISTIC, nullptr,
+        [](sqlite3_context *ctx, int, sqlite3_value **argv) {
+            auto text = reinterpret_cast<const char *>(sqlite3_value_text(argv[0]));
+            const char *end = std::strrchr(text, '/');
+            if (!end)
+                end = text;
+            sqlite3_result_int64(ctx, c_jhash64(reinterpret_cast<const uint8_t *>(text), end - text, 0));
+        },
+        nullptr, nullptr);
 
     /* Because insert is so slow, we do everything in a transaction, and only need one call to commit */
     startTransaction();
@@ -391,7 +393,7 @@ bool SyncJournalDb::checkConnect()
 #ifndef SQLITE_IOERR_SHMMAP
 // Requires sqlite >= 3.7.7 but old CentOS6 has sqlite-3.6.20
 // Definition taken from https://sqlite.org/c3ref/c_abort_rollback.html
-#define SQLITE_IOERR_SHMMAP            (SQLITE_IOERR | (21<<8))
+#define SQLITE_IOERR_SHMMAP (SQLITE_IOERR | (21 << 8))
 #endif
 
     if (!createQuery.exec()) {
@@ -824,7 +826,7 @@ bool SyncJournalDb::updateErrorBlacklistTableStructure()
     SqlQuery query(_db);
     query.prepare("CREATE INDEX IF NOT EXISTS blacklist_index ON blacklist(path collate nocase);");
     if (!query.exec()) {
-        sqlFail(QStringLiteral("updateErrorBlacklistTableStructure: create index blacklit"), query);
+        sqlFail(QStringLiteral("updateErrorBlacklistTableStructure: create index blacklist"), query);
         re = false;
     }
 
@@ -1081,7 +1083,7 @@ bool SyncJournalDb::getFileRecordsByFileId(const QByteArray &fileId, const std::
     return true;
 }
 
-bool SyncJournalDb::getFilesBelowPath(const QByteArray &path, const std::function<void(const SyncJournalFileRecord&)> &rowCallback)
+bool SyncJournalDb::getFilesBelowPath(const QByteArray &path, const std::function<void(const SyncJournalFileRecord &)> &rowCallback)
 {
     QMutexLocker locker(&_mutex);
 
@@ -1110,7 +1112,7 @@ bool SyncJournalDb::getFilesBelowPath(const QByteArray &path, const std::functio
         return true;
     };
 
-    if(path.isEmpty()) {
+    if (path.isEmpty()) {
         // Since the path column doesn't store the starting /, the getFilesBelowPathQuery
         // can't be used for the root path "". It would scan for (path > '/' and path < '0')
         // and find nothing. So, unfortunately, we have to use a different query for
@@ -1140,8 +1142,8 @@ bool SyncJournalDb::getFilesBelowPath(const QByteArray &path, const std::functio
     }
 }
 
-bool SyncJournalDb::listFilesInPath(const QByteArray& path,
-                                    const std::function<void (const SyncJournalFileRecord &)>& rowCallback)
+bool SyncJournalDb::listFilesInPath(const QByteArray &path,
+    const std::function<void(const SyncJournalFileRecord &)> &rowCallback)
 {
     QMutexLocker locker(&_mutex);
 
@@ -1864,8 +1866,8 @@ int SyncJournalDb::mapChecksumType(const QByteArray &checksumType)
         return 0;
     }
 
-    auto it =  _checksymTypeCache.find(checksumType);
-    if (it != _checksymTypeCache.end())
+    auto it = _checksumTypeCache.find(checksumType);
+    if (it != _checksumTypeCache.end())
         return *it;
 
     // Ensure the checksum type is in the db
@@ -1896,7 +1898,7 @@ int SyncJournalDb::mapChecksumType(const QByteArray &checksumType)
             return 0;
         }
         auto value = query->intValue(0);
-        _checksymTypeCache[checksumType] = value;
+        _checksumTypeCache[checksumType] = value;
         return value;
     }
 }
@@ -2046,7 +2048,8 @@ void SyncJournalDb::markVirtualFileForDownloadRecursively(const QByteArray &path
     static_assert(ItemTypeVirtualFile == 4 && ItemTypeVirtualFileDownload == 5, "");
     SqlQuery query("UPDATE metadata SET type=5 WHERE "
                    "(" IS_PREFIX_PATH_OF("?1", "path") " OR ?1 == '') "
-                   "AND type=4;", _db);
+                                                       "AND type=4;",
+        _db);
     query.bindValue(1, path);
     query.exec();
 
@@ -2202,7 +2205,7 @@ SyncJournalDb::PinStateInterface::rawList()
 
 SyncJournalDb::PinStateInterface SyncJournalDb::internalPinStates()
 {
-    return {this};
+    return { this };
 }
 
 void SyncJournalDb::commit(const QString &context, bool startTrans)

src/common/syncjournaldb.h

@@ -209,11 +209,11 @@ class OCSYNC_EXPORT SyncJournalDb : public QObject
      * This usually creates some temporary files next to the db file, like
      * $dbfile-shm or $dbfile-wal.
      *
-     * returns true if it could be openend or is currently opened.
+     * returns true if it could be opened or is currently opened.
      */
     bool open();
 
-    /** Returns whether the db is currently openend. */
+    /** Returns whether the db is currently opened. */
     bool isOpen();
 
     /** Close the database */
@@ -386,7 +386,7 @@ class OCSYNC_EXPORT SyncJournalDb : public QObject
     SqlDatabase _db;
     QString _dbFile;
     QMutex _mutex; // Public functions are protected with the mutex.
-    QMap<QByteArray, int> _checksymTypeCache;
+    QMap<QByteArray, int> _checksumTypeCache;
     int _transaction;
     bool _metadataTableIsEmpty;
 

src/common/syncjournalfilerecord.h

@@ -107,7 +107,7 @@ class OCSYNC_EXPORT SyncJournalErrorBlacklistRecord
     QString _file;
     QString _renameTarget;
 
-    /// The last X-Request-ID of the request that failled
+    /// The last X-Request-ID of the request that failed
     QByteArray _requestId;
 
     bool isValid() const;

src/common/utility.cpp

@@ -208,7 +208,7 @@ void Utility::usleep(int usec)
     QThread::usleep(usec);
 }
 
-// This can be overriden from the tests
+// This can be overridden from the tests
 OCSYNC_EXPORT bool fsCasePreserving_override = []() -> bool {
     static bool ok = false;
     static int env = qEnvironmentVariableIntValue("OWNCLOUD_TEST_CASE_PRESERVING", &ok);