Changeset 78540 in vbox for trunk/src/VBox

Timestamp:

May 16, 2019 9:57:17 AM (6 years ago)

Author:

vboxsync

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

130585

Message:

FE/Qt: bugref:9446 Caching the restricted network attachment types tp avoid repetitive extra data reads.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp (modified) (7 diffs)

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

@@ -122 +122 @@
     /** Holds whether the network adapter is connected. */
     bool                              m_fCableConnected;
+    /** Holds the list of restricted network attachment types. */
+    UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork m_enmRestrictedNetworkAttachmentTypes;
 };
 
@@ -220 +222 @@
     QString m_strNATNetworkName;
     UIPortForwardingDataList m_portForwardingRules;
+    /** Holds the list of restricted network attachment types. */
+    UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork m_enmRestrictedNetworkAttachmentTypes;
 };
 
@@ -304 +308 @@
     for (int i = 0; i < adapterCache.childCount(); ++i)
         m_portForwardingRules << adapterCache.child(i).base();
+    /* Cache the restricted metwork attachment types to avoid re-reading them from the extra data: */
+    m_enmRestrictedNetworkAttachmentTypes = oldAdapterData.m_enmRestrictedNetworkAttachmentTypes;
+    /* Re-apply language settings: */
+    retranslateUi();
 }
 
@@ -783 +791 @@
 
         /* Populate attachments: */
-        const UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork enmRestrictedNetworkAttachmentTypes =
-            gEDataManager->restrictedNetworkAttachmentTypes();
         int iAttachmentTypeIndex = 0;
         /* We want some hardcoded order, so prepare a list of enum values: */
@@ -794 +800 @@
         {
             const KNetworkAttachmentType enmType = attachmentTypes.at(i);
-            if (enmRestrictedNetworkAttachmentTypes & toInternalNetworkAdapterEnum(enmType))
+            if (m_enmRestrictedNetworkAttachmentTypes & toInternalNetworkAdapterEnum(enmType))
                 continue;
             m_pAttachmentTypeComboBox->insertItem(iAttachmentTypeIndex, gpConverter->toString(enmType));
@@ -1036 +1042 @@
     UIDataSettingsMachineNetwork oldNetworkData;
 
+    const UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork enmRestrictedNetworkAttachmentTypes =
+        gEDataManager->restrictedNetworkAttachmentTypes();
+
     /* For each network adapter: */
     for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
@@ -1060 +1069 @@
             oldAdapterData.m_strGenericProperties = loadGenericProperties(comAdapter);
             oldAdapterData.m_fCableConnected = comAdapter.GetCableConnected();
+            oldAdapterData.m_enmRestrictedNetworkAttachmentTypes = enmRestrictedNetworkAttachmentTypes;
             foreach (const QString &strRedirect, comAdapter.GetNATEngine().GetRedirects())
             {