Changeset 86572 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: A bit of refactoring for Chooser pane machine 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) (5 diffs)
• UIChooserModel.h (modified) (1 diff)

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

@@ -613 +613 @@
 }
 
-void UIChooserAbstractModel::sltLocalMachineRegistered(const QUuid &uMachineId, const bool fRegistered)
+void UIChooserAbstractModel::sltLocalMachineRegistrationChanged(const QUuid &uMachineId, const bool fRegistered)
 {
     /* Existing VM unregistered? */
@@ -636 +636 @@
 }
 
-void UIChooserAbstractModel::sltCloudMachineRegistered(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: */
@@ -800 +800 @@
      * this is to be replaced by corresponding Main API event later. */
     connect(&uiCommon(), &UICommon::sigCloudMachineRegistered,
-            this, &UIChooserAbstractModel::sltCloudMachineRegistered);
+            this, &UIChooserAbstractModel::sltCloudMachineRegistrationChanged);
 
     /* Setup global connections: */
@@ -808 +808 @@
             this, &UIChooserAbstractModel::sltLocalMachineDataChanged);
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineRegistered,
-            this, &UIChooserAbstractModel::sltLocalMachineRegistered);
+            this, &UIChooserAbstractModel::sltLocalMachineRegistrationChanged);
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSessionStateChange,
             this, &UIChooserAbstractModel::sltSessionStateChanged);

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

@@ -144 +144 @@
         virtual void sltLocalMachineDataChanged(const QUuid &uMachineId);
         /** Handles local machine registering/unregistering for machine with certain @a uMachineId. */
-        virtual void sltLocalMachineRegistered(const QUuid &uMachineId, const bool fRegistered);
+        virtual void sltLocalMachineRegistrationChanged(const QUuid &uMachineId, const bool fRegistered);
         /** Handles cloud machine registering/unregistering for machine with certain @a uMachineId.
           * @param  strProviderShortName  Brings provider short name.
           * @param  strProfileName        Brings profile name. */
-        virtual void sltCloudMachineRegistered(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 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

@@ -1079 +1079 @@
 }
 
-void UIChooserModel::sltLocalMachineRegistered(const QUuid &uMachineId, const bool fRegistered)
+void UIChooserModel::sltLocalMachineRegistrationChanged(const QUuid &uMachineId, const bool fRegistered)
 {
     /* Existing VM unregistered => make sure no item with passed uMachineId is selected: */
@@ -1086 +1086 @@
 
     /* Call to base-class: */
-    UIChooserAbstractModel::sltLocalMachineRegistered(uMachineId, fRegistered);
+    UIChooserAbstractModel::sltLocalMachineRegistrationChanged(uMachineId, fRegistered);
 
     /* Existing VM unregistered? */
@@ -1110 +1110 @@
 }
 
-void UIChooserModel::sltCloudMachineRegistered(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: */
@@ -1118 +1118 @@
 
     /* Call to base-class: */
-    UIChooserAbstractModel::sltCloudMachineRegistered(strProviderShortName, strProfileName, uMachineId, fRegistered);
+    UIChooserAbstractModel::sltCloudMachineRegistrationChanged(strProviderShortName, strProfileName, uMachineId, fRegistered);
 
     /* Existing VM unregistered? */
@@ -1782 +1782 @@
         const QString strProviderShortName = pItem->parentItem()->parentItem()->name();
         const QString strProfileName = pItem->parentItem()->name();
-        sltCloudMachineRegistered(strProviderShortName,
-                                  strProfileName,
-                                  uId /* machine ID */,
-                                  false /* registered? */);
+        sltCloudMachineRegistrationChanged(strProviderShortName,
+                                           strProfileName,
+                                           uId /* machine ID */,
+                                           false /* registered? */);
     }
 }

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

@@ -262 +262 @@
       * @{ */
         /** Handles local machine registering/unregistering for machine with certain @a uMachineId. */
-        virtual void sltLocalMachineRegistered(const QUuid &uMachineId, const bool fRegistered) /* override */;
+        virtual void sltLocalMachineRegistrationChanged(const QUuid &uMachineId, const bool fRegistered) /* 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 sltCloudMachineRegistered(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) /* override */;
         /** Handles event about cloud provider with @a uProviderId being uninstalled. */
-        virtual void sltHandleCloudProviderUninstall(const QUuid &uProviderId);
+        virtual void sltHandleCloudProviderUninstall(const QUuid &uProviderId) /* override */;
     /** @} */