fix: review comments

Author: DeepDiver1975

src/common/vfs.cpp

@@ -228,8 +228,6 @@ Vfs::Mode OCC::VfsPluginManager::bestAvailableVfsMode() const
 {
     if (isVfsPluginAvailable(Vfs::WindowsCfApi)) {
         return Vfs::WindowsCfApi;
-    } else if (isVfsPluginAvailable(Vfs::Off)) {
-        return Vfs::Off;
     }
 
     return Vfs::Off;

src/csync/csync_exclude.cpp

@@ -393,32 +393,33 @@ CSYNC_EXCLUDE_TYPE ExcludedFiles::traversalPatternMatch(QStringView path, ItemTy
         bnameStr = path.mid(lastSlash + 1);
     }
 
-    QRegularExpressionMatch m;
+    QRegularExpressionMatch regularExpressionMatch;
     if (filetype == ItemTypeDirectory) {
-        m = _bnameTraversalRegexDir.matchView(bnameStr);
+        regularExpressionMatch = _bnameTraversalRegexDir.matchView(bnameStr);
     } else {
-        m = _bnameTraversalRegexFile.matchView(bnameStr);
+        regularExpressionMatch = _bnameTraversalRegexFile.matchView(bnameStr);
     }
-    if (!m.hasMatch())
+    if (!regularExpressionMatch.hasMatch())
         return CSYNC_NOT_EXCLUDED;
-    if (m.capturedStart(QStringLiteral("exclude")) != -1) {
+    if (regularExpressionMatch.capturedStart(QStringLiteral("exclude")) != -1) {
         return CSYNC_FILE_EXCLUDE_LIST;
-    } else if (m.capturedStart(QStringLiteral("excluderemove")) != -1) {
+    } else if (regularExpressionMatch.capturedStart(QStringLiteral("excluderemove")) != -1) {
         return CSYNC_FILE_EXCLUDE_AND_REMOVE;
     }
 
     // third capture: full path matching is triggered
     QStringView pathStr = path;
 
     if (filetype == ItemTypeDirectory) {
-        m = _fullTraversalRegexDir.matchView(pathStr);
+        regularExpressionMatch = _fullTraversalRegexDir.matchView(pathStr);
     } else {
-        m = _fullTraversalRegexFile.matchView(pathStr);
+        regularExpressionMatch = _fullTraversalRegexFile.matchView(pathStr);
     }
-    if (m.hasMatch()) {
-        if (m.capturedStart(QStringLiteral("exclude")) != -1) {
+    if (regularExpressionMatch.hasMatch()) {
+        if (regularExpressionMatch.capturedStart(QStringLiteral("exclude")) != -1) {
             return CSYNC_FILE_EXCLUDE_LIST;
-        } else if (m.capturedStart(QStringLiteral("excluderemove")) != -1) {
+        }
+        if (regularExpressionMatch.capturedStart(QStringLiteral("excluderemove")) != -1) {
             return CSYNC_FILE_EXCLUDE_AND_REMOVE;
         }
     }

src/gui/folder.cpp

@@ -540,7 +540,7 @@ void Folder::startVfs()
         connect(_vfs.get(), &Vfs::needSync, this, [this] {
             if (canSync()) {
                 // the vfs plugin detected that its metadata is out of sync and requests a new sync
-                // the request has a height priority as it is probably issued after a user request
+                // the request has a high priority as it is probably issued after a user request
                 FolderMan::instance()->scheduler()->enqueueFolder(this, SyncScheduler::Priority::High);
             }
         });
@@ -930,7 +930,7 @@ void Folder::startSync()
     // propose: remove the param from the def, and when Folder:setIgnoreHiddenFiles is called it updates the
     // ENGINE, not the def. the value should not be stored in the folder def but in the general area of the config.
     // if we ever graduate to allowing the user to set this value *per folder* we can refactor it, but the overhead
-    // of saving this val for every folder in the config is just silly when it's de-facto a global setting.
+    // of saving this val for every folder in the config is just silly when it's de facto a global setting.
     // Erik has no objections
     // generally when we change settings we pause syncs, update whatever values,
     // then reschedule the newly paused syncs with top prio and start sync - see handling for changing vfs mode

src/gui/main.cpp

@@ -397,7 +397,7 @@ int main(int argc, char **argv)
         // load the resources
         const OCC::ResourcesLoader resource;
 
-        // Create a `Platform` instance so it can set up/teared down stuff for us, and do any
+        // Create a `Platform` instance so it can set up/tear down stuff for us, and do any
         // initialisation that needs to be done before creating a QApplication
         const auto platform = Platform::create();
 

src/gui/socketapi/socketapi.cpp

@@ -925,11 +925,6 @@ SocketApi::FileData SocketApi::FileData::get(const QString &localFile)
     return data;
 }
 
-QString SocketApi::FileData::folderRelativePathNoVfsSuffix() const
-{
-    return folderRelativePath;
-}
-
 bool OCC::SocketApi::FileData::isSyncFolder() const
 {
     return folderRelativePath.isEmpty();

src/gui/socketapi/socketapi.h

@@ -86,9 +86,6 @@ private Q_SLOTS:
         SyncJournalFileRecord journalRecord() const;
         FileData parentFolder() const;
 
-        // Relative path of the file locally, without any vfs suffix
-        QString folderRelativePathNoVfsSuffix() const;
-
         Folder *folder = nullptr;
         // Absolute path of the file locally. (May be a virtual file)
         QString localPath;

src/libsync/theme.h

@@ -119,8 +119,8 @@ class OWNCLOUDSYNC_EXPORT Theme : public QObject
      * name in the GUI, redefine appNameGUI.
      *
      * By default, the name is derived from the APPLICATION_SHORTNAME
-     * cmake variable, and should be the same. This method is only
-     * re-implementable for legacy reasons.
+     * cmake variable, and should be the same. This method exists only for
+     * legacy reasons.
      *
      * Warning: Do not modify this value, as many things, e.g. settings
      * depend on it! You most likely want to modify \ref appNameGUI().