Changeset 86569 in vbox for trunk/src/VBox

Timestamp:

Oct 14, 2020 11:09:31 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Small cleanup for Chooser pane VM registration stuff.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (4 diffs)
• UIChooserAbstractModel.h (modified) (1 diff)
• UIChooserModel.cpp (modified) (2 diffs)
• UIChooserModel.h (modified) (1 diff)

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

@@ -637 +637 @@
 
 void UIChooserAbstractModel::sltCloudMachineRegistered(const QString &strProviderShortName, const QString &strProfileName,
-                                                       const QUuid &uMachineId, const bool fRegistered)
+                                                       const QUuid &uId, const bool fRegistered)
 {
     /* Search for profile node: */
@@ -651 +651 @@
     {
         /* Remove machine-items with passed id: */
-        pProfileNode->removeAllNodes(uMachineId);
+        pProfileNode->removeAllNodes(uId);
 
         /* If there are no items left: */
@@ -666 +666 @@
     {
         /* Add new machine-item: */
-        const CCloudMachine comMachine = cloudMachineById(strProviderShortName, strProfileName, uMachineId);
+        const CCloudMachine comMachine = cloudMachineById(strProviderShortName, strProfileName, uId);
         addCloudMachineIntoTheTree(strProfileNodeName, comMachine, true /* make it visible */);
 
@@ -735 +735 @@
 {
     /* Skip unrelated tasks: */
-    if (!pTask || pTask->type() != UITask::Type_CloudListMachines)
+    AssertPtrReturnVoid(pTask);
+    if (pTask->type() != UITask::Type_CloudListMachines)
         return;
 
     /* Cast task to corresponding sub-class: */
-    UITaskCloudListMachines *pAcquiringTask = static_cast<UITaskCloudListMachines*>(pTask);
+    UITaskCloudListMachines *pAcquiringTask = qobject_cast<UITaskCloudListMachines*>(pTask);
+    AssertPtrReturnVoid(pAcquiringTask);
 
     /* Search for profile node: */

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

@@ -149 +149 @@
           * @param  strProfileName        Brings profile name. */
         virtual void sltCloudMachineRegistered(const QString &strProviderShortName, const QString &strProfileName,
-                                               const QUuid &uMachineId, const bool fRegistered);
+                                               const QUuid &uId, const bool fRegistered);
         /** Handles session @a enmState change for machine with certain @a uMachineId. */
         virtual void sltSessionStateChanged(const QUuid &uMachineId, const KSessionState enmState);

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

@@ -1110 +1110 @@
 }
 
-void UIChooserModel::sltCloudMachineRegistered(const QString &strProviderName, const QString &strProfileName,
+void UIChooserModel::sltCloudMachineRegistered(const QString &strProviderShortName, const QString &strProfileName,
                                                const QUuid &uId, const bool fRegistered)
 {
@@ -1118 +1118 @@
 
     /* Call to base-class: */
-    UIChooserAbstractModel::sltCloudMachineRegistered(strProviderName, strProfileName, uId, fRegistered);
+    UIChooserAbstractModel::sltCloudMachineRegistered(strProviderShortName, strProfileName, uId, fRegistered);
 
     /* Existing VM unregistered? */

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

@@ -264 +264 @@
         virtual void sltLocalMachineRegistered(const QUuid &uId, const bool fRegistered) /* override */;
         /** Handles cloud machine registering/unregistering for machine with certain @a uId.
-          * @param  strProviderName  Brings provider short name.
-          * @param  strProfileName   Brings profile name. */
-        virtual void sltCloudMachineRegistered(const QString &strProviderName, const QString &strProfileName,
+          * @param  strProviderShortName  Brings provider short name.
+          * @param  strProfileName        Brings profile name. */
+        virtual void sltCloudMachineRegistered(const QString &strProviderShortName, const QString &strProfileName,
                                                const QUuid &uId, const bool fRegistered);
         /** Handles event about cloud provider with @a uId being uninstalled. */