Changeset 80784 in vbox

Timestamp:

Sep 13, 2019 5:21:05 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8938. Converting connection syntaxes under manager subfolder. not complete.

Location:

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

Files:

• chooser/UIChooserModel.cpp (modified) (2 diffs)
• details/UIDetailsElements.cpp (modified) (1 diff)
• details/UIDetailsGroup.cpp (modified) (1 diff)
• details/UIDetailsGroup.h (modified) (1 diff)
• details/UIDetailsItem.cpp (modified) (1 diff)
• details/UIDetailsSet.cpp (modified) (1 diff)
• tools/UIToolsModel.cpp (modified) (2 diffs)

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

@@ -406 +406 @@
     /* Disconnect old current-item (if any): */
     if (pOldCurrentItem)
-        disconnect(pOldCurrentItem, SIGNAL(destroyed(QObject*)), this, SLOT(sltCurrentItemDestroyed()));
+        disconnect(pOldCurrentItem, &UIChooserItem::destroyed, this, &UIChooserModel::sltCurrentItemDestroyed);
     /* Connect new current-item (if any): */
     if (m_pCurrentItem)
-        connect(m_pCurrentItem, SIGNAL(destroyed(QObject*)), this, SLOT(sltCurrentItemDestroyed()));
+        connect(m_pCurrentItem, &UIChooserItem::destroyed, this, &UIChooserModel::sltCurrentItemDestroyed);
 
     /* If dialog is visible and item exists => make it visible as well: */
@@ -1242 +1242 @@
 {
     /* Setup parent connections: */
-    connect(this, SIGNAL(sigSelectionChanged()),
-            parent(), SIGNAL(sigSelectionChanged()));
-    connect(this, SIGNAL(sigSelectionInvalidated()),
-            parent(), SIGNAL(sigSelectionInvalidated()));
-    connect(this, SIGNAL(sigToggleStarted()),
-            parent(), SIGNAL(sigToggleStarted()));
-    connect(this, SIGNAL(sigToggleFinished()),
-            parent(), SIGNAL(sigToggleFinished()));
+    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);
 
     /* Setup action connections: */
-    connect(actionPool()->action(UIActionIndexST_M_Welcome_S_New), SIGNAL(triggered()),
-            this, SLOT(sltCreateNewMachine()));
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_New), SIGNAL(triggered()),
-            this, SLOT(sltCreateNewMachine()));
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_New), SIGNAL(triggered()),
-            this, SLOT(sltCreateNewMachine()));
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_Rename), SIGNAL(triggered()),
-            this, SLOT(sltEditGroupName()));
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_Remove), SIGNAL(triggered()),
-            this, SLOT(sltUngroupSelectedGroup()));
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Remove), SIGNAL(triggered()),
-            this, SLOT(sltRemoveSelectedMachine()));
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_AddGroup), SIGNAL(triggered()),
-            this, SLOT(sltGroupSelectedMachines()));
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_Refresh), SIGNAL(triggered()),
-            this, SLOT(sltPerformRefreshAction()));
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Refresh), SIGNAL(triggered()),
-            this, SLOT(sltPerformRefreshAction()));
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_SortParent), SIGNAL(triggered()),
-            this, SLOT(sltSortParentGroup()));
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_Sort), SIGNAL(triggered()),
-            this, SLOT(sltSortGroup()));
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Search), SIGNAL(triggered()),
-            this, SLOT(sltShowHideSearchWidget()));
+    connect(actionPool()->action(UIActionIndexST_M_Welcome_S_New), &UIAction::triggered,
+            this, &UIChooserModel::sltCreateNewMachine);
+    connect(actionPool()->action(UIActionIndexST_M_Group_S_New), &UIAction::triggered,
+            this, &UIChooserModel::sltCreateNewMachine);
+    connect(actionPool()->action(UIActionIndexST_M_Machine_S_New), &UIAction::triggered,
+            this, &UIChooserModel::sltCreateNewMachine);
+    connect(actionPool()->action(UIActionIndexST_M_Group_S_Rename), &UIAction::triggered,
+            this, &UIChooserModel::sltEditGroupName);
+    connect(actionPool()->action(UIActionIndexST_M_Group_S_Remove), &UIAction::triggered,
+            this, &UIChooserModel::sltUngroupSelectedGroup);
+    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Remove), &UIAction::triggered,
+            this, &UIChooserModel::sltRemoveSelectedMachine);
+    connect(actionPool()->action(UIActionIndexST_M_Machine_S_AddGroup), &UIAction::triggered,
+            this, &UIChooserModel::sltGroupSelectedMachines);
+    connect(actionPool()->action(UIActionIndexST_M_Group_S_Refresh), &UIAction::triggered,
+            this, &UIChooserModel::sltPerformRefreshAction);
+    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Refresh), &UIAction::triggered,
+            this, &UIChooserModel::sltPerformRefreshAction);
+    connect(actionPool()->action(UIActionIndexST_M_Machine_S_SortParent), &UIAction::triggered,
+            this, &UIChooserModel::sltSortParentGroup);
+    connect(actionPool()->action(UIActionIndexST_M_Group_S_Sort), &UIAction::triggered,
+            this, &UIChooserModel::sltSortGroup);
+    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Search), &UIAction::triggered,
+            this, &UIChooserModel::sltShowHideSearchWidget);
 }
 

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

@@ -63 +63 @@
 {
     /* Listen for the global thread-pool: */
-    connect(uiCommon().threadPool(), SIGNAL(sigTaskComplete(UITask*)),
-            this, SLOT(sltUpdateAppearanceFinished(UITask*)));
+    connect(uiCommon().threadPool(), &UIThreadPool::sigTaskComplete,
+            this, &UIDetailsElementInterface::sltUpdateAppearanceFinished);
 
     /* Translate finally: */

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

@@ -262 +262 @@
 {
     /* Prepare group-item connections: */
-    connect(this, SIGNAL(sigMinimumWidthHintChanged(int)),
-            model(), SIGNAL(sigRootItemMinimumWidthHintChanged(int)));
+    connect(this, &UIDetailsGroup::sigMinimumWidthHintChanged,
+            model(), &UIDetailsModel::sigRootItemMinimumWidthHintChanged);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.h

@@ -84 +84 @@
     /** @} */
 
-protected slots:
+public slots:
 
     /** @name Item stuff.

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

@@ -281 +281 @@
 {
     /* Prepare connections (old style, polymorph): */
-    connect(pBuildObject, SIGNAL(sigBuildDone()),
-            this, SLOT(sltStepDone()),
+    connect(qobject_cast<UIDetailsItem*>(pBuildObject), &UIDetailsItem::sigBuildDone,
+            this, &UIPrepareStep::sltStepDone,
             Qt::QueuedConnection);
-    connect(this, SIGNAL(sigStepDone(QUuid, int)),
-            pParent, SLOT(sltBuildStep(QUuid, int)),
+    connect(this, &UIPrepareStep::sigStepDone,
+            qobject_cast<UIDetailsGroup*>(pParent), &UIDetailsGroup::sltBuildStep,
             Qt::QueuedConnection);
 }

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

@@ -570 +570 @@
 {
     /* Global-events connections: */
-    connect(gVBoxEvents, SIGNAL(sigMachineStateChange(QUuid, KMachineState)), this, SLOT(sltMachineStateChange(QUuid)));
-    connect(gVBoxEvents, SIGNAL(sigMachineDataChange(QUuid)), this, SLOT(sltMachineAttributesChange(QUuid)));
-    connect(gVBoxEvents, SIGNAL(sigSessionStateChange(QUuid, KSessionState)), this, SLOT(sltMachineAttributesChange(QUuid)));
-    connect(gVBoxEvents, SIGNAL(sigSnapshotTake(QUuid, QUuid)), this, SLOT(sltMachineAttributesChange(QUuid)));
-    connect(gVBoxEvents, SIGNAL(sigSnapshotDelete(QUuid, QUuid)), this, SLOT(sltMachineAttributesChange(QUuid)));
-    connect(gVBoxEvents, SIGNAL(sigSnapshotChange(QUuid, QUuid)), this, SLOT(sltMachineAttributesChange(QUuid)));
-    connect(gVBoxEvents, SIGNAL(sigSnapshotRestore(QUuid, QUuid)), this, SLOT(sltMachineAttributesChange(QUuid)));
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineStateChange, this, &UIDetailsSet::sltMachineStateChange);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineDataChange, this, &UIDetailsSet::sltMachineAttributesChange);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSessionStateChange, this, &UIDetailsSet::sltMachineAttributesChange);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotTake, this, &UIDetailsSet::sltMachineAttributesChange);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotDelete, this, &UIDetailsSet::sltMachineAttributesChange);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotChange, this, &UIDetailsSet::sltMachineAttributesChange);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotRestore, this, &UIDetailsSet::sltMachineAttributesChange);
 
     /* Meidum-enumeration connections: */
-    connect(&uiCommon(), SIGNAL(sigMediumEnumerationStarted()), this, SLOT(sltUpdateAppearance()));
-    connect(&uiCommon(), SIGNAL(sigMediumEnumerationFinished()), this, SLOT(sltUpdateAppearance()));
+    connect(&uiCommon(), &UICommon::sigMediumEnumerationStarted, this, &UIDetailsSet::sltUpdateAppearance);
+    connect(&uiCommon(), &UICommon::sigMediumEnumerationFinished, this, &UIDetailsSet::sltUpdateAppearance);
 }
 

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

@@ -256 +256 @@
     /* Disconnect old focus-item (if any): */
     if (pOldFocusItem)
-        disconnect(pOldFocusItem, SIGNAL(destroyed(QObject*)), this, SLOT(sltFocusItemDestroyed()));
+        disconnect(pOldFocusItem, &UIToolsItem::destroyed, this, &UIToolsModel::sltFocusItemDestroyed);
     /* Connect new focus-item (if any): */
     if (m_pFocusItem)
-        connect(m_pFocusItem, SIGNAL(destroyed(QObject*)), this, SLOT(sltFocusItemDestroyed()));
+        connect(m_pFocusItem.data(), &UIToolsItem::destroyed, this, &UIToolsModel::sltFocusItemDestroyed);
 
     /* Notify about focus change: */
@@ -496 +496 @@
 {
     /* Setup parent connections: */
-    connect(this, SIGNAL(sigSelectionChanged()),
-            parent(), SIGNAL(sigSelectionChanged()));
-    connect(this, SIGNAL(sigExpandingStarted()),
-            parent(), SIGNAL(sigExpandingStarted()));
-    connect(this, SIGNAL(sigExpandingFinished()),
-            parent(), SIGNAL(sigExpandingFinished()));
+    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);
 }