Changeset 101264 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 26, 2023 10:51:10 AM (16 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10523. Don't cache UIGuestOSType object when all we need is guest os type Id.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• editors/UIVideoMemoryEditor.cpp (modified) (4 diffs)
• editors/UIVideoMemoryEditor.h (modified) (3 diffs)
• machine/UIMachineSettingsDisplay.cpp (modified) (1 diff)

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

@@ -45 +45 @@
     : UIEditor(pParent)
     , m_iValue(0)
-    , m_guestOSType(UIGuestOSTypeII())
     , m_cGuestScreenCount(1)
     , m_enmGraphicsControllerType(KGraphicsControllerType_Null)
@@ -85 +84 @@
 }
 
-void UIVideoMemoryEditor::setGuestOSType(const UIGuestOSTypeII &guestOSType)
-{
-    /* Update cached value and
-     * requirements if value has changed: */
-    if (m_guestOSType != guestOSType)
+void UIVideoMemoryEditor::setGuestOSTypeId(const QString &strGuestOSTypeId)
+{
+    /* Update cached value and
+     * requirements if value has changed: */
+    if (m_strGuestOSTypeId != strGuestOSTypeId)
     {
         /* Remember new guest OS type: */
-        m_guestOSType = guestOSType;
+        m_strGuestOSTypeId = strGuestOSTypeId;
 
         /* Update requirements: */
@@ -316 +315 @@
 {
     /* Make sure guest OS type is set: */
-    if (!m_guestOSType.isOk())
+    if (m_strGuestOSTypeId.isEmpty())
         return;
 
@@ -323 +322 @@
 
     /* Get monitors count and recommended VRAM: */
-    int iNeedMBytes = UICommon::requiredVideoMemory(m_guestOSType.getId(), m_cGuestScreenCount) / _1M;
+    int iNeedMBytes = UICommon::requiredVideoMemory(m_strGuestOSTypeId, m_cGuestScreenCount) / _1M;
+
     /* Adjust visible maximum VRAM to be no less than 128MB (if possible): */
     if (m_iMaxVRAMVisible < 128 && m_iMaxVRAM >= 128)

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

@@ -34 +34 @@
 /* GUI includes: */
 #include "UIEditor.h"
-#include "UIGuestOSTypeII.h"
 
 /* COM includes: */
@@ -66 +65 @@
 
     /** Defines @a comGuestOSType. */
-    void setGuestOSType(const UIGuestOSTypeII &comGuestOSType);
+    void setGuestOSTypeId(const QString &strGuestOSTypeId);
 
     /** Defines @a cGuestScreenCount. */
@@ -117 +116 @@
     /** @name Options
      * @{ */
-        /** Holds the guest OS type ID. */
-        UIGuestOSTypeII          m_guestOSType;
+        /** Holds the guest OS type Id. */
+        QString                 m_strGuestOSTypeId;
         /** Holds the guest screen count. */
         int                      m_cGuestScreenCount;

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

@@ -330 +330 @@
     /* Remember new guest OS type: */
     m_guestOSType = guestOSType;
-    m_pEditorVideoMemorySize->setGuestOSType(m_guestOSType);
+    m_pEditorVideoMemorySize->setGuestOSTypeId(m_guestOSType.getId());
 
 #ifdef VBOX_WITH_3D_ACCELERATION