Changeset 34065 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 15, 2010 11:34:50 AM (14 years ago)

Author:

vboxsync

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

67747

Message:

FE/Qt4: use the global file extension lists

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.h (modified) (1 diff)
• selector/UIVMItem.cpp (modified) (1 diff)
• selector/UIVMListView.cpp (modified) (1 diff)
• selector/VBoxSelectorWnd.cpp (modified) (1 diff)
• wizards/exportappliance/UIExportApplianceWzd.cpp (modified) (2 diffs)
• wizards/importappliance/UIImportApplianceWzd.cpp (modified) (1 diff)

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

@@ -519 +519 @@
     }
 
-    static bool isExtentionsAllowed(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;}
+    static bool 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;}
     QIcon icon(QFileIconProvider::IconType type) { return m_globalIconProvider.icon(type); }
     QIcon icon(const QFileInfo &info) { return m_globalIconProvider.icon(info); }

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp

@@ -248 +248 @@
          * VBoxProblemReporter::confirm_machineDeletion() */
         QFileInfo fi(m_strSettingsFile);
-        QString name = fi.completeSuffix().toLower() == "xml" || fi.completeSuffix().toLower() == "vbox" ?
+        QString name = VBoxGlobal::hasAllowedExtension(fi.completeSuffix(), VBoxDefs::VBoxFileExts) ?
                        fi.completeBaseName() : fi.fileName();
         needsResort = name != m_strName;

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.cpp

@@ -499 +499 @@
         QList<QUrl> list = pEvent->mimeData()->urls();
         QString file = list.at(0).toLocalFile();
-        if (   (   file.endsWith(".ovf", Qt::CaseInsensitive)
-                || file.endsWith(".ova", Qt::CaseInsensitive))
+        if (   VBoxGlobal::hasAllowedExtension(file, VBoxDefs::OVFFileExts)
             && pEvent->possibleActions().testFlag(Qt::CopyAction))
         {

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp

@@ -900 +900 @@
         QString file = list.at(i).toLocalFile();
         if (   !file.isEmpty()
-            && VBoxGlobal::isExtentionsAllowed(file, VBoxDefs::OVFFileExts))
+            && VBoxGlobal::hasAllowedExtension(file, VBoxDefs::OVFFileExts))
         {
             /* OVF/OVA. Only one file at the time. */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp

@@ -221 +221 @@
             QString settingsFile = m.GetSettingsFilePath();
             QFileInfo fi(settingsFile);
-            strName = (fi.completeSuffix().toLower() == "xml" || fi.completeSuffix().toLower() == "vbox") ? fi.completeBaseName() : fi.fileName();
+            strName = VBoxGlobal::hasAllowedExtension(fi.completeSuffix(), VBoxDefs::VBoxFileExts) ? fi.completeBaseName() : fi.fileName();
             pixIcon = QPixmap(":/os_other.png").scaled(16, 16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
         }
@@ -448 +448 @@
 {
     const QString &strFile = m_pFileSelector->path().toLower();
-    bool bComplete = (strFile.endsWith(".ovf") || strFile.endsWith(".ova"));
+    bool bComplete = VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::OVFFileExts);
     StorageType storageType = field("storageType").value<StorageType>();
     switch (storageType)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIImportApplianceWzd.cpp

@@ -195 +195 @@
 {
     const QString &strFile = m_pFileSelector->path().toLower();
-    return (strFile.endsWith(".ovf") || strFile.endsWith(".ova")) && QFileInfo(m_pFileSelector->path()).exists();
+    return VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::OVFFileExts) && QFileInfo(m_pFileSelector->path()).exists();
 }