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

Timestamp:

Dec 16, 2024 5:38:41 PM (5 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10814: VBox Manager: Cleanup for Machine Manager widget's public getters, a bit of sanity checks and paranoia.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIMachineManagerWidget.cpp (modified) (8 diffs)
• UIMachineManagerWidget.h (modified) (1 diff)

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

@@ -221 +221 @@
 UIToolType UIMachineManagerWidget::menuToolType() const
 {
-    return m_pMenuTools ? m_pMenuTools->toolsType() : UIToolType_Invalid;
+    AssertPtrReturn(m_pMenuTools, UIToolType_Invalid);
+    return m_pMenuTools->toolsType();
 }
 
 void UIMachineManagerWidget::setMenuToolType(UIToolType enmType)
 {
+    /* Sanity check: */
+    AssertReturnVoid(enmType != UIToolType_Invalid);
+    /* Make sure new tool type is of Machine class: */
+    AssertReturnVoid(UIToolStuff::isTypeOfClass(enmType, UIToolClass_Machine));
+
+    AssertPtrReturnVoid(m_pMenuTools);
     m_pMenuTools->setToolsType(enmType);
 }
@@ -231 +238 @@
 UIToolType UIMachineManagerWidget::toolType() const
 {
-    return m_pPaneTools ? m_pPaneTools->currentTool() : UIToolType_Invalid;
+    AssertPtrReturn(m_pPaneTools, UIToolType_Invalid);
+    return m_pPaneTools->currentTool();
 }
 
 bool UIMachineManagerWidget::isToolOpened(UIToolType enmType) const
 {
-    return m_pPaneTools ? m_pPaneTools->isToolOpened(enmType) : false;
+    /* Sanity check: */
+    AssertReturn(enmType != UIToolType_Invalid, false);
+    /* Make sure new tool type is of Machine class: */
+    AssertReturn(UIToolStuff::isTypeOfClass(enmType, UIToolClass_Machine), false);
+
+    AssertPtrReturn(m_pPaneTools, false);
+    return m_pPaneTools->isToolOpened(enmType);
 }
 
 void UIMachineManagerWidget::switchToolTo(UIToolType enmType)
 {
+    /* Sanity check: */
+    AssertReturnVoid(enmType != UIToolType_Invalid);
+    /* Make sure new tool type is of Machine class: */
+    AssertReturnVoid(UIToolStuff::isTypeOfClass(enmType, UIToolClass_Machine));
+
     /* Open corresponding tool: */
+    AssertPtrReturnVoid(m_pPaneTools);
     m_pPaneTools->openTool(enmType);
 
@@ -250 +270 @@
 void UIMachineManagerWidget::closeTool(UIToolType enmType)
 {
+    /* Sanity check: */
+    AssertReturnVoid(enmType != UIToolType_Invalid);
+    /* Make sure new tool type is of Machine class: */
+    AssertReturnVoid(UIToolStuff::isTypeOfClass(enmType, UIToolClass_Machine));
+
+    AssertPtrReturnVoid(m_pPaneTools);
     m_pPaneTools->closeTool(enmType);
 }
@@ -255 +281 @@
 bool UIMachineManagerWidget::isCurrentStateItemSelected() const
 {
+    AssertPtrReturn(m_pPaneTools, false);
     return m_pPaneTools->isCurrentStateItemSelected();
 }
@@ -260 +287 @@
 QUuid UIMachineManagerWidget::currentSnapshotId()
 {
+    AssertPtrReturn(m_pPaneTools, QUuid());
     return m_pPaneTools->currentSnapshotId();
 }
@@ -265 +293 @@
 QString UIMachineManagerWidget::currentHelpKeyword() const
 {
-    QString strHelpKeyword;
-    if (isMachineItemSelected())
-        strHelpKeyword = m_pPaneTools->currentHelpKeyword();
-    return strHelpKeyword;
+    AssertPtrReturn(m_pPaneTools, QString());
+    return m_pPaneTools->currentHelpKeyword();
 }
 
@@ -436 +462 @@
 }
 
+void UIMachineManagerWidget::sltHandleToolsMenuIndexChange(UIToolType enmType)
+{
+    switchToolTo(enmType);
+}
+
 void UIMachineManagerWidget::sltSwitchToVMActivityPane(const QUuid &uMachineId)
 {
@@ -590 +621 @@
     }
 
-    /* Open tools last chosen in Tools-menu: */
+    /* Open tool last chosen in Tools-menu: */
     switchToolTo(m_pMenuTools->toolsType());
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIMachineManagerWidget.h

@@ -255 +255 @@
         /** Handles signal about Tools-menu index change.
           * @param  enmType  Brings current tool type. */
-        void sltHandleToolsMenuIndexChange(UIToolType enmType) { switchToolTo(enmType); }
+        void sltHandleToolsMenuIndexChange(UIToolType enmType);
 
         /** Switches to VM Activity pane of machine with @a uMachineId. */