Changeset 77909 in vbox

Timestamp:

Mar 27, 2019 11:09:44 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Chooser pane: Forgot something in r129597.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (6 diffs)
• UIChooserAbstractModel.h (modified) (3 diffs)
• UIChooserModel.h (modified) (1 diff)

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

@@ -121 +121 @@
 }
 
-void UIChooserAbstractModel::sltMachineStateChanged(const QUuid &uId, const KMachineState)
+void UIChooserAbstractModel::sltMachineStateChanged(const QUuid &uMachineId, const KMachineState)
 {
     /* Update machine-nodes with passed id: */
-    invisibleRoot()->updateAllNodes(uId);
-}
-
-void UIChooserAbstractModel::sltMachineDataChanged(const QUuid &uId)
+    invisibleRoot()->updateAllNodes(uMachineId);
+}
+
+void UIChooserAbstractModel::sltMachineDataChanged(const QUuid &uMachineId)
 {
     /* Update machine-nodes with passed id: */
-    invisibleRoot()->updateAllNodes(uId);
-}
-
-void UIChooserAbstractModel::sltMachineRegistered(const QUuid &uId, const bool fRegistered)
+    invisibleRoot()->updateAllNodes(uMachineId);
+}
+
+void UIChooserAbstractModel::sltMachineRegistered(const QUuid &uMachineId, const bool fRegistered)
 {
     /* Existing VM unregistered? */
@@ -139 +139 @@
     {
         /* Remove machine-items with passed id: */
-        invisibleRoot()->removeAllNodes(uId);
+        invisibleRoot()->removeAllNodes(uMachineId);
         /* Wipe out empty groups: */
         wipeOutEmptyGroups();
@@ -147 +147 @@
     {
         /* Should we show this VM? */
-        if (gEDataManager->showMachineInVirtualBoxManagerChooser(uId))
+        if (gEDataManager->showMachineInVirtualBoxManagerChooser(uMachineId))
         {
             /* Add new machine-item: */
-            CMachine comMachine = vboxGlobal().virtualBox().FindMachine(uId.toString());
+            const CMachine comMachine = vboxGlobal().virtualBox().FindMachine(uMachineId.toString());
             addMachineIntoTheTree(comMachine, true /* make it visible */);
         }
@@ -156 +156 @@
 }
 
-void UIChooserAbstractModel::sltSessionStateChanged(const QUuid &uId, const KSessionState)
+void UIChooserAbstractModel::sltSessionStateChanged(const QUuid &uMachineId, const KSessionState)
 {
     /* Update machine-nodes with passed id: */
-    invisibleRoot()->updateAllNodes(uId);
-}
-
-void UIChooserAbstractModel::sltSnapshotChanged(const QUuid &uId, const QUuid &)
+    invisibleRoot()->updateAllNodes(uMachineId);
+}
+
+void UIChooserAbstractModel::sltSnapshotChanged(const QUuid &uMachineId, const QUuid &)
 {
     /* Update machine-nodes with passed id: */
-    invisibleRoot()->updateAllNodes(uId);
-}
-
-void UIChooserAbstractModel::sltReloadMachine(const QUuid &uId)
+    invisibleRoot()->updateAllNodes(uMachineId);
+}
+
+void UIChooserAbstractModel::sltReloadMachine(const QUuid &uMachineId)
 {
     /* Remove machine-items with passed id: */
-    invisibleRoot()->removeAllNodes(uId);
+    invisibleRoot()->removeAllNodes(uMachineId);
     /* Wipe out empty groups: */
     wipeOutEmptyGroups();
 
     /* Should we show this VM? */
-    if (gEDataManager->showMachineInVirtualBoxManagerChooser(uId))
+    if (gEDataManager->showMachineInVirtualBoxManagerChooser(uMachineId))
     {
         /* Add new machine-item: */
-        CMachine comMachine = vboxGlobal().virtualBox().FindMachine(uId.toString());
+        const CMachine comMachine = vboxGlobal().virtualBox().FindMachine(uMachineId.toString());
         addMachineIntoTheTree(comMachine, true /* make it visible */);
     }
@@ -429 +429 @@
     /* Which position should be new node placed by definitions: */
     int iNewNodeDefinitionPosition = getDefinedNodePosition(pParentNode, enmType, strName);
+
     /* If some position wanted: */
     if (iNewNodeDefinitionPosition != -1)
@@ -458 +459 @@
         }
     }
+
     /* Return desired node position: */
     return iNewNodeDesiredPosition;

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

@@ -63 +63 @@
       * @{ */
         /** Inits model. */
-        void init();
+        virtual void init();
         /** Deinits model. */
-        void deinit();
+        virtual void deinit();
     /** @} */
 
@@ -92 +92 @@
     /** @name Main event handling stuff.
       * @{ */
-        /** Handles machine @a enmState change for machine with certain @a uId. */
-        virtual void sltMachineStateChanged(const QUuid &uId, const KMachineState enmState);
-        /** Handles machine data change for machine with certain @a uId. */
-        virtual void sltMachineDataChanged(const QUuid &uId);
-        /** Handles machine registering/unregistering for machine with certain @a uId. */
-        virtual void sltMachineRegistered(const QUuid &uId, const bool fRegistered);
-        /** Handles session @a enmState change for machine with certain @a uId. */
-        virtual void sltSessionStateChanged(const QUuid &uId, const KSessionState enmState);
-        /** Handles snapshot change for machine/snapshot with certain @a uId / @a uSnapshotId. */
-        virtual void sltSnapshotChanged(const QUuid &uId, const QUuid &uSnapshotId);
-    /** @} */
-
-    /** @name Children stuff.
-      * @{ */
-        /** Handles reload machine with certain @a uId request. */
-        virtual void sltReloadMachine(const QUuid &uId);
+        /** Handles machine @a enmState change for machine with certain @a uMachineId. */
+        virtual void sltMachineStateChanged(const QUuid &uMachineId, const KMachineState enmState);
+        /** Handles machine data change for machine with certain @a uMachineId. */
+        virtual void sltMachineDataChanged(const QUuid &uMachineId);
+        /** Handles machine registering/unregistering for machine with certain @a uMachineId. */
+        virtual void sltMachineRegistered(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);
+        /** Handles snapshot change for machine/snapshot with certain @a uMachineId / @a uSnapshotId. */
+        virtual void sltSnapshotChanged(const QUuid &uMachineId, const QUuid &uSnapshotId);
+    /** @} */
+
+    /** @name Children stuff.
+      * @{ */
+        /** Handles reload machine with certain @a uMachineId request. */
+        virtual void sltReloadMachine(const QUuid &uMachineId);
     /** @} */
 
@@ -210 +210 @@
 signals:
 
-    /** Notifies about machine with certain @a uId to be reloaded. */
-    void sigReload(const QUuid &uId);
+    /** Notifies about machine with certain @a uMachineId to be reloaded. */
+    void sigReload(const QUuid &uMachineId);
 
     /** Notifies about task is complete. */

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

@@ -94 +94 @@
       * @{ */
         /** Inits model. */
-        void init();
+        virtual void init() /* override */;
         /** Deinits model. */
-        void deinit();
+        virtual void deinit() /* override */;
 
         /** Returns the Chooser reference. */