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

Timestamp:

Sep 18, 2019 11:13:38 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8938. Refactoring connections that include casted parameters.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• logviewer/UIVMLogPage.cpp (modified) (1 diff)
• manager/chooser/UIChooserAbstractModel.cpp (modified) (2 diffs)
• manager/chooser/UIChooserModel.cpp (modified) (1 diff)
• manager/details/UIDetailsItem.cpp (modified) (1 diff)
• manager/tools/UIToolsModel.cpp (modified) (1 diff)
• runtime/normal/UIMachineLogicNormal.cpp (modified) (1 diff)
• settings/global/UIGlobalSettingsInput.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogPage.cpp

@@ -80 +80 @@
     m_pMainLayout->addWidget(m_pTextEdit);
 
-    connect(qobject_cast<UIVMLogViewerTextEdit*>(m_pTextEdit), &UIVMLogViewerTextEdit::sigAddBookmark,
+    connect(m_pTextEdit, &UIVMLogViewerTextEdit::sigAddBookmark,
             this, &UIVMLogPage::sltAddBookmark);
-    connect(qobject_cast<UIVMLogViewerTextEdit*>(m_pTextEdit), &UIVMLogViewerTextEdit::sigDeleteBookmark,
+    connect(m_pTextEdit, &UIVMLogViewerTextEdit::sigDeleteBookmark,
             this, &UIVMLogPage::sltDeleteBookmark);
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp

@@ -712 +712 @@
     m_oldLists = oldLists;
     m_newLists = newLists;
-    connect(this, &UIThreadGroupDefinitionSave::sigComplete,
-            qobject_cast<UIChooserAbstractModel*>(pParent), &UIChooserAbstractModel::sltGroupDefinitionsSaveComplete);
+    UIChooserAbstractModel* pChooserAbstractModel = qobject_cast<UIChooserAbstractModel*>(pParent);
+    AssertPtrReturnVoid(pChooserAbstractModel);
+    {
+        connect(this, &UIThreadGroupDefinitionSave::sigComplete,
+                pChooserAbstractModel, &UIChooserAbstractModel::sltGroupDefinitionsSaveComplete);
+    }
 }
 
@@ -838 +842 @@
 {
     m_groups = groups;
-    connect(this, &UIThreadGroupOrderSave::sigComplete,
-            qobject_cast<UIChooserAbstractModel*>(pParent), &UIChooserAbstractModel::sltGroupOrdersSaveComplete);
+    UIChooserAbstractModel *pChooserAbstractModel = qobject_cast<UIChooserAbstractModel*>(pParent);
+    AssertPtrReturnVoid(pChooserAbstractModel);
+    {
+        connect(this, &UIThreadGroupOrderSave::sigComplete,
+                pChooserAbstractModel, &UIChooserAbstractModel::sltGroupOrdersSaveComplete);
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -1241 +1241 @@
 void UIChooserModel::prepareConnections()
 {
-    /* Setup parent connections: */
-    connect(this, &UIChooserModel::sigSelectionChanged,
-            qobject_cast<UIChooser*>(parent()), &UIChooser::sigSelectionChanged);
-    connect(this, &UIChooserModel::sigSelectionInvalidated,
-            qobject_cast<UIChooser*>(parent()), &UIChooser::sigSelectionInvalidated);
-    connect(this, &UIChooserModel::sigToggleStarted,
-            qobject_cast<UIChooser*>(parent()), &UIChooser::sigToggleStarted);
-    connect(this, &UIChooserModel::sigToggleFinished,
-            qobject_cast<UIChooser*>(parent()), &UIChooser::sigToggleFinished);
+    UIChooser* pChooser = qobject_cast<UIChooser*>(parent());
+    AssertPtrReturnVoid(pChooser);
+    {
+        /* Setup parent connections: */
+        connect(this, &UIChooserModel::sigSelectionChanged,
+                pChooser, &UIChooser::sigSelectionChanged);
+        connect(this, &UIChooserModel::sigSelectionInvalidated,
+                pChooser, &UIChooser::sigSelectionInvalidated);
+        connect(this, &UIChooserModel::sigToggleStarted,
+                pChooser, &UIChooser::sigToggleStarted);
+        connect(this, &UIChooserModel::sigToggleFinished,
+                pChooser, &UIChooser::sigToggleFinished);
+    }
 
     /* Setup action connections: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsItem.cpp

@@ -284 +284 @@
             this, &UIPrepareStep::sltStepDone,
             Qt::QueuedConnection);
-    connect(this, &UIPrepareStep::sigStepDone,
-            qobject_cast<UIDetailsItem*>(pParent), &UIDetailsItem::sltBuildStep,
-            Qt::QueuedConnection);
+
+    UIDetailsItem *pDetailsItem = qobject_cast<UIDetailsItem*>(pParent);
+    AssertPtrReturnVoid(pDetailsItem);
+    {
+        connect(this, &UIPrepareStep::sigStepDone,
+                pDetailsItem, &UIDetailsItem::sltBuildStep,
+                Qt::QueuedConnection);
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

@@ -495 +495 @@
 void UIToolsModel::prepareConnections()
 {
-    /* Setup parent connections: */
-    connect(this, &UIToolsModel::sigSelectionChanged,
-            qobject_cast<UITools*>(parent()), &UITools::sigSelectionChanged);
-    connect(this, &UIToolsModel::sigExpandingStarted,
-            qobject_cast<UITools*>(parent()), &UITools::sigExpandingStarted);
-    connect(this, &UIToolsModel::sigExpandingFinished,
-            qobject_cast<UITools*>(parent()), &UITools::sigExpandingFinished);
+    UITools* pTools = qobject_cast<UITools*>(parent());
+    AssertPtrReturnVoid(pTools);
+    {
+        /* Setup parent connections: */
+        connect(this, &UIToolsModel::sigSelectionChanged,
+                pTools, &UITools::sigSelectionChanged);
+        connect(this, &UIToolsModel::sigExpandingStarted,
+                pTools, &UITools::sigExpandingStarted);
+        connect(this, &UIToolsModel::sigExpandingFinished,
+                pTools, &UITools::sigExpandingFinished);
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -296 +296 @@
     connect(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility), &UIAction::triggered,
             this, &UIMachineLogicNormal::sltToggleStatusBar);
-    connect(qobject_cast<UIActionPoolRuntime*>(actionPool()), &UIActionPoolRuntime::sigNotifyAboutTriggeringViewScreenToggle,
-            this, &UIMachineLogicNormal::sltHandleActionTriggerViewScreenToggle);
-    connect(qobject_cast<UIActionPoolRuntime*>(actionPool()), &UIActionPoolRuntime::sigNotifyAboutTriggeringViewScreenResize,
-            this, &UIMachineLogicNormal::sltHandleActionTriggerViewScreenResize);
+    UIActionPoolRuntime* pActionPoolRuntime = qobject_cast<UIActionPoolRuntime*>(actionPool());
+    AssertPtrReturnVoid(pActionPoolRuntime);
+    {
+        connect(pActionPoolRuntime, &UIActionPoolRuntime::sigNotifyAboutTriggeringViewScreenToggle,
+                this, &UIMachineLogicNormal::sltHandleActionTriggerViewScreenToggle);
+        connect(pActionPoolRuntime, &UIActionPoolRuntime::sigNotifyAboutTriggeringViewScreenResize,
+                this, &UIMachineLogicNormal::sltHandleActionTriggerViewScreenResize);
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp

@@ -842 +842 @@
 
     /* Connect model: */
-    connect(qobject_cast<UIHotKeyTableModel*>(model()), &UIHotKeyTableModel::sigShortcutsLoaded,
-            this, &UIHotKeyTable::sltHandleShortcutsLoaded);
+    UIHotKeyTableModel *pHotKeyTableModel = qobject_cast<UIHotKeyTableModel*>(model());
+    AssertPtrReturnVoid(pHotKeyTableModel);
+    {
+        connect(pHotKeyTableModel, &UIHotKeyTableModel::sigShortcutsLoaded,
+                this, &UIHotKeyTable::sltHandleShortcutsLoaded);
+    }
 
     /* Check if we do have proper item delegate: */