Changeset 54146 in vbox for trunk

Timestamp:

Feb 11, 2015 4:02:18 PM (10 years ago)

Author:

vboxsync

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

98178

Message:

FE/Qt: 7115: Cache some stuff for the network indicator of the UIIndicatorPool.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

@@ -318 +318 @@
         : UISessionStateStatusBarIndicator(pSession)
         , m_pTimerAutoUpdate(0)
+        , m_cMaxNetworkAdapters(0)
     {
         /* Assign state-icons: */
@@ -327 +328 @@
         connect(m_pSession, SIGNAL(sigMachineStateChange()),
                 this, SLOT(sltHandleMachineStateChange()));
+        /* Fetch maximum network adapters count: */
+        const CVirtualBox vbox = vboxGlobal().virtualBox();
+        const CMachine machine = m_pSession->machine();
+        m_cMaxNetworkAdapters = vbox.GetSystemProperties().GetMaxNetworkAdapters(machine.GetChipsetType());
         /* Create auto-update timer: */
         m_pTimerAutoUpdate = new QTimer(this);
@@ -388 +393 @@
         machine.GetGuestProperty("/VirtualBox/GuestInfo/Net/Count", strCount, iTimestamp, strFlags);
         bool fPropsValid = (u64Now - iTimestamp < UINT64_C(60000000000)); /* timeout beacon */
-        ulong uMaxCount = vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(machine.GetChipsetType());
         QStringList ipList, macList;
         if (fPropsValid)
         {
-            const int cAdapters = RT_MIN(strCount.toInt(), (int)uMaxCount);
+            const int cAdapters = RT_MIN(strCount.toInt(), m_cMaxNetworkAdapters);
             for (int i = 0; i < cAdapters; ++i)
             {
@@ -400 +404 @@
         }
 
-        /* Enumerate up to uMaxCount adapters: */
+        /* Enumerate up to m_cMaxNetworkAdapters adapters: */
         bool fAdaptersPresent = false;
         bool fCablesDisconnected = true;
-        for (ulong uSlot = 0; uSlot < uMaxCount; ++uSlot)
+        for (ulong uSlot = 0; uSlot < m_cMaxNetworkAdapters; ++uSlot)
         {
             const CNetworkAdapter &adapter = machine.GetNetworkAdapter(uSlot);
@@ -453 +457 @@
     /** Holds the auto-update timer instance. */
     QTimer *m_pTimerAutoUpdate;
+    /** Holds the maximum amount of the network adapters. */
+    int m_cMaxNetworkAdapters;
 };