Changeset 86894 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 16, 2020 3:15:56 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

141365

Message:

FE/Qt: bugref:9722: VirtualBox Manager: Move a list of default public key folders to a separate function; Also, more readable file loading call, a check which will be reused.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -140 +140 @@
     void prepareEditorContents();
 
+    /** Returns a list of default key folders. */
+    QStringList defaultKeyFolders() const;
+
     /** Loads file contents.
       * @returns Whether file was really loaded. */
@@ -246 +249 @@
 void UIAcquirePublicKeyDialog::prepareEditorContents()
 {
+    /* Check whether we were able to load key file: */
+    bool fFileLoaded = false;
+
     /* Try to load last remembered file contents: */
-    if (!loadFileContents(gEDataManager->cloudConsolePublicKeyPath(), true /* ignore errors */))
+    fFileLoaded = loadFileContents(gEDataManager->cloudConsolePublicKeyPath(), true /* ignore errors */);
+    if (!fFileLoaded)
     {
         /* We have failed to load file mentioned in extra-data, now we have
          * to check whether file present in one of default paths: */
-        QStringList paths;
-#ifdef VBOX_WS_WIN
-        // WORKAROUND:
-        // There is additional default path on Windows:
-        paths << QDir(QDir::homePath()).absoluteFilePath("oci");
-#endif
-        paths << QDir(QDir::homePath()).absoluteFilePath(".ssh");
-
-        /* Look for required file in one of those paths: */
         QString strAbsoluteFilePathWeNeed;
-        foreach (const QString &strPath, paths)
+        foreach (const QString &strPath, defaultKeyFolders())
         {
             /* Gather possible file names, there can be few of them: */
@@ -284 +282 @@
         /* Try to open file if it was really found: */
         if (!strAbsoluteFilePathWeNeed.isEmpty())
-            loadFileContents(strAbsoluteFilePathWeNeed, true /* ignore errors */);
-    }
+            fFileLoaded = loadFileContents(strAbsoluteFilePathWeNeed, true /* ignore errors */);
+    }
+}
+
+QStringList UIAcquirePublicKeyDialog::defaultKeyFolders() const
+{
+    QStringList folders;
+#ifdef VBOX_WS_WIN
+    // WORKAROUND:
+    // There is additional default folder on Windows:
+    folders << QDir::toNativeSeparators(QDir(QDir::homePath()).absoluteFilePath("oci"));
+#endif
+    folders << QDir::toNativeSeparators(QDir(QDir::homePath()).absoluteFilePath(".ssh"));
+    return folders;
 }