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

Timestamp:

Sep 12, 2019 12:21:45 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8938. Converting connection syntaxes under manager and global subfolders.not complete.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolRuntime.cpp (modified) (3 diffs)
• manager/chooser/UIChooserAbstractModel.cpp (modified) (3 diffs)
• manager/chooser/UIChooserAbstractModel.h (modified) (2 diffs)

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

@@ -3469 +3469 @@
 {
     /* Prepare connections: */
-    connect(gShortcutPool, SIGNAL(sigSelectorShortcutsReloaded()), this, SLOT(sltApplyShortcuts()));
-    connect(gShortcutPool, SIGNAL(sigMachineShortcutsReloaded()), this, SLOT(sltApplyShortcuts()));
-    connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange(const QUuid &)),
-            this, SLOT(sltHandleConfigurationChange(const QUuid &)));
+    connect(gShortcutPool, &UIShortcutPool::sigSelectorShortcutsReloaded,
+            this, &UIActionPoolRuntime::sltApplyShortcuts);
+    connect(gShortcutPool, &UIShortcutPool::sigMachineShortcutsReloaded,
+            this, &UIActionPoolRuntime::sltApplyShortcuts);
+    connect(gEDataManager, &UIExtraDataManager::sigMenuBarConfigurationChange,
+            this, &UIActionPoolRuntime::sltHandleConfigurationChange);
 
     /* Call to base-class: */
@@ -3772 +3774 @@
                                              QApplication::translate("UIMultiScreenLayout", "Virtual Screen %1").arg(iGuestScreenIndex + 1));
             pSubMenu->setProperty("Guest Screen Index", iGuestScreenIndex);
-            connect(pSubMenu, SIGNAL(aboutToShow()), this, SLOT(sltPrepareMenuViewScreen()));
+            connect(pSubMenu, &QMenu::aboutToShow, this, &UIActionPoolRuntime::sltPrepareMenuViewScreen);
         }
     }
@@ -3815 +3817 @@
                                              QApplication::translate("UIMultiScreenLayout", "Virtual Screen %1").arg(iGuestScreenIndex + 1));
             pSubMenu->setProperty("Guest Screen Index", iGuestScreenIndex);
-            connect(pSubMenu, SIGNAL(aboutToShow()), this, SLOT(sltPrepareMenuViewScreen()));
+            connect(pSubMenu, &QMenu::aboutToShow, this, &UIActionPoolRuntime::sltPrepareMenuViewScreen);
         }
     }

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

@@ -590 +590 @@
     UIThreadGroupDefinitionSave::prepare();
     emit sigGroupSavingStateChanged();
-    connect(UIThreadGroupDefinitionSave::instance(), SIGNAL(sigReload(QUuid)),
-            this, SLOT(sltReloadMachine(QUuid)));
+    connect(UIThreadGroupDefinitionSave::instance(), &UIThreadGroupDefinitionSave::sigReload,
+            this, &UIChooserAbstractModel::sltReloadMachine);
     UIThreadGroupDefinitionSave::instance()->configure(this, m_groups, groups);
     UIThreadGroupDefinitionSave::instance()->start();
@@ -712 +712 @@
     m_oldLists = oldLists;
     m_newLists = newLists;
-    connect(this, SIGNAL(sigComplete()), pParent, SLOT(sltGroupDefinitionsSaveComplete()));
+    connect(this, &UIThreadGroupDefinitionSave::sigComplete,
+            qobject_cast<UIChooserAbstractModel*>(pParent), &UIChooserAbstractModel::sltGroupDefinitionsSaveComplete);
 }
 
@@ -837 +838 @@
 {
     m_groups = groups;
-    connect(this, SIGNAL(sigComplete()), pParent, SLOT(sltGroupOrdersSaveComplete()));
+    connect(this, &UIThreadGroupOrderSave::sigComplete,
+            qobject_cast<UIChooserAbstractModel*>(pParent), &UIChooserAbstractModel::sltGroupOrdersSaveComplete);
 }
 

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

@@ -99 +99 @@
     /** @} */
 
+public slots:
+
+   /** @name Group saving stuff.
+      * @{ */
+        /** Handles group definition saving complete. */
+        void sltGroupDefinitionsSaveComplete();
+        /** Handles group order saving complete. */
+        void sltGroupOrdersSaveComplete();
+    /** @} */
+
 protected slots:
 
@@ -127 +137 @@
         /** Handles request to start group saving. */
         void sltStartGroupSaving();
-        /** Handles group definition saving complete. */
-        void sltGroupDefinitionsSaveComplete();
-        /** Handles group order saving complete. */
-        void sltGroupOrdersSaveComplete();
     /** @} */