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

Timestamp:

May 12, 2010 1:04:58 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: Just some code cosmetics.

File:

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

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

@@ -273 +273 @@
 
         QString strToolTip = QApplication::translate("VBoxConsoleWnd",
-                                "<p style='white-space:pre'><nobr>Indicates the activity of the "
-                                "network interfaces:</nobr>%1</p>", "Network adapters tooltip");
+                                 "<p style='white-space:pre'><nobr>Indicates the activity of the "
+                                 "network interfaces:</nobr>%1</p>", "Network adapters tooltip");
 
         RTTIMESPEC time;
@@ -280 +280 @@
 
         QString strFlags, strCount;
-        ULONG64 timestamp;
-        machine.GetGuestProperty("/VirtualBox/GuestInfo/Net/Count", strCount, timestamp, strFlags);
-        bool fPropsValid = (u64Now - timestamp < UINT64_C(60000000000)); /* timeout beacon */
-
-        QStringList aIp, aMac;
+        ULONG64 uTimestamp;
+        machine.GetGuestProperty("/VirtualBox/GuestInfo/Net/Count", strCount, uTimestamp, strFlags);
+        bool fPropsValid = (u64Now - uTimestamp < UINT64_C(60000000000)); /* timeout beacon */
+
+        QStringList ipList, macList;
         if (fPropsValid)
         {
-            int cAdapters = RT_MIN(strCount.toInt(), uMaxCount);
-            for (int i = 0; i < cAdapters; i++)
+            int cAdapters = RT_MIN(strCount.toInt(), (int)uMaxCount);
+            for (int i = 0; i < cAdapters; ++i)
             {
-                aIp << machine.GetGuestPropertyValue(QString("/VirtualBox/GuestInfo/Net/%1/V4/IP").arg(i));
-                aMac << machine.GetGuestPropertyValue(QString("/VirtualBox/GuestInfo/Net/%1/MAC").arg(i));
+                ipList << machine.GetGuestPropertyValue(QString("/VirtualBox/GuestInfo/Net/%1/V4/IP").arg(i));
+                macList << machine.GetGuestPropertyValue(QString("/VirtualBox/GuestInfo/Net/%1/MAC").arg(i));
             }
         }
 
         ulong uEnabled = 0;
-        for (ulong uSlot = 0; uSlot < uMaxCount; ++ uSlot)
+        for (ulong uSlot = 0; uSlot < uMaxCount; ++uSlot)
         {
             const CNetworkAdapter &adapter = machine.GetNetworkAdapter(uSlot);
@@ -305 +305 @@
                 {
                     QString strGuestMac = adapter.GetMACAddress();
-                    int iIp = aMac.indexOf(strGuestMac);
+                    int iIp = macList.indexOf(strGuestMac);
                     if (iIp >= 0)
-                        strGuestIp = aIp[iIp];
+                        strGuestIp = ipList[iIp];
                 }
                 strFullData += QApplication::translate("VBoxConsoleWnd",
@@ -315 +315 @@
                     .arg(strGuestIp.isEmpty() ? "" : "IP " + strGuestIp + ", ")
                     .arg(adapter.GetCableConnected() ?
-                          QApplication::translate("VBoxConsoleWnd", "connected", "Network adapters tooltip") :
-                          QApplication::translate("VBoxConsoleWnd", "disconnected", "Network adapters tooltip"));
-                ++ uEnabled;
+                         QApplication::translate("VBoxConsoleWnd", "connected", "Network adapters tooltip") :
+                         QApplication::translate("VBoxConsoleWnd", "disconnected", "Network adapters tooltip"));
+                ++uEnabled;
             }
         }
@@ -327 +327 @@
         if (strFullData.isNull())
             strFullData = QApplication::translate("VBoxConsoleWnd",
-                             "<br><nobr><b>All network adapters are disabled</b></nobr>", "Network adapters tooltip");
+                              "<br><nobr><b>All network adapters are disabled</b></nobr>", "Network adapters tooltip");
 
         setToolTip(strToolTip.arg(strFullData));