Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.h	(revision 26706)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.h	(revision 26707)
@@ -35,8 +35,5 @@
     UIActionType_Simple,
     UIActionType_Toggle,
-    UIActionType_Menu,
-
-    /** The usual 32-bit type hack. */
-    UIActionType_32Bit_Hack = 0x7fffffff
+    UIActionType_Menu
 };
 
@@ -100,7 +97,5 @@
 #endif
 
-    UIActionIndex_End,
-    /** The usual 32-bit type hack. */
-    UIActionIndex_32Bit_Hack = 0x7fffffff
+    UIActionIndex_End
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp	(revision 26706)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp	(revision 26707)
@@ -161,14 +161,11 @@
 UIIndicatorsPool::UIIndicatorsPool(QObject *pParent)
     : QObject(pParent)
-{
-    /* Resize & clean actions vector */
-    m_IndicatorsPool.resize(UIIndicatorIndex_Max);
-    for (int i = 0; i < m_IndicatorsPool.size(); ++ i)
-        m_IndicatorsPool[i] = 0;
+    , m_IndicatorsPool(UIIndicatorIndex_End, 0)
+{
 }
 
 UIIndicatorsPool::~UIIndicatorsPool()
 {
-    for (int i = 0; i < m_IndicatorsPool.size(); ++ i)
+    for (int i = 0; i < m_IndicatorsPool.size(); ++i)
     {
         delete m_IndicatorsPool[i];
@@ -180,5 +177,5 @@
 QIStateIndicator* UIIndicatorsPool::indicator(UIIndicatorIndex index)
 {
-    if (!m_IndicatorsPool[index])
+    if (!m_IndicatorsPool.at(index))
     {
         switch (index)
@@ -212,6 +209,7 @@
         }
     }
-    return m_IndicatorsPool[index];
+    return m_IndicatorsPool.at(index);
 }
 
 #include "UIIndicatorsPool.moc"
+
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h	(revision 26706)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h	(revision 26707)
@@ -37,5 +37,5 @@
     UIIndicatorIndex_Mouse,
     UIIndicatorIndex_Hostkey,
-    UIIndicatorIndex_Max
+    UIIndicatorIndex_End
 };