Changeset 80276 in vbox for trunk/src/VBox

Timestamp:

Aug 14, 2019 2:36:52 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7720: UIMachineSettingsNetwork: Wipe out remaining stuff forgotten in r132543.

File:

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

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

@@ -62 +62 @@
         , m_strMACAddress(QString())
         , m_fCableConnected(false)
-        , m_enmRestrictedNetworkAttachmentTypes(UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork_Invalid)
     {}
 
@@ -116 +115 @@
     /** Holds whether the network adapter is connected. */
     bool                              m_fCableConnected;
-    /** Holds the list of restricted network attachment types. */
-    UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork m_enmRestrictedNetworkAttachmentTypes;
 };
 
@@ -209 +206 @@
     int m_iSlot;
     UIPortForwardingDataList m_portForwardingRules;
-    /** Holds the list of restricted network attachment types. */
-    UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork m_enmRestrictedNetworkAttachmentTypes;
 };
 
@@ -222 +217 @@
     , m_pParent(pParent)
     , m_iSlot(-1)
-    , m_enmRestrictedNetworkAttachmentTypes(UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork_Invalid)
 {
     /* Apply UI decorations: */
@@ -298 +292 @@
     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;
 
     /* Repopulate combo-boxes content: */
@@ -794 +786 @@
     UIDataSettingsMachineNetwork oldNetworkData;
 
-    const UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork enmRestrictedNetworkAttachmentTypes =
-        gEDataManager->restrictedNetworkAttachmentTypes();
-
     /* For each network adapter: */
     for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
@@ -821 +810 @@
             oldAdapterData.m_strGenericProperties = loadGenericProperties(comAdapter);
             oldAdapterData.m_fCableConnected = comAdapter.GetCableConnected();
-            oldAdapterData.m_enmRestrictedNetworkAttachmentTypes = enmRestrictedNetworkAttachmentTypes;
             foreach (const QString &strRedirect, comAdapter.GetNATEngine().GetRedirects())
             {