Changeset 91590 in vbox for trunk/src/VBox

Timestamp:

Oct 6, 2021 1:01:21 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: UIWizardImportApp: Remove excessive source ID stuff.

Location:

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

Files:

• UIWizardImportAppPageBasic1.cpp (modified) (3 diffs)
• UIWizardImportAppPageBasic1.h (modified) (2 diffs)

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

@@ -100 +100 @@
             /* Compose empty item, fill it's data: */
             m_pSourceComboBox->addItem(QString());
-            m_pSourceComboBox->setItemData(m_pSourceComboBox->count() - 1, comProvider.GetId(),        SourceData_ID);
             m_pSourceComboBox->setItemData(m_pSourceComboBox->count() - 1, comProvider.GetName(),      SourceData_Name);
             m_pSourceComboBox->setItemData(m_pSourceComboBox->count() - 1, comProvider.GetShortName(), SourceData_ShortName);
@@ -134 +133 @@
     m_comCloudProvider = CCloudProvider();
 
-    /* If provider chosen: */
-    if (!sourceId().isNull())
+    /* If source is cloud one & provider chosen: */
+    if (isSourceCloudOne() && !source().isEmpty())
     {
         /* (Re)initialize Cloud Provider: */
-        m_comCloudProvider = cloudProviderById(sourceId(), wizardImp());
+        m_comCloudProvider = cloudProviderByShortName(source(), wizardImp());
         if (m_comCloudProvider.isNotNull())
         {
@@ -330 +329 @@
         iIndex = m_pSourceComboBox->currentIndex();
     return m_pSourceComboBox->itemData(iIndex, SourceData_IsItCloudFormat).toBool();
-}
-
-QUuid UIWizardImportAppPage1::sourceId() const
-{
-    const int iIndex = m_pSourceComboBox->currentIndex();
-    return m_pSourceComboBox->itemData(iIndex, SourceData_ID).toUuid();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.h

@@ -48 +48 @@
 enum
 {
-    SourceData_ID              = Qt::UserRole + 1,
-    SourceData_Name            = Qt::UserRole + 2,
-    SourceData_ShortName       = Qt::UserRole + 3,
-    SourceData_IsItCloudFormat = Qt::UserRole + 4
+    SourceData_Name            = Qt::UserRole + 1,
+    SourceData_ShortName       = Qt::UserRole + 2,
+    SourceData_IsItCloudFormat = Qt::UserRole + 3
 };
 
@@ -92 +91 @@
     bool isSourceCloudOne(int iIndex = -1) const;
 
-    /** Returns source ID. */
-    QUuid sourceId() const;
     /** Returns profile name. */
     QString profileName() const;