儲存庫 vbox 的更動 52385

時間撮記:

2014-8-14 下午04:40:36 (10 年 以前)

作者:

vboxsync

訊息:

FE/Qt: Coding-style / warning fix for r95440.

位置:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

檔案:

• UIIndicatorsPool.cpp (修改) (4 筆差異)
• UIIndicatorsPool.h (修改) (1 筆差異)

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

@@ -1040 +1040 @@
 void UIIndicatorsPool::sltAutoUpdateIndicatorStates()
 {
-    /* Update states for following indicators: */
-    QVector <KDeviceType> deviceTypes(0);
-
+    /* We should update states for following indicators: */
+    QVector<KDeviceType> deviceTypes;
     if (m_pool.contains(IndicatorType_HardDisks))
         deviceTypes.append(KDeviceType_HardDisk);
@@ -1058 +1057 @@
         deviceTypes.append(KDeviceType_Graphics3D);
 
+    /* Acquire current states from the console: */
     CConsole console = m_session.GetConsole();
-    QVector <KDeviceActivity> activities = console.GetDeviceActivity(deviceTypes);
-    if (!console.isOk())
-        return;
-
-    int i;
-    for (i = 0; i < activities.size(); ++i)
-    {
-        QIStatusBarIndicator *pIndicator = NULL;
-
-        switch (deviceTypes[i])
-        {
-            case KDeviceType_HardDisk:
-                pIndicator = m_pool.value(IndicatorType_HardDisks);
-                break;
-            case KDeviceType_DVD:
-                pIndicator = m_pool.value(IndicatorType_OpticalDisks);
-                break;
-            case KDeviceType_Floppy:
-                pIndicator = m_pool.value(IndicatorType_FloppyDisks);
-                break;
-            case KDeviceType_USB:
-                pIndicator = m_pool.value(IndicatorType_USB);
-                break;
-            case KDeviceType_Network:
-                pIndicator = m_pool.value(IndicatorType_Network);
-                break;
-            case KDeviceType_SharedFolder:
-                pIndicator = m_pool.value(IndicatorType_SharedFolders);
-                break;
-            case KDeviceType_Graphics3D:
-                pIndicator = m_pool.value(IndicatorType_Display);
-                break;
-            default:
-                AssertFailed();
-                break;
-        }
-
+    const QVector<KDeviceActivity> states = console.GetDeviceActivity(deviceTypes);
+    AssertReturnVoid(console.isOk());
+
+    /* Update indicators with the acquired states: */
+    for (int iIndicator = 0; iIndicator < states.size(); ++iIndicator)
+    {
+        QIStatusBarIndicator *pIndicator = 0;
+        switch (deviceTypes[iIndicator])
+        {
+            case KDeviceType_HardDisk:     pIndicator = m_pool.value(IndicatorType_HardDisks); break;
+            case KDeviceType_DVD:          pIndicator = m_pool.value(IndicatorType_OpticalDisks); break;
+            case KDeviceType_Floppy:       pIndicator = m_pool.value(IndicatorType_FloppyDisks); break;
+            case KDeviceType_USB:          pIndicator = m_pool.value(IndicatorType_USB); break;
+            case KDeviceType_Network:      pIndicator = m_pool.value(IndicatorType_Network); break;
+            case KDeviceType_SharedFolder: pIndicator = m_pool.value(IndicatorType_SharedFolders); break;
+            case KDeviceType_Graphics3D:   pIndicator = m_pool.value(IndicatorType_Display); break;
+            default: AssertFailed(); break;
+        }
         if (pIndicator)
-            updateIndicatorStateForDevice(pIndicator, deviceTypes[i], activities[i]);
+            updateIndicatorStateForDevice(pIndicator, states[iIndicator]);
     }
 }
@@ -1294 +1275 @@
 }
 
-void UIIndicatorsPool::updateIndicatorStateForDevice(QIStatusBarIndicator *pIndicator, KDeviceType deviceType,
-                                                     KDeviceActivity deviceActivity)
+void UIIndicatorsPool::updateIndicatorStateForDevice(QIStatusBarIndicator *pIndicator, KDeviceActivity state)
 {
     /* Assert indicators with NO state: */
@@ -1315 +1295 @@
     {
         /* If current state differs from actual => set the actual one: */
-        const int iState = (int)deviceActivity;
+        const int iState = (int)state;
         if (pStateIndicator->state() != iState)
             pStateIndicator->setState(iState);

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

@@ -98 +98 @@
     int indicatorPosition(IndicatorType indicatorType) const;
 
-    /** Updates state for passed @a pIndicator through @a deviceType. */
-    void updateIndicatorStateForDevice(QIStatusBarIndicator *pIndicator, KDeviceType deviceType,
-                                       KDeviceActivity deviceActivity);
+    /** Updates passed @a pIndicator with current @a state value. */
+    void updateIndicatorStateForDevice(QIStatusBarIndicator *pIndicator, KDeviceActivity state);
 
     /** Holds the UI session reference. */