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

Timestamp:

Jul 5, 2011 12:13:15 PM (14 years ago)

Author:

vboxsync

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

72655

Message:

Main/VirtualBox: add two attributes for querying the list of internal networks and generic network drivers
Frontend/VirtualBox: use new methods to decrease time needed before the settings dialog opens

File:

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

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

@@ -1066 +1066 @@
 {
     /* Load total internal network list of all VMs: */
-    QStringList otherInternalNetworks;
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    ulong uCount = qMin((ULONG) 4, vbox.GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3));
-    const CMachineVector &machines = vbox.GetMachines();
-    for (int i = 0; i < machines.size(); ++i)
-    {
-        const CMachine &machine = machines[i];
-        if (machine.GetAccessible())
-        {
-            for (ulong uSlot = 0; uSlot < uCount; ++uSlot)
-            {
-                QString strName = machine.GetNetworkAdapter(uSlot).GetInternalNetwork();
-                if (!strName.isEmpty() && !otherInternalNetworks.contains(strName))
-                    otherInternalNetworks << strName;
-            }
-        }
-    }
+    QStringList otherInternalNetworks(QList<QString>::fromVector(vbox.GetInternalNetworks()));
     return otherInternalNetworks;
 }
@@ -1090 +1075 @@
 {
     /* Load total generic driver list of all VMs: */
-    QStringList otherGenericDrivers;
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    ulong uCount = qMin((ULONG) 4, vbox.GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3));
-    const CMachineVector &machines = vbox.GetMachines();
-    for (int i = 0; i < machines.size(); ++i)
-    {
-        const CMachine &machine = machines[i];
-        if (machine.GetAccessible())
-        {
-            for (ulong uSlot = 0; uSlot < uCount; ++uSlot)
-            {
-                QString strName = machine.GetNetworkAdapter(uSlot).GetGenericDriver();
-                if (!strName.isEmpty() && !otherGenericDrivers.contains(strName))
-                    otherGenericDrivers << strName;
-            }
-        }
-    }
+    QStringList otherGenericDrivers(QList<QString>::fromVector(vbox.GetGenericNetworkDrivers()));
     return otherGenericDrivers;
 }