Changeset 85619 in vbox

Timestamp:

Aug 5, 2020 6:34:08 PM (5 years ago)

Author:

vboxsync

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

139728

Message:

FE/Qt: bugref:9609: A bit of cleanup for action-pool stuff: Coding-style fixes; Make sure UIAction icon is always assigned if icon for at least initial state is set; A bit of paranoia for menu tool-tip setter.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIActionPool.cpp (modified) (3 diffs)
• UIActionPool.h (modified) (5 diffs)

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

@@ -196 +196 @@
 void UIAction::updateIcon()
 {
-    QAction::setIcon(m_icons.value(m_iState));
+    QAction::setIcon(m_icons.value(m_iState, m_icons.value(0)));
 }
 
@@ -264 +264 @@
 void UIActionMenu::setShowToolTip(bool fShowToolTip)
 {
-    qobject_cast<UIMenu*>(menu())->setShowToolTip(fShowToolTip);
+    UIMenu *pMenu = qobject_cast<UIMenu*>(menu());
+    AssertPtrReturnVoid(pMenu);
+    pMenu->setShowToolTip(fShowToolTip);
 }
 
@@ -421 +423 @@
 void UIActionPolymorphicMenu::setShowToolTip(bool fShowToolTip)
 {
-    qobject_cast<UIMenu*>(menu())->setShowToolTip(fShowToolTip);
+    UIMenu *pMenu = qobject_cast<UIMenu*>(menu());
+    if (pMenu)
+        pMenu->setShowToolTip(fShowToolTip);
 }
 

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

@@ -144 +144 @@
 };
 
-/** Restriction levels. */
+/** Action restriction levels. */
 enum UIActionRestrictionLevel
 {
@@ -237 +237 @@
     /** Defines action @a strShortcutScope. */
     void setShortcutScope(const QString &strShortcutScope) { m_strShortcutScope = strShortcutScope; }
+
+    /** Defines current keyboard shortcuts for this action. */
+    void setShortcuts(const QList<QKeySequence> &shortcuts);
+    /** Make action show keyboard shortcut. */
+    void showShortcut();
+    /** Make action hide keyboard shortcut. */
+    void hideShortcut();
 
     /** Returns action extra-data ID. */
@@ -252 +259 @@
     virtual QKeySequence standardShortcut(UIActionPoolType) const { return QKeySequence(); }
 
-    /** Defines current keyboard shortcuts for this action. */
-    void setShortcuts(const QList<QKeySequence> &shortcuts);
-    /** Make action show keyboard shortcut. */
-    void showShortcut();
-    /** Make action hide keyboard shortcut. */
-    void hideShortcut();
-
     /** Retranslates action. */
     virtual void retranslateUi() = 0;
@@ -286 +286 @@
 
     /** Holds the action type. */
-    UIActionType  m_enmType;
+    const UIActionType  m_enmType;
     /** Holds whether this is machine-menu action. */
-    bool          m_fMachineMenuAction;
+    const bool          m_fMachineMenuAction;
 
     /** Holds the reference to the action-pool this action belongs to. */
-    UIActionPool     *m_pActionPool;
+    UIActionPool           *m_pActionPool;
     /** Holds the type of the action-pool this action belongs to. */
-    UIActionPoolType  m_enmActionPoolType;
+    const UIActionPoolType  m_enmActionPoolType;
 
     /** Holds current action state. */
-    int                  m_iState;
+    int             m_iState;
     /** Holds action icons. */
-    QVector<QIcon>       m_icons;
+    QVector<QIcon>  m_icons;
+
     /** Holds the action name. */
-    QString              m_strName;
+    QString  m_strName;
+
     /** Holds the action shortcut scope. */
     QString              m_strShortcutScope;
@@ -321 +323 @@
       * @param  strIconDisabled  Brings the disabled-icon name. */
     UIActionMenu(UIActionPool *pParent,
-                 const QString &strIcon = QString(),
-                 const QString &strIconDisabled = QString());
+                 const QString &strIcon = QString(), const QString &strIconDisabled = QString());
     /** Constructs menu action passing @a pParent to the base-class.
       * @param  strIconNormal          Brings the normal-icon name.