Changeset 101286 in vbox for trunk

Timestamp:

Sep 27, 2023 9:23:24 AM (16 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10523. Some more cleaning.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/details/UIDetailsElement.cpp (modified) (1 diff)
• settings/editors/UINameAndSystemEditor.cpp (modified) (3 diffs)
• settings/editors/UINameAndSystemEditor.h (modified) (1 diff)
• settings/machine/UIMachineSettingsGeneral.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp

@@ -911 +911 @@
                 pEditor->setPath(strValue);
             else if (fChooseType)
-                pEditor->setTypeId(strValue);
+                pEditor->setGuestOSTypeByTypeId(strValue);
 
             /* Add to popup: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp

@@ -160 +160 @@
 }
 
-void UINameAndSystemEditor::setTypeId(QString strTypeId, QString strFamilyId /* = QString() */)
-{
-    Q_UNUSED(strTypeId);
-    Q_UNUSED(strFamilyId);
-    // if (!m_pComboType)
-    //     return;
-    // AssertMsgReturnVoid(!strTypeId.isNull(), ("Null guest OS type ID"));
-
-    // /* Initialize indexes: */
-    // int iTypeIndex = -1;
-    // int iFamilyIndex = -1;
-
-    // /* If family ID isn't empty: */
-    // if (!strFamilyId.isEmpty())
-    // {
-    //     /* Search for corresponding family ID index: */
-    //     iFamilyIndex = m_pComboFamily->findData(strFamilyId, TypeID);
-
-    //     /* If that family ID isn't present, we have to add it: */
-    //     if (iFamilyIndex == -1)
-    //     {
-    //         /* Append family ID to corresponding combo: */
-    //         m_pComboFamily->addItem(strFamilyId);
-    //         m_pComboFamily->setItemData(m_pComboFamily->count() - 1, strFamilyId, TypeID);
-    //         /* Append family ID to type cache: */
-    //         m_types[strFamilyId] = QList<UIGuestOSType>();
-
-    //         /* Search for corresponding family ID index finally: */
-    //         iFamilyIndex = m_pComboFamily->findData(strFamilyId, TypeID);
-    //     }
-    // }
-    // /* If family ID is empty: */
-    // else
-    // {
-    //     /* We'll try to find it by type ID: */
-    //     foreach (const QString &strKnownFamilyId, m_types.keys())
-    //     {
-    //         foreach (const UIGuestOSType &guiType, m_types.value(strKnownFamilyId))
-    //         {
-    //             if (guiType.typeId == strTypeId)
-    //                 strFamilyId = strKnownFamilyId;
-    //             if (!strFamilyId.isNull())
-    //                 break;
-    //         }
-    //         if (!strFamilyId.isNull())
-    //             break;
-    //     }
-
-    //     /* If we were unable to find it => use "Other": */
-    //     if (strFamilyId.isNull())
-    //         strFamilyId = "Other";
-
-    //     /* Search for corresponding family ID index finally: */
-    //     iFamilyIndex = m_pComboFamily->findData(strFamilyId, TypeID);
-    // }
-
-    // /* To that moment family ID index should be always found: */
-    // AssertReturnVoid(iFamilyIndex != -1);
-    // /* So we choose it: */
-    // m_pComboFamily->setCurrentIndex(iFamilyIndex);
-    // sltFamilyChanged(m_pComboFamily->currentIndex());
-
-    // /* Search for corresponding type ID index: */
-    // iTypeIndex = m_pComboType->findData(strTypeId, TypeID);
-
-    // /* If that type ID isn't present, we have to add it: */
-    // if (iTypeIndex == -1)
-    // {
-    //     /* Append type ID to type cache: */
-    //     UIGuestOSType guiType;
-    //     guiType.typeId = strTypeId;
-    //     guiType.typeDescription = strTypeId;
-    //     guiType.is64bit = false;
-    //     m_types[strFamilyId] << guiType;
-
-    //     /* So we re-choose family again: */
-    //     m_pComboFamily->setCurrentIndex(iFamilyIndex);
-    //     sltFamilyChanged(m_pComboFamily->currentIndex());
-
-    //     /* Search for corresponding type ID index finally: */
-    //     iTypeIndex = m_pComboType->findData(strTypeId, TypeID);
-    // }
-
-    // /* To that moment type ID index should be always found: */
-    // AssertReturnVoid(iTypeIndex != -1);
-    // /* So we choose it: */
-    // m_pComboType->setCurrentIndex(iTypeIndex);
-    // sltTypeChanged(m_pComboType->currentIndex());
-}
-
 bool UINameAndSystemEditor::setGuestOSTypeByTypeId(const QString &strTypeId)
 {
@@ -474 +384 @@
 void UINameAndSystemEditor::selectPreferredType()
 {
-    // /* Select the most recently chosen item: */
-    // if (m_currentIds.contains(m_strFamilyId))
-    // {
-    //     const QString strTypeId = m_currentIds.value(m_strFamilyId);
-    //     const int iTypeIndex = m_pComboType->findData(strTypeId, TypeID);
-    //     if (iTypeIndex != -1)
-    //         m_pComboType->setCurrentIndex(iTypeIndex);
-    // }
-    // /* Or select Windows 10 item for Windows family as default: */
-    // else
     if (m_strFamilyId == "Windows")
     {
@@ -758 +658 @@
     for (int i = 0; i < families.size(); ++i)
     {
-        //const QString &strFamilyId = familyIds.at(i);
-
         m_pComboFamily->addItem(families[i].second);
         m_pComboFamily->setItemData(i, families[i].first, FamilyID);
-
-        /* Fill in the type cache: */
-        // m_types[strFamilyId] = QList<UIGuestOSType>();
-        // foreach (const CGuestOSType &comType, uiCommon().vmGuestOSTypeList(strFamilyId))
-        // {
-        //     UIGuestOSType guiType;
-        //     guiType.typeId = comType.GetId();
-        //     guiType.typeDescription = QString(comType.GetDescription()).remove(" (64-bit)", Qt::CaseInsensitive);
-        //     guiType.is64bit = comType.GetIs64Bit();
-        //     m_types[strFamilyId] << guiType;
-        // }
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.h

@@ -115 +115 @@
     /* strTypeId should be one of the type ids defined in Global.cpp and returned by IGuestOSType::getId(). */
     bool setGuestOSTypeByTypeId(const QString &strTypeId);
-    /** Defines the VM OS @a strTypeId and @a strFamilyId if passed. */
-    void setTypeId(QString strTypeId, QString strFamilyId = QString());
     /** Returns the VM OS type ID. */
     QString typeId() const;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

@@ -252 +252 @@
     {
         m_pEditorNameAndSystem->setName(oldGeneralData.m_strName);
-        m_pEditorNameAndSystem->setTypeId(oldGeneralData.m_strGuestOsTypeId);
+        m_pEditorNameAndSystem->setGuestOSTypeByTypeId(oldGeneralData.m_strGuestOsTypeId);
     }