Changeset 90937 in vbox for trunk/src/VBox

Timestamp:

Aug 27, 2021 8:40:18 AM (4 years ago)

Author:

vboxsync

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

146575

Message:

FE/Qt: bugref:10067: UICommon: Reorder file-system stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICommon.cpp (modified) (2 diffs)
• UICommon.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -437 +437 @@
 }
 
-/*static */
-QString UICommon::findUniqueFileName(const QString &strFullFolderPath, const QString &strBaseFileName)
-{
-    QDir folder(strFullFolderPath);
-    if (!folder.exists())
-        return strBaseFileName;
-    QFileInfoList folderContent = folder.entryInfoList();
-    QSet<QString> fileNameSet;
-    foreach (const QFileInfo &fileInfo, folderContent)
-    {
-        /* Remove the extension : */
-        fileNameSet.insert(fileInfo.completeBaseName());
-    }
-    int iSuffix = 0;
-    QString strNewName(strBaseFileName);
-    while (fileNameSet.contains(strNewName))
-    {
-        strNewName = strBaseFileName + QString("_") + QString::number(++iSuffix);
-    }
-    return strNewName;
-}
-
-/* static */
-bool UICommon::hasAllowedExtension(const QString &strExt, const QStringList &extList)
-{
-    for (int i = 0; i < extList.size(); ++i)
-        if (strExt.endsWith(extList.at(i), Qt::CaseInsensitive))
-            return true;
-    return false;
-}
-
 bool UICommon::processArgs()
 {
@@ -1472 +1441 @@
             return QDir::homePath();
     }
+}
+
+/* static */
+bool UICommon::hasAllowedExtension(const QString &strFileName, const QStringList &extensions)
+{
+    foreach (const QString &strExtension, extensions)
+        if (strFileName.endsWith(strExtension, Qt::CaseInsensitive))
+            return true;
+    return false;
+}
+
+/* static */
+QString UICommon::findUniqueFileName(const QString &strFullFolderPath, const QString &strBaseFileName)
+{
+    QDir folder(strFullFolderPath);
+    if (!folder.exists())
+        return strBaseFileName;
+    QFileInfoList folderContent = folder.entryInfoList();
+    QSet<QString> fileNameSet;
+    foreach (const QFileInfo &fileInfo, folderContent)
+    {
+        /* Remove the extension : */
+        fileNameSet.insert(fileInfo.completeBaseName());
+    }
+    int iSuffix = 0;
+    QString strNewName(strBaseFileName);
+    while (fileNameSet.contains(strNewName))
+    {
+        strNewName = strBaseFileName + QString("_") + QString::number(++iSuffix);
+    }
+    return strNewName;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -213 +213 @@
         /** Returns value for certain branding @a strKey from custom.ini file. */
         QString brandingGetKey(QString strKey);
-        /** Returns a file name (unique up to extension) wrt. @a strFullFolderPath folder content. Starts
-          * searching strBaseFileName and adds suffixes until a unique file name is found. */
-        static QString findUniqueFileName(const QString &strFullFolderPath, const QString &strBaseFileName);
     /** @} */
 
     /** @name Process arguments stuff.
      * @{ */
-        /** Returns whether passed @a strExt ends with one of allowed extension in the @a extList. */
-        static bool hasAllowedExtension(const QString &strExt, const QStringList &extList);
-
         /** Process application args. */
         bool processArgs();
@@ -403 +397 @@
         /** Returns documents path. */
         static QString documentsPath();
+
+        /** Returns whether passed @a strFileName ends with one of allowed extension in the @a extensions list. */
+        static bool hasAllowedExtension(const QString &strFileName, const QStringList &extensions);
+
+        /** Returns a file name (unique up to extension) wrt. @a strFullFolderPath folder content. Starts
+          * searching strBaseFileName and adds suffixes until a unique file name is found. */
+        static QString findUniqueFileName(const QString &strFullFolderPath, const QString &strBaseFileName);
     /** @} */