Changeset 85620 in vbox for trunk/src/VBox

Timestamp:

Aug 5, 2020 6:39:14 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139729

Message:

FE/Qt: bugref:9609: A bit of cleanup for action-pool stuff: No need for state management stuff in UIActionPolymorphicMenu class since it's already present in UIAction base class.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (4 diffs)
• globals/UIActionPool.h (modified) (4 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

@@ -125 +125 @@
 }
 
-UIActionPolymorphicMenu *UIAction::toActionPolymorphicMenu()
-{
-    return qobject_cast<UIActionPolymorphicMenu*>(this);
+void UIAction::setState(int iState)
+{
+    m_iState = iState;
+    updateIcon();
+    retranslateUi();
 }
 
@@ -382 +384 @@
     : UIAction(pParent, UIActionType_PolymorphicMenu)
     , m_pMenu(0)
-    , m_iState(0)
 {
     if (!strIcon.isNull())
@@ -394 +395 @@
     : UIAction(pParent, UIActionType_PolymorphicMenu)
     , m_pMenu(0)
-    , m_iState(0)
 {
     if (!strIconNormal.isNull())
@@ -405 +405 @@
     : UIAction(pParent, UIActionType_PolymorphicMenu)
     , m_pMenu(0)
-    , m_iState(0)
 {
     if (!icon.isNull())

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

@@ -215 +215 @@
     UIActionPool *actionPool() const { return m_pActionPool; }
 
-    /** Casts action to polymorphic-menu-action. */
-    UIActionPolymorphicMenu *toActionPolymorphicMenu();
-
     /** Returns current action state. */
     int state() const { return m_iState; }
     /** Defines current action @a iState. */
-    void setState(int iState) { m_iState = iState; updateIcon(); retranslateUi(); }
+    void setState(int iState);
 
     /** Defines @a icon for certain @a iState. */
@@ -282 +279 @@
       * @note Used to simplify action names for tool-tip needs. */
     static QString simplifyText(QString strText);
-
-private:
 
     /** Holds the action type. */
@@ -434 +429 @@
     Q_OBJECT;
 
-public:
-
-    /** Returns current action state. */
-    int state() const { return m_iState; }
-    /** Defines current action state. */
-    void setState(int iState) { m_iState = iState; retranslateUi(); }
-
 protected:
 
@@ -484 +472 @@
     /** Holds the menu instance. */
     UIMenu *m_pMenu;
-    /** Holds current action state. */
-    int     m_iState;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -3028 +3028 @@
             || pItem->itemType() == UIVirtualMachineItemType_CloudReal))
     {
-        actionPool()->action(UIActionIndexMN_M_Group_S_Discard)->toActionPolymorphicMenu()->setState(1);
-        actionPool()->action(UIActionIndexMN_M_Machine_S_Discard)->toActionPolymorphicMenu()->setState(1);
+        actionPool()->action(UIActionIndexMN_M_Group_S_Discard)->setState(1);
+        actionPool()->action(UIActionIndexMN_M_Machine_S_Discard)->setState(1);
     }
     else
     {
-        actionPool()->action(UIActionIndexMN_M_Group_S_Discard)->toActionPolymorphicMenu()->setState(0);
-        actionPool()->action(UIActionIndexMN_M_Machine_S_Discard)->toActionPolymorphicMenu()->setState(0);
+        actionPool()->action(UIActionIndexMN_M_Group_S_Discard)->setState(0);
+        actionPool()->action(UIActionIndexMN_M_Machine_S_Discard)->setState(0);
     }
 
@@ -3040 +3040 @@
     if (pItem && pItem->accessible())
     {
-        actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow)->toActionPolymorphicMenu()->setState(pItem->isItemPoweredOff() ? 0 : 1);
-        actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)->toActionPolymorphicMenu()->setState(pItem->isItemPoweredOff() ? 0 : 1);
+        actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow)->setState(pItem->isItemPoweredOff() ? 0 : 1);
+        actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)->setState(pItem->isItemPoweredOff() ? 0 : 1);
         /// @todo Hmm, fix it?
 //        QToolButton *pButton = qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)));
@@ -3049 +3049 @@
     else
     {
-        actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow)->toActionPolymorphicMenu()->setState(0);
-        actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)->toActionPolymorphicMenu()->setState(0);
+        actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow)->setState(0);
+        actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)->setState(0);
         /// @todo Hmm, fix it?
 //        QToolButton *pButton = qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)));