Use enum class for vfs type

TheOneRing · TheOneRing · commit 711741c06de8 · 2026-02-04T16:24:33.000+01:00
diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
@@ -171,7 +171,7 @@ void sync(const SyncCTX &ctx, const QUrl &spaceUrl)
         selectiveSyncFixup(db, selectiveSyncList);
     }
 
-    SyncOptions opt{QSharedPointer<Vfs>(VfsPluginManager::instance().createVfsFromPlugin(Vfs::Off).release())};
+    SyncOptions opt{QSharedPointer<Vfs>(VfsPluginManager::instance().createVfsFromPlugin(Vfs::Mode::Off).release())};
     auto engine = new SyncEngine(ctx.account, spaceUrl, ctx.options.source_dir, ctx.options.remoteFolder, db);
     engine->setSyncOptions(opt);
     engine->setParent(db);
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
@@ -121,7 +121,7 @@ Application::Application(const QString &displayLanguage, bool debugMode)
     qCInfo(lcApplication) << u"Plugin search paths:" << qApp->libraryPaths();
 
     // Check vfs plugins
-    if (VfsPluginManager::instance().bestAvailableVfsMode() == Vfs::Off) {
+    if (VfsPluginManager::instance().bestAvailableVfsMode() == Vfs::Mode::Off) {
         qCWarning(lcApplication) << u"Theme wants to show vfs mode, but no vfs plugins are available";
     }
     qCInfo(lcApplication) << VfsPluginManager::instance().bestAvailableVfsMode() << u"plugin is available";
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
@@ -544,7 +544,7 @@ void Folder::startVfs()
         _vfs->fileStatusChanged(stateDbFile + QStringLiteral("-shm"), SyncFileStatus::StatusExcluded);
         _engine->setSyncOptions(loadSyncOptions());
 
-        if (_vfs->mode() != Vfs::Off) {
+        if (_vfs->mode() != Vfs::Mode::Off) {
             // diable ignorelist with vfs
             _engine->journal()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, {});
         }
@@ -668,10 +668,10 @@ void Folder::slotWatchedPathsChanged(const QSet<QString> &paths, ChangeReason re
 void Folder::setVirtualFilesEnabled(bool enabled)
 {
     Vfs::Mode newMode = _definition.virtualFilesMode;
-    if (enabled && _definition.virtualFilesMode == Vfs::Off) {
+    if (enabled && _definition.virtualFilesMode == Vfs::Mode::Off) {
         newMode = VfsPluginManager::instance().bestAvailableVfsMode();
-    } else if (!enabled && _definition.virtualFilesMode != Vfs::Off) {
-        newMode = Vfs::Off;
+    } else if (!enabled && _definition.virtualFilesMode != Vfs::Mode::Off) {
+        newMode = Vfs::Mode::Off;
     }
 
     if (newMode != _definition.virtualFilesMode) {
@@ -1113,7 +1113,7 @@ void Folder::registerFolderWatcher()
 
 bool Folder::virtualFilesEnabled() const
 {
-    return _definition.virtualFilesMode != Vfs::Off;
+    return _definition.virtualFilesMode != Vfs::Mode::Off;
 }
 
 } // namespace OCC
diff --git a/src/gui/folderdefinition.cpp b/src/gui/folderdefinition.cpp
@@ -101,11 +101,11 @@ FolderDefinition FolderDefinition::load(QSettings &settings)
     folder._deployed = settings.value(deployedC(), false).toBool();
     folder._priority = settings.value(priorityC(), 0).toUInt();
 
-    folder.virtualFilesMode = Vfs::Off;
+    folder.virtualFilesMode = Vfs::Mode::Off;
 
     QString vfsModeString = settings.value("virtualFilesMode").toString();
 
-    const auto vfs = Utility::isWindows() ? Vfs::WindowsCfApi : Vfs::XAttr;
+    const auto vfs = Utility::isWindows() ? Vfs::Mode::WindowsCfApi : Vfs::Mode::XAttr;
     if (auto result = Vfs::checkAvailability(folder.localPath(), vfs); result) {
         vfsModeString = Utility::enumToString(vfs);
     } else {
diff --git a/src/gui/folderdefinition.h b/src/gui/folderdefinition.h
@@ -40,7 +40,7 @@ class OPENCLOUD_GUI_EXPORT FolderDefinition
     /// whether the folder syncs hidden files
     bool ignoreHiddenFiles = true;
     /// Which virtual files setting the folder uses
-    Vfs::Mode virtualFilesMode = Vfs::Off;
+    Vfs::Mode virtualFilesMode = Vfs::Mode::Off;
 
     /// Saves the folder definition into the current settings.
     static void save(QSettings &settings, const FolderDefinition &folder);
diff --git a/src/gui/folderwizard/folderwizard.cpp b/src/gui/folderwizard/folderwizard.cpp
@@ -78,7 +78,7 @@ FolderWizardPrivate::FolderWizardPrivate(FolderWizard *q, const AccountStatePtr
 
     q->setPage(FolderWizard::Page_Space, _spacesPage);
 
-    if (VfsPluginManager::instance().bestAvailableVfsMode() == Vfs::Off) {
+    if (VfsPluginManager::instance().bestAvailableVfsMode() == Vfs::Mode::Off) {
         _folderWizardSelectiveSyncPage = new FolderWizardSelectiveSync(this);
         q->setPage(FolderWizard::Page_SelectiveSync, _folderWizardSelectiveSyncPage);
     }
@@ -121,7 +121,7 @@ const AccountStatePtr &FolderWizardPrivate::accountState()
 
 bool FolderWizardPrivate::useVirtualFiles() const
 {
-    return VfsPluginManager::instance().bestAvailableVfsMode() != Vfs::Off;
+    return VfsPluginManager::instance().bestAvailableVfsMode() != Vfs::Mode::Off;
 }
 
 FolderWizard::FolderWizard(const AccountStatePtr &account, QWidget *parent)
diff --git a/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp b/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp
@@ -91,7 +91,7 @@ QString AccountConfiguredWizardPage::syncTargetDir() const
 SyncMode AccountConfiguredWizardPage::syncMode() const
 {
     if (_ui->syncEverythingRadioButton->isChecked()) {
-        if (VfsPluginManager::instance().bestAvailableVfsMode() != Vfs::Off) {
+        if (VfsPluginManager::instance().bestAvailableVfsMode() != Vfs::Mode::Off) {
             return SyncMode::UseVfs;
         }
         return SyncMode::SyncEverything;
diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
@@ -342,7 +342,7 @@ void ProcessDirectoryJob::processFileAnalyzeRemoteInfo(
             item->_size = serverEntry.size();
             if (dbEntry.isDirectory()) {
                 // TODO: move the decision to the backend
-                if (_discoveryData->_syncOptions._vfs->mode() != Vfs::Off && _pinState != PinState::AlwaysLocal) {
+                if (_discoveryData->_syncOptions._vfs->mode() != Vfs::Mode::Off && _pinState != PinState::AlwaysLocal) {
                     item->_type = ItemTypeVirtualFile;
                 }
             }
@@ -391,10 +391,7 @@ void ProcessDirectoryJob::processFileAnalyzeRemoteInfo(
         // Turn new remote files into virtual files if the option is enabled.
         // TODO: move the decision to the backend
         const auto &opts = _discoveryData->_syncOptions;
-        if (!localEntry.isValid()
-            && item->_type == ItemTypeFile
-            && opts._vfs->mode() != Vfs::Off
-            && _pinState != PinState::AlwaysLocal) {
+        if (!localEntry.isValid() && item->_type == ItemTypeFile && opts._vfs->mode() != Vfs::Mode::Off && _pinState != PinState::AlwaysLocal) {
             item->_type = ItemTypeVirtualFile;
         }
         processFileAnalyzeLocalInfo(item, path, localEntry, serverEntry, dbEntry, _queryServer);
diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
@@ -179,7 +179,7 @@ void PropagateDownloadFile::start()
         updateMetadata(false);
         return;
     }
-    if (vfs->mode() == Vfs::Off && _item->_type == ItemTypeVirtualFile) {
+    if (vfs->mode() == Vfs::Mode::Off && _item->_type == ItemTypeVirtualFile) {
         qCWarning(lcPropagateDownload) << u"ignored virtual file type of" << _item->localName();
         _item->_type = ItemTypeFile;
     }
diff --git a/src/libsync/vfs/vfs.cpp b/src/libsync/vfs/vfs.cpp
@@ -48,11 +48,11 @@ Optional<Vfs::Mode> Vfs::modeFromString(const QString &str)
     // Note: Strings are used for config and must be stable
     // keep in sync with: QString Utility::enumToString(Vfs::Mode mode)
     if (str == QLatin1String("off")) {
-        return Off;
+        return Mode::Off;
     } else if (str == QLatin1String("cfapi")) {
-        return WindowsCfApi;
+        return Mode::WindowsCfApi;
     } else if (str == QLatin1String("xattr")) {
-        return XAttr;
+        return Mode::XAttr;
     }
     return {};
 }
@@ -209,12 +209,12 @@ bool OCC::VfsPluginManager::isVfsPluginAvailable(Vfs::Mode mode) const
 
 Vfs::Mode OCC::VfsPluginManager::bestAvailableVfsMode() const
 {
-    if (isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-        return Vfs::WindowsCfApi;
-    } else if (isVfsPluginAvailable(Vfs::XAttr)) {
-        return Vfs::XAttr;
-    } else if (isVfsPluginAvailable(Vfs::Off)) {
-        return Vfs::Off;
+    if (isVfsPluginAvailable(Vfs::Mode::WindowsCfApi)) {
+        return Vfs::Mode::WindowsCfApi;
+    } else if (isVfsPluginAvailable(Vfs::Mode::XAttr)) {
+        return Vfs::Mode::XAttr;
+    } else if (isVfsPluginAvailable(Vfs::Mode::Off)) {
+        return Vfs::Mode::Off;
     }
     Q_UNREACHABLE();
 }
diff --git a/src/libsync/vfs/vfs.h b/src/libsync/vfs/vfs.h
@@ -98,7 +98,7 @@ class OPENCLOUD_SYNC_EXPORT Vfs : public QObject
      * Currently plugins and modes are one-to-one but that's not required.
      * The raw integer values are used in Qml
      */
-    enum Mode : uint8_t { Off = 0, WindowsCfApi = 1, XAttr = 2 };
+    enum class Mode : uint8_t { Off = 0, WindowsCfApi = 1, XAttr = 2 };
     Q_ENUM(Mode)
     enum class ConvertToPlaceholderResult : uint8_t { Ok, Locked };
     Q_ENUM(ConvertToPlaceholderResult)
diff --git a/src/plugins/vfs/cfapi/vfs_cfapi.cpp b/src/plugins/vfs/cfapi/vfs_cfapi.cpp
@@ -109,7 +109,7 @@ VfsCfApi::~VfsCfApi() = default;
 
 Vfs::Mode VfsCfApi::mode() const
 {
-    return WindowsCfApi;
+    return Vfs::Mode::WindowsCfApi;
 }
 
 void VfsCfApi::startImpl(const VfsSetupParams &params)
diff --git a/src/plugins/vfs/off/vfs_off.cpp b/src/plugins/vfs/off/vfs_off.cpp
@@ -28,7 +28,7 @@ VfsOff::~VfsOff() = default;
 
 Vfs::Mode VfsOff::mode() const
 {
-    return Vfs::Off;
+    return Vfs::Mode::Off;
 }
 
 void VfsOff::stop() { }
diff --git a/src/plugins/vfs/xattr/vfs_xattr.cpp b/src/plugins/vfs/xattr/vfs_xattr.cpp
@@ -57,7 +57,7 @@ VfsXAttr::~VfsXAttr() = default;
 
 Vfs::Mode VfsXAttr::mode() const
 {
-    return XAttr;
+    return Mode::XAttr;
 }
 
 QString VfsXAttr::xattrOwnerString() const
diff --git a/test/testblacklist.cpp b/test/testblacklist.cpp
@@ -26,15 +26,15 @@ private Q_SLOTS:
         QTest::addColumn<Vfs::Mode>("vfsMode");
         QTest::addColumn<bool>("filesAreDehydrated");
 
-        QTest::newRow("Vfs::Off") << Vfs::Off << false;
+        QTest::newRow("Vfs::Mode::Off") << Vfs::Mode::Off << false;
 
-        if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+        if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::Mode::WindowsCfApi)) {
+            QTest::newRow("Vfs::Mode::WindowsCfApi dehydrated") << Vfs::Mode::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
-            // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
+            // QTest::newRow("Vfs::Mode::WindowsCfApi hydrated") << Vfs::Mode::WindowsCfApi << false;
         } else if (Utility::isWindows()) {
-            qWarning("Skipping Vfs::WindowsCfApi");
+            qWarning("Skipping Vfs::Mode::WindowsCfApi");
         }
     }
 
@@ -82,7 +82,7 @@ private Q_SLOTS:
         modifier.insert(testFileName);
         fakeFolder.serverErrorPaths().append(testFileName, 500); // will be blacklisted
         const bool syncResult = fakeFolder.applyLocalModificationsAndSync();
-        if (vfsMode == Vfs::WindowsCfApi && filesAreDehydrated && remote) {
+        if (vfsMode == Vfs::Mode::WindowsCfApi && filesAreDehydrated && remote) {
             // With dehydrated files, only a PROPFIND is done, but not a GET request.
             // And it is the GET request that fails, and causes a blacklist entry, all "syncs" will succeed.
             QVERIFY(syncResult);
diff --git a/test/testdatabaseerror.cpp b/test/testdatabaseerror.cpp
@@ -22,15 +22,15 @@ private Q_SLOTS:
         QTest::addColumn<Vfs::Mode>("vfsMode");
         QTest::addColumn<bool>("filesAreDehydrated");
 
-        QTest::newRow("Vfs::Off") << Vfs::Off << false;
+        QTest::newRow("Vfs::Mode::Off") << Vfs::Mode::Off << false;
 
-        if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+        if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::Mode::WindowsCfApi)) {
+            QTest::newRow("Vfs::Mode::WindowsCfApi dehydrated") << Vfs::Mode::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
-            // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
+            // QTest::newRow("Vfs::Mode::WindowsCfApi hydrated") << Vfs::Mode::WindowsCfApi << false;
         } else if (Utility::isWindows()) {
-            qWarning("Skipping Vfs::WindowsCfApi");
+            qWarning("Skipping Vfs::Mode::WindowsCfApi");
         }
     }
 
@@ -43,7 +43,7 @@ private Q_SLOTS:
         QFETCH_GLOBAL(Vfs::Mode, vfsMode);
         QFETCH_GLOBAL(bool, filesAreDehydrated);
 
-        if (vfsMode == Vfs::WindowsCfApi) {
+        if (vfsMode == Vfs::Mode::WindowsCfApi) {
             QSKIP("Known to be broken, see https://github.com/owncloud/client-desktop-vfs-win/issues/22");
         }
 
diff --git a/test/testdownload.cpp b/test/testdownload.cpp
@@ -71,15 +71,15 @@ private Q_SLOTS:
         QTest::addColumn<Vfs::Mode>("vfsMode");
         QTest::addColumn<bool>("filesAreDehydrated");
 
-        QTest::newRow("Vfs::Off") << Vfs::Off << false;
+        QTest::newRow("Vfs::Mode::Off") << Vfs::Mode::Off << false;
 
-        if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+        if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::Mode::WindowsCfApi)) {
+            QTest::newRow("Vfs::Mode::WindowsCfApi dehydrated") << Vfs::Mode::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
-            // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
+            // QTest::newRow("Vfs::Mode::WindowsCfApi hydrated") << Vfs::Mode::WindowsCfApi << false;
         } else if (Utility::isWindows()) {
-            qWarning("Skipping Vfs::WindowsCfApi");
+            qWarning("Skipping Vfs::Mode::WindowsCfApi");
         }
     }
 
diff --git a/test/testlocaldiscovery.cpp b/test/testlocaldiscovery.cpp
@@ -25,15 +25,15 @@ private Q_SLOTS:
         QTest::addColumn<Vfs::Mode>("vfsMode");
         QTest::addColumn<bool>("filesAreDehydrated");
 
-        QTest::newRow("Vfs::Off") << Vfs::Off << false;
+        QTest::newRow("Vfs::Mode::Off") << Vfs::Mode::Off << false;
 
-        if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+        if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::Mode::WindowsCfApi)) {
+            QTest::newRow("Vfs::Mode::WindowsCfApi dehydrated") << Vfs::Mode::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
-            // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
+            // QTest::newRow("Vfs::Mode::WindowsCfApi hydrated") << Vfs::Mode::WindowsCfApi << false;
         } else if (Utility::isWindows()) {
-            qWarning("Skipping Vfs::WindowsCfApi");
+            qWarning("Skipping Vfs::Mode::WindowsCfApi");
         }
     }
 
diff --git a/test/testlockedfiles.cpp b/test/testlockedfiles.cpp
@@ -39,15 +39,15 @@ private Q_SLOTS:
         QTest::addColumn<Vfs::Mode>("vfsMode");
         QTest::addColumn<bool>("filesAreDehydrated");
 
-        QTest::newRow("Vfs::Off") << Vfs::Off << false;
+        QTest::newRow("Vfs::Mode::Off") << Vfs::Mode::Off << false;
 
-        if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+        if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::Mode::WindowsCfApi)) {
+            QTest::newRow("Vfs::Mode::WindowsCfApi dehydrated") << Vfs::Mode::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
-            // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
+            // QTest::newRow("Vfs::Mode::WindowsCfApi hydrated") << Vfs::Mode::WindowsCfApi << false;
         } else if (Utility::isWindows()) {
-            qWarning("Skipping Vfs::WindowsCfApi");
+            qWarning("Skipping Vfs::Mode::WindowsCfApi");
         }
     }
 
diff --git a/test/testpermissions.cpp b/test/testpermissions.cpp
@@ -74,15 +74,15 @@ private Q_SLOTS:
         QTest::addColumn<Vfs::Mode>("vfsMode");
         QTest::addColumn<bool>("filesAreDehydrated");
 
-        QTest::newRow("Vfs::Off") << Vfs::Off << false;
+        QTest::newRow("Vfs::Mode::Off") << Vfs::Mode::Off << false;
 
-        if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+        if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::Mode::WindowsCfApi)) {
+            QTest::newRow("Vfs::Mode::WindowsCfApi dehydrated") << Vfs::Mode::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
-            // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
+            // QTest::newRow("Vfs::Mode::WindowsCfApi hydrated") << Vfs::Mode::WindowsCfApi << false;
         } else if (Utility::isWindows()) {
-            qWarning("Skipping Vfs::WindowsCfApi");
+            qWarning("Skipping Vfs::Mode::WindowsCfApi");
         }
     }
 
@@ -91,7 +91,7 @@ private Q_SLOTS:
         QFETCH_GLOBAL(Vfs::Mode, vfsMode);
         QFETCH_GLOBAL(bool, filesAreDehydrated);
 
-        if (vfsMode == Vfs::WindowsCfApi) {
+        if (vfsMode == Vfs::Mode::WindowsCfApi) {
             QSKIP("Known issue: the winvfs plug-in fails to set file permissions");
         }
 
@@ -382,7 +382,7 @@ private Q_SLOTS:
         QFETCH_GLOBAL(Vfs::Mode, vfsMode);
         QFETCH_GLOBAL(bool, filesAreDehydrated);
 
-        if (vfsMode == Vfs::WindowsCfApi) {
+        if (vfsMode == Vfs::Mode::WindowsCfApi) {
             QSKIP("Known issue: the winvfs plug-in fails to set file permissions");
         }
 
@@ -509,7 +509,7 @@ private Q_SLOTS:
         QFETCH_GLOBAL(Vfs::Mode, vfsMode);
         QFETCH_GLOBAL(bool, filesAreDehydrated);
 
-        if (vfsMode == Vfs::WindowsCfApi) {
+        if (vfsMode == Vfs::Mode::WindowsCfApi) {
             QSKIP("Known issue: the winvfs plug-in fails to set file permissions");
         }
 
diff --git a/test/testremotediscovery.cpp b/test/testremotediscovery.cpp
@@ -69,15 +69,15 @@ private Q_SLOTS:
         QTest::addColumn<Vfs::Mode>("vfsMode");
         QTest::addColumn<bool>("filesAreDehydrated");
 
-        QTest::newRow("Vfs::Off") << Vfs::Off << false;
+        QTest::newRow("Vfs::Mode::Off") << Vfs::Mode::Off << false;
 
-        if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
-            QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
+        if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::Mode::WindowsCfApi)) {
+            QTest::newRow("Vfs::Mode::WindowsCfApi dehydrated") << Vfs::Mode::WindowsCfApi << true;
 
             // TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
-            // QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
+            // QTest::newRow("Vfs::Mode::WindowsCfApi hydrated") << Vfs::Mode::WindowsCfApi << false;
         } else if (Utility::isWindows()) {
-            qWarning("Skipping Vfs::WindowsCfApi");
+            qWarning("Skipping Vfs::Mode::WindowsCfApi");
         }
     }
 
diff --git a/test/testsyncconflict.cpp b/test/testsyncconflict.cpp
diff --git a/test/testsyncdelete.cpp b/test/testsyncdelete.cpp
diff --git a/test/testsyncengine.cpp b/test/testsyncengine.cpp
diff --git a/test/testsyncmove.cpp b/test/testsyncmove.cpp
diff --git a/test/testutils/syncenginetestutils.cpp b/test/testutils/syncenginetestutils.cpp
diff --git a/test/testutils/syncenginetestutils.h b/test/testutils/syncenginetestutils.h

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ void sync(const SyncCTX &ctx, const QUrl &spaceUrl)`
`171`	`171`	`selectiveSyncFixup(db, selectiveSyncList);`
`172`	`172`	`}`
`173`	`173`
`174`		`- SyncOptions opt{QSharedPointer<Vfs>(VfsPluginManager::instance().createVfsFromPlugin(Vfs::Off).release())};`
	`174`	`+ SyncOptions opt{QSharedPointer<Vfs>(VfsPluginManager::instance().createVfsFromPlugin(Vfs::Mode::Off).release())};`
`175`	`175`	`auto engine = new SyncEngine(ctx.account, spaceUrl, ctx.options.source_dir, ctx.options.remoteFolder, db);`
`176`	`176`	`engine->setSyncOptions(opt);`
`177`	`177`	`engine->setParent(db);`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ Application::Application(const QString &displayLanguage, bool debugMode)`
`121`	`121`	`qCInfo(lcApplication) << u"Plugin search paths:" << qApp->libraryPaths();`
`122`	`122`
`123`	`123`	`// Check vfs plugins`
`124`		`- if (VfsPluginManager::instance().bestAvailableVfsMode() == Vfs::Off) {`
	`124`	`+ if (VfsPluginManager::instance().bestAvailableVfsMode() == Vfs::Mode::Off) {`
`125`	`125`	`qCWarning(lcApplication) << u"Theme wants to show vfs mode, but no vfs plugins are available";`
`126`	`126`	`}`
`127`	`127`	`qCInfo(lcApplication) << VfsPluginManager::instance().bestAvailableVfsMode() << u"plugin is available";`
Original file line number	Diff line number	Diff line change
`@@ -544,7 +544,7 @@ void Folder::startVfs()`
`544`	`544`	`_vfs->fileStatusChanged(stateDbFile + QStringLiteral("-shm"), SyncFileStatus::StatusExcluded);`
`545`	`545`	`_engine->setSyncOptions(loadSyncOptions());`
`546`	`546`
`547`		`- if (_vfs->mode() != Vfs::Off) {`
	`547`	`+ if (_vfs->mode() != Vfs::Mode::Off) {`
`548`	`548`	`// diable ignorelist with vfs`
`549`	`549`	`_engine->journal()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, {});`
`550`	`550`	`}`
`@@ -668,10 +668,10 @@ void Folder::slotWatchedPathsChanged(const QSet<QString> &paths, ChangeReason re`
`668`	`668`	`void Folder::setVirtualFilesEnabled(bool enabled)`
`669`	`669`	`{`
`670`	`670`	`Vfs::Mode newMode = _definition.virtualFilesMode;`
`671`		`- if (enabled && _definition.virtualFilesMode == Vfs::Off) {`
	`671`	`+ if (enabled && _definition.virtualFilesMode == Vfs::Mode::Off) {`
`672`	`672`	`newMode = VfsPluginManager::instance().bestAvailableVfsMode();`
`673`		`- } else if (!enabled && _definition.virtualFilesMode != Vfs::Off) {`
`674`		`- newMode = Vfs::Off;`
	`673`	`+ } else if (!enabled && _definition.virtualFilesMode != Vfs::Mode::Off) {`
	`674`	`+ newMode = Vfs::Mode::Off;`
`675`	`675`	`}`
`676`	`676`
`677`	`677`	`if (newMode != _definition.virtualFilesMode) {`
`@@ -1113,7 +1113,7 @@ void Folder::registerFolderWatcher()`
`1113`	`1113`
`1114`	`1114`	`bool Folder::virtualFilesEnabled() const`
`1115`	`1115`	`{`
`1116`		`- return _definition.virtualFilesMode != Vfs::Off;`
	`1116`	`+ return _definition.virtualFilesMode != Vfs::Mode::Off;`
`1117`	`1117`	`}`
`1118`	`1118`
`1119`	`1119`	`} // namespace OCC`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ FolderWizardPrivate::FolderWizardPrivate(FolderWizard *q, const AccountStatePtr`
`78`	`78`
`79`	`79`	`q->setPage(FolderWizard::Page_Space, _spacesPage);`
`80`	`80`
`81`		`- if (VfsPluginManager::instance().bestAvailableVfsMode() == Vfs::Off) {`
	`81`	`+ if (VfsPluginManager::instance().bestAvailableVfsMode() == Vfs::Mode::Off) {`
`82`	`82`	`_folderWizardSelectiveSyncPage = new FolderWizardSelectiveSync(this);`
`83`	`83`	`q->setPage(FolderWizard::Page_SelectiveSync, _folderWizardSelectiveSyncPage);`
`84`	`84`	`}`
`@@ -121,7 +121,7 @@ const AccountStatePtr &FolderWizardPrivate::accountState()`
`121`	`121`
`122`	`122`	`bool FolderWizardPrivate::useVirtualFiles() const`
`123`	`123`	`{`
`124`		`- return VfsPluginManager::instance().bestAvailableVfsMode() != Vfs::Off;`
	`124`	`+ return VfsPluginManager::instance().bestAvailableVfsMode() != Vfs::Mode::Off;`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`FolderWizard::FolderWizard(const AccountStatePtr &account, QWidget *parent)`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ QString AccountConfiguredWizardPage::syncTargetDir() const`
`91`	`91`	`SyncMode AccountConfiguredWizardPage::syncMode() const`
`92`	`92`	`{`
`93`	`93`	`if (_ui->syncEverythingRadioButton->isChecked()) {`
`94`		`- if (VfsPluginManager::instance().bestAvailableVfsMode() != Vfs::Off) {`
	`94`	`+ if (VfsPluginManager::instance().bestAvailableVfsMode() != Vfs::Mode::Off) {`
`95`	`95`	`return SyncMode::UseVfs;`
`96`	`96`	`}`
`97`	`97`	`return SyncMode::SyncEverything;`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ void PropagateDownloadFile::start()`
`179`	`179`	`updateMetadata(false);`
`180`	`180`	`return;`
`181`	`181`	`}`
`182`		`- if (vfs->mode() == Vfs::Off && _item->_type == ItemTypeVirtualFile) {`
	`182`	`+ if (vfs->mode() == Vfs::Mode::Off && _item->_type == ItemTypeVirtualFile) {`
`183`	`183`	`qCWarning(lcPropagateDownload) << u"ignored virtual file type of" << _item->localName();`
`184`	`184`	`_item->_type = ItemTypeFile;`
`185`	`185`	`}`