Cleanup and comments

2 files changed, 31 insertions, 8 deletions

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index d352b817a..31c11ebd9 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -47,7 +47,18 @@
 #include <QPushButton>
 #include <QApplication>
 
-static const char versionC[] = "version";
+namespace {
+
+/*
+ * [Accounts]
+ * 1\Folders\4\version=2
+ * 1\FoldersWithPlaceholders\3\version=3
+ */
+auto versionC()
+{
+    return QStringLiteral("version");
+}
+}
 
 namespace OCC {
 
@@ -1299,9 +1310,9 @@ void FolderDefinition::save(QSettings &settings, const FolderDefinition &folder)
 
     // Ensure new vfs modes won't be attempted by older clients
     if (folder.virtualFilesMode == Vfs::WindowsCfApi) {
-        settings.setValue(QLatin1String(versionC), 3);
+        settings.setValue(versionC(), 3);
     } else {
-        settings.setValue(QLatin1String(versionC), 2);
+        settings.setValue(versionC(), 2);
     }
 
     // Happens only on Windows when the explorer integration is enabled.
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 0d0daac5b..d32d0c056 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -37,8 +37,20 @@
 #include <QNetworkProxy>
 
 namespace {
-const char versionC[] = "version";
-const int maxFoldersVersion = 1;
+/*
+ * [Accounts]
+ * 0\version=1
+ */
+auto versionC()
+{
+    return QStringLiteral("version");
+}
+
+/*
+ * Folders with a version > maxFoldersVersion will be removed
+ * After the user was prompted for consent.
+ */
+constexpr int maxFoldersVersion = 1;
 
 int numberOfSyncJournals(const QString &path)
 {
@@ -347,7 +359,7 @@ void FolderMan::setupFoldersHelper(QSettings &settings, AccountStatePtr account,
             Folder *f = addFolderInternal(std::move(folderDefinition), account.data(), std::move(vfs));
             if (f) {
                 // Migrate the old "usePlaceholders" setting to the root folder pin state
-                if (settings.value(QLatin1String(versionC), 1).toInt() == 1
+                if (settings.value(versionC(), 1).toInt() == 1
                     && settings.value(QLatin1String("usePlaceholders"), false).toBool()) {
                     qCInfo(lcFolderMan) << "Migrate: From usePlaceholders to PinState::OnlineOnly";
                     f->setRootPinState(PinState::OnlineOnly);
@@ -403,12 +415,12 @@ void FolderMan::backwardMigrationSettingsKeys(QStringList *deleteKeys, QStringLi
 
     auto processSubgroup = [&](const QString &name) {
         settings->beginGroup(name);
-        const int foldersVersion = settings->value(QLatin1String(versionC), 1).toInt();
+        const int foldersVersion = settings->value(versionC(), 1).toInt();
         if (foldersVersion <= maxFoldersVersion) {
             const auto &childGroups = settings->childGroups();
             for (const auto &folderAlias : childGroups) {
                 settings->beginGroup(folderAlias);
-                const int folderVersion = settings->value(QLatin1String(versionC), 1).toInt();
+                const int folderVersion = settings->value(versionC(), 1).toInt();
                 if (folderVersion > FolderDefinition::maxSettingsVersion()) {
                     ignoreKeys->append(settings->group());
                 }