Changeset 86606 in vbox

Timestamp:

Oct 16, 2020 1:55:09 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Small code refactoring for Chooser pane, registration stuff.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (5 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

@@ -691 +691 @@
 }
 
-void UIChooserAbstractModel::sltCloudMachineRegistered(const QString &strProviderShortName, const QString &strProfileName,
-                                                       const CCloudMachine &comMachine, bool fSelect)
+void UIChooserAbstractModel::sltCloudMachineRegistered(const QString &strProviderShortName,
+                                                       const QString &strProfileName,
+                                                       const CCloudMachine &comMachine,
+                                                       bool fSelect)
 {
     /* Search for profile node: */
@@ -698 +700 @@
     QList<UIChooserNode*> profileNodes;
     invisibleRoot()->searchForNodes(strProfileNodeName, UIChooserItemSearchFlag_CloudProfile | UIChooserItemSearchFlag_ExactId, profileNodes);
-    AssertReturnVoid(!profileNodes.isEmpty());
-    UIChooserNode *pProfileNode = profileNodes.first();
-    AssertPtrReturnVoid(pProfileNode);
+    UIChooserNode *pProfileNode = profileNodes.value(0);
+    if (!pProfileNode)
+        return;
 
     /* Add new machine-item: */
@@ -712 +714 @@
 }
 
-void UIChooserAbstractModel::sltCloudMachineRegistrationChanged(const QString &strProviderShortName, const QString &strProfileName,
-                                                                const QUuid &uMachineId, const bool fRegistered)
+void UIChooserAbstractModel::sltCloudMachineRegistrationChanged(const QString &strProviderShortName,
+                                                                const QString &strProfileName,
+                                                                const QUuid &uMachineId,
+                                                                const bool fRegistered)
 {
     /* Search for profile node: */
@@ -719 +723 @@
     QList<UIChooserNode*> profileNodes;
     invisibleRoot()->searchForNodes(strProfileNodeName, UIChooserItemSearchFlag_CloudProfile | UIChooserItemSearchFlag_ExactId, profileNodes);
-    AssertReturnVoid(!profileNodes.isEmpty());
-    UIChooserNode *pProfileNode = profileNodes.first();
-    AssertPtrReturnVoid(pProfileNode);
+    UIChooserNode *pProfileNode = profileNodes.value(0);
+    if (!pProfileNode)
+        return;
 
     /* Existing VM unregistered? */
@@ -759 +763 @@
     if (pTask->type() != UITask::Type_CloudListMachines)
         return;
-
-    /* Cast task to corresponding sub-class: */
     UITaskCloudListMachines *pAcquiringTask = qobject_cast<UITaskCloudListMachines*>(pTask);
     AssertPtrReturnVoid(pAcquiringTask);

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

@@ -168 +168 @@
           * @param  strProfileName        Brings profile name.
           * @param  fSelect               Brings whether registered machine should be selected. */
-        virtual void sltCloudMachineRegistered(const QString &strProviderShortName, const QString &strProfileName,
-                                               const CCloudMachine &comMachine, bool fSelect);
+        virtual void sltCloudMachineRegistered(const QString &strProviderShortName,
+                                               const QString &strProfileName,
+                                               const CCloudMachine &comMachine,
+                                               bool fSelect);
         /** Handles cloud machine registering/unregistering for machine with certain @a uMachineId.
           * @param  strProviderShortName  Brings provider short name.
           * @param  strProfileName        Brings profile name. */
-        virtual void sltCloudMachineRegistrationChanged(const QString &strProviderShortName, const QString &strProfileName,
-                                                        const QUuid &uMachineId, const bool fRegistered);
+        virtual void sltCloudMachineRegistrationChanged(const QString &strProviderShortName,
+                                                        const QString &strProfileName,
+                                                        const QUuid &uMachineId,
+                                                        const bool fRegistered);
 
         /** Handles list cloud machines task complete signal. */

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

@@ -1154 +1154 @@
 }
 
-void UIChooserModel::sltCloudMachineRegistered(const QString &strProviderShortName, const QString &strProfileName,
-                                               const CCloudMachine &comMachine, bool fSelect)
+void UIChooserModel::sltCloudMachineRegistered(const QString &strProviderShortName,
+                                               const QString &strProfileName,
+                                               const CCloudMachine &comMachine,
+                                               bool fSelect)
 {
     /* Call to base-class: */
@@ -1174 +1176 @@
 }
 
-void UIChooserModel::sltCloudMachineRegistrationChanged(const QString &strProviderShortName, const QString &strProfileName,
-                                                        const QUuid &uMachineId, const bool fRegistered)
+void UIChooserModel::sltCloudMachineRegistrationChanged(const QString &strProviderShortName,
+                                                        const QString &strProfileName,
+                                                        const QUuid &uMachineId,
+                                                        const bool fRegistered)
 {
     /* Existing VM unregistered => make sure no item with passed uMachineId is selected: */

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

@@ -280 +280 @@
           * @param  strProfileName        Brings profile name.
           * @param  fSelect               Brings whether registered machine should be selected. */
-        virtual void sltCloudMachineRegistered(const QString &strProviderShortName, const QString &strProfileName,
-                                               const CCloudMachine &comMachine, bool fSelect);
+        virtual void sltCloudMachineRegistered(const QString &strProviderShortName,
+                                               const QString &strProfileName,
+                                               const CCloudMachine &comMachine,
+                                               bool fSelect) /* override */;
         /** Handles cloud machine registering/unregistering for machine with certain @a uMachineId.
           * @param  strProviderShortName  Brings provider short name.
           * @param  strProfileName        Brings profile name. */
-        virtual void sltCloudMachineRegistrationChanged(const QString &strProviderShortName, const QString &strProfileName,
-                                                        const QUuid &uMachineId, const bool fRegistered) /* override */;
+        virtual void sltCloudMachineRegistrationChanged(const QString &strProviderShortName,
+                                                        const QString &strProfileName,
+                                                        const QUuid &uMachineId,
+                                                        const bool fRegistered) /* override */;
 
         /** Handles list cloud machines task complete signal. */