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

Timestamp:

Jun 19, 2013 4:24:52 PM (12 years ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

• UIIndicatorsPool.cpp (modified) (2 diffs)
• UIIndicatorsPool.h (modified) (1 diff)

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

@@ -739 +739 @@
     , m_pool(UIIndicatorIndex_End)
 {
+    /* Prepare: */
+    prepare();
 }
 
 UIIndicatorsPool::~UIIndicatorsPool()
 {
-    for (int i = 0; i < m_pool.size(); ++i)
-    {
-        delete m_pool[i];
-        m_pool[i] = 0;
-    }
-    m_pool.clear();
+    /* Cleanup: */
+    cleanup();
 }
 
 QIStateIndicator* UIIndicatorsPool::indicator(UIIndicatorIndex index)
 {
-    if (!m_pool.at(index))
-    {
+    /* Just return what already exists: */
+    return m_pool[index];
+}
+
+void UIIndicatorsPool::prepare()
+{
+    /* Populate indicator-pool: */
+    for (int iIndex = 0; iIndex < UIIndicatorIndex_End; ++iIndex)
+    {
+        /* Prepare indicator: */
+        UIIndicatorIndex index = static_cast<UIIndicatorIndex>(iIndex);
         switch (index)
         {
@@ -770 +777 @@
         }
     }
-    return m_pool.at(index);
 }
 
+void UIIndicatorsPool::cleanup()
+{
+    /* Wipe-out indicator-pool: */
+    for (int iIndex = 0; iIndex < UIIndicatorIndex_End; ++iIndex)
+    {
+        /* Wipe-out indicator: */
+        delete m_pool[iIndex];
+        m_pool[iIndex] = 0;
+    }
+}
+
 #include "UIIndicatorsPool.moc"

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

@@ -58 +58 @@
 private:
 
+    /* Helpers: Prepare/cleanup stuff: */
+    void prepare();
+    void cleanup();
+
     /* Variables: */
     CSession &m_session;