Changeset 91222 in vbox

Timestamp:

Sep 14, 2021 8:02:09 AM (3 years ago)

Author:

vboxsync

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

146877

Message:

FE/Qt: bugref:9996. Calling defaultExtension function with correct device type.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards

Files:

• clonevd/UIWizardCloneVD.h (modified) (1 diff)
• clonevd/UIWizardCloneVDExpertPage.cpp (modified) (2 diffs)
• clonevd/UIWizardCloneVDPathSizePage.cpp (modified) (2 diffs)
• editors/UIWizardDiskEditors.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.h

@@ -78 +78 @@
     void setMediumVariantPageVisibility();
 
-    CMediumFormat m_comMediumFormat;
-    qulonglong m_uMediumVariant;
-    /** Holds the source virtual disk wrapper. */
-    CMedium m_comSourceVirtualDisk;
+    /** @name Parameters needed during medium cloning
+      * @{ */
+        CMediumFormat m_comMediumFormat;
+        qulonglong m_uMediumVariant;
+        /** Holds the source virtual disk wrapper. */
+        CMedium m_comSourceVirtualDisk;
 
-    /** Holds the source virtual-disk device type. */
-    KDeviceType m_enmDeviceType;
-    int m_iMediumVariantPageIndex;
-    qulonglong m_uMediumSize;
-    QString m_strMediumPath;
+        /** Holds the source virtual-disk device type. */
+        KDeviceType m_enmDeviceType;
+        int m_iMediumVariantPageIndex;
+        qulonglong m_uMediumSize;
+        QString m_strMediumPath;
+        QString m_strSourceDiskPath;
+    /** @} */
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDExpertPage.cpp

@@ -93 +93 @@
     QString strMediumPath =
         UIDiskEditorGroupBox::appendExtension(strSelectedPath,
-                                              UIDiskFormatsGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
+                                              UIDiskFormatsGroupBox::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
     QFileInfo mediumPath(strMediumPath);
     m_pMediumSizePathGroupBox->setMediumPath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
@@ -141 +141 @@
     m_pMediumSizePathGroupBox->setMediumSize(pWizard->sourceDiskLogicalSize());
     pWizard->setMediumSize(m_pMediumSizePathGroupBox->mediumSize());
-    QString strExtension = UIDiskFormatsGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk);
+    QString strExtension = UIDiskFormatsGroupBox::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType());
     QString strSourceDiskPath = QDir::toNativeSeparators(QFileInfo(pWizard->sourceDiskFilePath()).absolutePath());
     /* Disk name without the format extension: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPathSizePage.cpp

@@ -73 +73 @@
     if (!m_userModifiedParameters.contains("MediumPath"))
     {
-        QString strExtension = UIDiskFormatsGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk);
+        QString strExtension = UIDiskFormatsGroupBox::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType());
         QString strSourceDiskPath = QDir::toNativeSeparators(QFileInfo(pWizard->sourceDiskFilePath()).absolutePath());
         /* Disk name without the format extension: */
@@ -119 +119 @@
     QString strMediumPath =
         UIDiskEditorGroupBox::appendExtension(strSelectedPath,
-                                              UIDiskFormatsGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
+                                              UIDiskFormatsGroupBox::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
     QFileInfo mediumPath(strMediumPath);
     m_pMediumSizePathGroupBox->setMediumPath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.h

@@ -85 +85 @@
     const CMediumFormat &VDIMediumFormat() const;
     const QStringList formatExtensions() const;
+    /** Attempts to find a file extention for the device type @p enmDeviceType withing the extensions
+      * returned by CMediumFormat::DescribeFileExtensions(..). */
     static QString defaultExtension(const CMediumFormat &mediumFormatRef, KDeviceType enmDeviceType);