Changeset 46676 in vbox

Timestamp:

Jun 19, 2013 4:15:53 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: UI status-bar indicator-pool interface: Cleanup (part 1).

Location:

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

Files:

• UIIndicatorsPool.cpp (modified) (2 diffs)
• UIIndicatorsPool.h (modified) (4 diffs)

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

@@ -737 +737 @@
     : QObject(pParent)
     , m_session(session)
-    , m_IndicatorsPool(UIIndicatorIndex_End, 0)
+    , m_pool(UIIndicatorIndex_End)
 {
 }
@@ -743 +743 @@
 UIIndicatorsPool::~UIIndicatorsPool()
 {
-    for (int i = 0; i < m_IndicatorsPool.size(); ++i)
-    {
-        delete m_IndicatorsPool[i];
-        m_IndicatorsPool[i] = 0;
-    }
-    m_IndicatorsPool.clear();
+    for (int i = 0; i < m_pool.size(); ++i)
+    {
+        delete m_pool[i];
+        m_pool[i] = 0;
+    }
+    m_pool.clear();
 }
 
 QIStateIndicator* UIIndicatorsPool::indicator(UIIndicatorIndex index)
 {
-    if (!m_IndicatorsPool.at(index))
+    if (!m_pool.at(index))
     {
         switch (index)
         {
-            case UIIndicatorIndex_HardDisks:
-                m_IndicatorsPool[index] = new UIIndicatorHardDisks(m_session);
-                break;
-            case UIIndicatorIndex_OpticalDisks:
-                m_IndicatorsPool[index] = new UIIndicatorOpticalDisks(m_session);
-                break;
-            case UIIndicatorIndex_FloppyDisks:
-                m_IndicatorsPool[index] = new UIIndicatorFloppyDisks(m_session);
-                break;
-            case UIIndicatorIndex_NetworkAdapters:
-                m_IndicatorsPool[index] = new UIIndicatorNetworkAdapters(m_session);
-                break;
-            case UIIndicatorIndex_USBDevices:
-                m_IndicatorsPool[index] = new UIIndicatorUSBDevices(m_session);
-                break;
-            case UIIndicatorIndex_SharedFolders:
-                m_IndicatorsPool[index] = new UIIndicatorSharedFolders(m_session);
-                break;
-            case UIIndicatorIndex_VideoCapture:
-                m_IndicatorsPool[index] = new UIIndicatorVideoCapture(m_session);
-                break;
-            case UIIndicatorIndex_Virtualization:
-                m_IndicatorsPool[index] = new UIIndicatorVirtualization(m_session);
-                break;
-            case UIIndicatorIndex_Mouse:
-                m_IndicatorsPool[index] = new UIIndicatorMouse(m_session);
-                break;
-            case UIIndicatorIndex_Hostkey:
-                m_IndicatorsPool[index] = new UIIndicatorHostkey(m_session);
-                break;
-            default:
-                break;
-        }
-    }
-    return m_IndicatorsPool.at(index);
+            case UIIndicatorIndex_HardDisks:       m_pool[index] = new UIIndicatorHardDisks(m_session); break;
+            case UIIndicatorIndex_OpticalDisks:    m_pool[index] = new UIIndicatorOpticalDisks(m_session); break;
+            case UIIndicatorIndex_FloppyDisks:     m_pool[index] = new UIIndicatorFloppyDisks(m_session); break;
+            case UIIndicatorIndex_NetworkAdapters: m_pool[index] = new UIIndicatorNetworkAdapters(m_session); break;
+            case UIIndicatorIndex_USBDevices:      m_pool[index] = new UIIndicatorUSBDevices(m_session); break;
+            case UIIndicatorIndex_SharedFolders:   m_pool[index] = new UIIndicatorSharedFolders(m_session); break;
+            case UIIndicatorIndex_VideoCapture:    m_pool[index] = new UIIndicatorVideoCapture(m_session); break;
+            case UIIndicatorIndex_Virtualization:  m_pool[index] = new UIIndicatorVirtualization(m_session); break;
+            case UIIndicatorIndex_Mouse:           m_pool[index] = new UIIndicatorMouse(m_session); break;
+            case UIIndicatorIndex_Hostkey:         m_pool[index] = new UIIndicatorHostkey(m_session); break;
+            default: break;
+        }
+    }
+    return m_pool.at(index);
 }
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 #define __UIIndicatorsPool_h__
 
-/* Local includes */
+/* GUI includes: */
 #include "QIStateIndicator.h"
 
+/* Forward declarations: */
 class CSession;
 
+/* Indicator types: */
 enum UIIndicatorIndex
 {
@@ -40 +42 @@
 };
 
+/* Indicator pool interface/prototype: */
 class UIIndicatorsPool : public QObject
 {
@@ -46 +49 @@
 public:
 
+    /* Constructor/destructor: */
     UIIndicatorsPool(CSession &session, QObject *pParent);
-   ~UIIndicatorsPool();
+    ~UIIndicatorsPool();
 
+    /* API indicator access stuff: */
     QIStateIndicator* indicator(UIIndicatorIndex index);
 
 private:
 
+    /* Variables: */
     CSession &m_session;
-    QVector<QIStateIndicator*> m_IndicatorsPool;
+    QVector<QIStateIndicator*> m_pool;
 };