Changeset 77892 in vbox for trunk

Timestamp:

Mar 26, 2019 6:02:47 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Chooser pane: Cleanup for UIChooserAbstractModel classes.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (14 diffs)
• UIChooserAbstractModel.h (modified) (5 diffs)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIChooserModel class implementation.
+ * VBox Qt GUI - UIChooserAbstractModel class implementation.
  */
 
@@ -38 +38 @@
 UIChooserAbstractModel:: UIChooserAbstractModel(UIChooser *pParent)
     : QObject(pParent)
+    , m_pParent(pParent)
     , m_pInvisibleRootNode(0)
 {
@@ -51 +52 @@
 void UIChooserAbstractModel::deinit()
 {
-    /* Currently we are not saving group descriptors
-     * (which reflecting group toggle-state) on-the-fly,
-     * so, for now we are additionally save group orders
-     * when exiting application: */
+    // WORKAROUND:
+    // Currently we are not saving group descriptors
+    // (which reflecting group toggle-state) on-the-fly,
+    // so for now we are additionally save group orders
+    // when exiting application:
     saveGroupOrders();
 
@@ -73 +75 @@
 void UIChooserAbstractModel::wipeOutEmptyGroups()
 {
-    wipeOutEmptyGroups(invisibleRoot());
+    wipeOutEmptyGroupsStartingFrom(invisibleRoot());
 }
 
@@ -101 +103 @@
     }
 
-    /* Prepare result: */
+    /* Prepare/return result: */
     QString strResult = strMinimumName;
     if (iMinimumPossibleNumber)
@@ -110 +112 @@
 void UIChooserAbstractModel::saveGroupSettings()
 {
-    emit sigGroupSavingStarted();
+    emit sigStartGroupSaving();
 }
 
@@ -182 +184 @@
 }
 
-void UIChooserAbstractModel::sltGroupSavingStart()
+void UIChooserAbstractModel::sltStartGroupSaving()
 {
     saveGroupDefinitions();
@@ -208 +210 @@
 {
     /* Setup parent connections: */
-    connect(this, SIGNAL(sigGroupSavingStateChanged()),
-            parent(), SIGNAL(sigGroupSavingStateChanged()));
+    connect(this, &UIChooserAbstractModel::sigGroupSavingStateChanged,
+            m_pParent, &UIChooser::sigGroupSavingStateChanged);
 
     /* Setup global connections: */
-    connect(gVBoxEvents, SIGNAL(sigMachineStateChange(QUuid, KMachineState)),
-            this, SLOT(sltMachineStateChanged(QUuid, KMachineState)));
-    connect(gVBoxEvents, SIGNAL(sigMachineDataChange(QUuid)),
-            this, SLOT(sltMachineDataChanged(QUuid)));
-    connect(gVBoxEvents, SIGNAL(sigMachineRegistered(QUuid, bool)),
-            this, SLOT(sltMachineRegistered(QUuid, bool)));
-    connect(gVBoxEvents, SIGNAL(sigSessionStateChange(QUuid, KSessionState)),
-            this, SLOT(sltSessionStateChanged(QUuid, KSessionState)));
-    connect(gVBoxEvents, SIGNAL(sigSnapshotTake(QUuid, QUuid)),
-            this, SLOT(sltSnapshotChanged(QUuid, QUuid)));
-    connect(gVBoxEvents, SIGNAL(sigSnapshotDelete(QUuid, QUuid)),
-            this, SLOT(sltSnapshotChanged(QUuid, QUuid)));
-    connect(gVBoxEvents, SIGNAL(sigSnapshotChange(QUuid, QUuid)),
-            this, SLOT(sltSnapshotChanged(QUuid, QUuid)));
-    connect(gVBoxEvents, SIGNAL(sigSnapshotRestore(QUuid, QUuid)),
-            this, SLOT(sltSnapshotChanged(QUuid, QUuid)));
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineStateChange,
+            this, &UIChooserAbstractModel::sltMachineStateChanged);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineDataChange,
+            this, &UIChooserAbstractModel::sltMachineDataChanged);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineRegistered,
+            this, &UIChooserAbstractModel::sltMachineRegistered);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSessionStateChange,
+            this, &UIChooserAbstractModel::sltSessionStateChanged);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotTake,
+            this, &UIChooserAbstractModel::sltSnapshotChanged);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotDelete,
+            this, &UIChooserAbstractModel::sltSnapshotChanged);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotChange,
+            this, &UIChooserAbstractModel::sltSnapshotChanged);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotRestore,
+            this, &UIChooserAbstractModel::sltSnapshotChanged);
 
     /* Setup group saving connections: */
-    connect(this, &UIChooserAbstractModel::sigGroupSavingStarted,
-            this, &UIChooserAbstractModel::sltGroupSavingStart,
+    connect(this, &UIChooserAbstractModel::sigStartGroupSaving,
+            this, &UIChooserAbstractModel::sltStartGroupSaving,
             Qt::QueuedConnection);
 }
@@ -342 +344 @@
         new UIChooserNodeGroup(pParentNode,
                                false /* favorite */,
-                               getDesiredPosition(pParentNode, UIChooserItemType_Group, strSecondSubName),
+                               getDesiredNodePosition(pParentNode, UIChooserItemType_Group, strSecondSubName),
                                strSecondSubName,
-                               fAllGroupsOpened || shouldBeGroupOpened(pParentNode, strSecondSubName));
+                               fAllGroupsOpened || shouldGroupNodeBeOpened(pParentNode, strSecondSubName));
     return strSecondSuffix.isEmpty() ? pNewGroupNode : getGroupNode(strFirstSuffix, pNewGroupNode, fAllGroupsOpened);
 }
 
-bool UIChooserAbstractModel::shouldBeGroupOpened(UIChooserNode *pParentNode, const QString &strName)
+bool UIChooserAbstractModel::shouldGroupNodeBeOpened(UIChooserNode *pParentNode, const QString &strName)
 {
     /* Read group definitions: */
@@ -376 +378 @@
 }
 
-void UIChooserAbstractModel::wipeOutEmptyGroups(UIChooserNode *pParent)
+void UIChooserAbstractModel::wipeOutEmptyGroupsStartingFrom(UIChooserNode *pParent)
 {
     /* Cleanup all the group-items recursively first: */
     foreach (UIChooserNode *pNode, pParent->nodes(UIChooserItemType_Group))
-        wipeOutEmptyGroups(pNode);
+        wipeOutEmptyGroupsStartingFrom(pNode);
     /* If parent has no nodes: */
     if (!pParent->hasNodes())
@@ -421 +423 @@
 }
 
-int UIChooserAbstractModel::getDesiredPosition(UIChooserNode *pParentNode, UIChooserItemType enmType, const QString &strName)
+int UIChooserAbstractModel::getDesiredNodePosition(UIChooserNode *pParentNode, UIChooserItemType enmType, const QString &strName)
 {
     /* End of list (by default)? */
     int iNewNodeDesiredPosition = -1;
     /* Which position should be new node placed by definitions: */
-    int iNewNodeDefinitionPosition = positionFromDefinitions(pParentNode, enmType, strName);
+    int iNewNodeDefinitionPosition = getDefinedNodePosition(pParentNode, enmType, strName);
     /* If some position wanted: */
     if (iNewNodeDefinitionPosition != -1)
@@ -443 +445 @@
                                         QString();
             AssertMsg(!strDefinitionName.isEmpty(), ("Wrong definition name!"));
-            int iNodeDefinitionPosition = positionFromDefinitions(pParentNode, enmType, strDefinitionName);
+            int iNodeDefinitionPosition = getDefinedNodePosition(pParentNode, enmType, strDefinitionName);
             /* If some position wanted: */
             if (iNodeDefinitionPosition != -1)
@@ -460 +462 @@
 }
 
-int UIChooserAbstractModel::positionFromDefinitions(UIChooserNode *pParentNode, UIChooserItemType enmType, const QString &strName)
+int UIChooserAbstractModel::getDefinedNodePosition(UIChooserNode *pParentNode, UIChooserItemType enmType, const QString &strName)
 {
     /* Read group definitions: */
@@ -509 +511 @@
     new UIChooserNodeMachine(pParentNode,
                              false /* favorite */,
-                             getDesiredPosition(pParentNode, UIChooserItemType_Machine, toOldStyleUuid(comMachine.GetId())),
+                             getDesiredNodePosition(pParentNode, UIChooserItemType_Machine, toOldStyleUuid(comMachine.GetId())),
                              comMachine);
 }

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

@@ -49 +49 @@
     /** @name Group saving stuff.
       * @{ */
-        /** Notifies about group saving started. */
-        void sigGroupSavingStarted();
+        /** Commands to start group saving. */
+        void sigStartGroupSaving();
         /** Notifies about group saving state changed. */
         void sigGroupSavingStateChanged();
@@ -115 +115 @@
       * @{ */
         /** Handles request to start group saving. */
-        void sltGroupSavingStart();
+        void sltStartGroupSaving();
         /** Handles group definition saving complete. */
         void sltGroupDefinitionsSaveComplete();
@@ -143 +143 @@
           * @param  fAllGroupsOpened  Brings whether we should open all the groups till the required one. */
         UIChooserNode *getGroupNode(const QString &strName, UIChooserNode *pParentNode, bool fAllGroupsOpened);
-        /** Returns whether group with certain @a strName should be opened, searching starting from the passed @a pParentItem. */
-        bool shouldBeGroupOpened(UIChooserNode *pParentNode, const QString &strName);
+        /** Returns whether group node with certain @a strName should be opened, searching starting from the passed @a pParentItem. */
+        bool shouldGroupNodeBeOpened(UIChooserNode *pParentNode, const QString &strName);
 
         /** Wipes out empty groups starting from @a pParentItem. */
-        void wipeOutEmptyGroups(UIChooserNode *pParentNode);
+        void wipeOutEmptyGroupsStartingFrom(UIChooserNode *pParentNode);
 
         /** Returns whether global node within the @a pParentNode is favorite. */
@@ -153 +153 @@
 
         /** Acquires desired position for a child of @a pParentNode with specified @a enmType and @a strName. */
-        int getDesiredPosition(UIChooserNode *pParentNode, UIChooserItemType enmType, const QString &strName);
-        /** Acquires saved position for a child of @a pParentNode with specified @a enmType and @a strName. */
-        int positionFromDefinitions(UIChooserNode *pParentNode, UIChooserItemType enmType, const QString &strName);
+        int getDesiredNodePosition(UIChooserNode *pParentNode, UIChooserItemType enmType, const QString &strName);
+        /** Acquires defined position for a child of @a pParentNode with specified @a enmType and @a strName. */
+        int getDefinedNodePosition(UIChooserNode *pParentNode, UIChooserItemType enmType, const QString &strName);
 
         /** Creates machine node based on certain @a comMachine as a child of specified @a pParentNode. */
@@ -181 +181 @@
           * @note  Required for backward compatibility after QString=>QUuid change. */
         static QString toOldStyleUuid(const QUuid &uId);
+    /** @} */
+
+    /** @name General stuff.
+      * @{ */
+        /** Holds the parent widget reference. */
+        UIChooser *m_pParent;
     /** @} */