Changeset 29697 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 20, 2010 1:39:29 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: 4758: New running VM core: cleanup.

Location:

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

Files:

• UIActionsPool.cpp (modified) (5 diffs)
• UIActionsPool.h (modified) (2 diffs)

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

@@ -18 +18 @@
  */
 
+/* Global includes */
+#include <QtGlobal>
+
 /* Local includes */
 #include "UIActionsPool.h"
 #include "VBoxGlobal.h"
-
-/* Global includes */
-#include <QtGlobal>
 
 /* Action activation event */
@@ -51 +51 @@
 }
 
-class UISeparatorAction : public UIAction
-{
-    Q_OBJECT;
-
-public:
-
-    UISeparatorAction(QObject *pParent)
-        : UIAction(pParent, UIActionType_Separator)
-    {
-        setSeparator(true);
-    }
-};
-
 class UISimpleAction : public UIAction
 {
@@ -133 +120 @@
             setIcon(VBoxGlobal::iconSet(strIcon, strIconDis));
         setMenu(new QMenu);
-    }
-};
-
-class SeparatorAction : public UISeparatorAction
-{
-    Q_OBJECT;
-
-public:
-
-    SeparatorAction(QObject *pParent)
-        : UISeparatorAction(pParent)
-    {
-    }
-
-protected:
-
-    void retranslateUi()
-    {
     }
 };
@@ -1069 +1038 @@
     , m_actionsPool(UIActionIndex_End, 0)
 {
-    /* Common actions: */
-    m_actionsPool[UIActionIndex_Separator] = new SeparatorAction(this);
-
     /* "Machine" menu actions: */
     m_actionsPool[UIActionIndex_Toggle_Fullscreen] = new ToggleFullscreenModeAction(this);
@@ -1201 +1167 @@
         UIAction *pAction = m_actionsPool.at(i);
         /* Skip menus/separators */
-        if (pAction->type() == UIActionType_Menu || pAction->type() == UIActionType_Separator)
+        if (pAction->type() == UIActionType_Menu)
             continue;
         QString hotkey = VBoxGlobal::extractKeyFromActionText(pAction->text());

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

@@ -28 +28 @@
 enum UIActionType
 {
-    UIActionType_Separator,
     UIActionType_Simple,
     UIActionType_Toggle,
@@ -51 +50 @@
 enum UIActionIndex
 {
-    /* Common actions */
-    UIActionIndex_Separator,
-
     /* "Machine" menu actions: */
     UIActionIndex_Menu_Machine,