Changeset 84423 in vbox

Timestamp:

May 20, 2020 5:03:09 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

138122

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Light cleanup in machine group settings saving functionality.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (17 diffs)
• UIChooserAbstractModel.h (modified) (7 diffs)

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

@@ -194 +194 @@
 
     /* Make sure all saving steps complete: */
-    makeSureGroupDefinitionsSaveIsFinished();
+    makeSureGroupSettingsSaveIsFinished();
     makeSureGroupOrdersSaveIsFinished();
 
@@ -306 +306 @@
 bool UIChooserAbstractModel::isGroupSavingInProgress() const
 {
-    return    UIThreadGroupDefinitionSave::instance()
+    return    UIThreadGroupSettingsSave::instance()
            || UIThreadGroupOrderSave::instance();
 }
@@ -469 +469 @@
 void UIChooserAbstractModel::sltStartGroupSaving()
 {
-    saveGroupDefinitions();
+    saveGroupSettings();
     saveGroupOrders();
 }
@@ -526 +526 @@
 }
 
-void UIChooserAbstractModel::sltGroupDefinitionsSaveComplete()
-{
-    makeSureGroupDefinitionsSaveIsFinished();
+void UIChooserAbstractModel::sltGroupSettingsSaveComplete()
+{
+    makeSureGroupSettingsSaveIsFinished();
     emit sigGroupSavingStateChanged();
 }
@@ -613 +613 @@
             createLocalMachineNode(getLocalGroupNode(strGroup, invisibleRoot(), fMakeItVisible), comMachine);
         }
-        /* Update group definitions: */
+        /* Update group settings: */
         m_groups[toOldStyleUuid(uId)] = groupList;
     }
@@ -648 +648 @@
     /* Create machine-item with found group-item as parent: */
     createCloudMachineNode(getCloudGroupNode(strGroup, invisibleRoot(), fMakeItVisible), comMachine);
-    /* Update group definitions: */
+    /* Update group settings: */
     const QStringList groupList(strGroup);
     m_groups[toOldStyleUuid(uId)] = groupList;
@@ -992 +992 @@
 }
 
-void UIChooserAbstractModel::saveGroupDefinitions()
-{
-    /* Make sure there is no group save activity: */
-    if (UIThreadGroupDefinitionSave::instance())
+void UIChooserAbstractModel::saveGroupSettings()
+{
+    /* Make sure there is no group settings saving activity: */
+    if (UIThreadGroupSettingsSave::instance())
         return;
 
     /* Prepare full group map: */
     QMap<QString, QStringList> groups;
-    gatherGroupDefinitions(groups, invisibleRoot());
+    gatherGroupSettings(groups, invisibleRoot());
 
     /* Save information in other thread: */
-    UIThreadGroupDefinitionSave::prepare();
+    UIThreadGroupSettingsSave::prepare();
     emit sigGroupSavingStateChanged();
-    connect(UIThreadGroupDefinitionSave::instance(), &UIThreadGroupDefinitionSave::sigReload,
+    connect(UIThreadGroupSettingsSave::instance(), &UIThreadGroupSettingsSave::sigReload,
             this, &UIChooserAbstractModel::sltReloadMachine);
-    UIThreadGroupDefinitionSave::instance()->configure(this, m_groups, groups);
-    UIThreadGroupDefinitionSave::instance()->start();
+    UIThreadGroupSettingsSave::instance()->configure(this, m_groups, groups);
+    UIThreadGroupSettingsSave::instance()->start();
     m_groups = groups;
 }
@@ -1029 +1029 @@
 }
 
-void UIChooserAbstractModel::gatherGroupDefinitions(QMap<QString, QStringList> &definitions,
-                                                    UIChooserNode *pParentGroup)
+void UIChooserAbstractModel::gatherGroupSettings(QMap<QString, QStringList> &settings,
+                                                 UIChooserNode *pParentGroup)
 {
     /* Iterate over all the machine-nodes: */
@@ -1042 +1042 @@
         if (   pMachineNode->cacheType() == UIVirtualMachineItemType_Local
             && pMachineNode->accessible())
-            definitions[toOldStyleUuid(pMachineNode->id())] << pParentGroup->fullName();
+            settings[toOldStyleUuid(pMachineNode->id())] << pParentGroup->fullName();
     }
     /* Iterate over all the group-nodes: */
     foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserNodeType_Group))
-        gatherGroupDefinitions(definitions, pNode);
+        gatherGroupSettings(settings, pNode);
 }
 
@@ -1084 +1084 @@
 }
 
-void UIChooserAbstractModel::makeSureGroupDefinitionsSaveIsFinished()
+void UIChooserAbstractModel::makeSureGroupSettingsSaveIsFinished()
 {
     /* Cleanup if necessary: */
-    if (UIThreadGroupDefinitionSave::instance())
-        UIThreadGroupDefinitionSave::cleanup();
+    if (UIThreadGroupSettingsSave::instance())
+        UIThreadGroupSettingsSave::cleanup();
 }
 
@@ -1100 +1100 @@
 
 /*********************************************************************************************************************************
-*   Class UIThreadGroupDefinitionSave implementation.                                                                            *
+*   Class UIThreadGroupSettingsSave implementation.                                                                              *
 *********************************************************************************************************************************/
 
 /* static */
-UIThreadGroupDefinitionSave *UIThreadGroupDefinitionSave::s_pInstance = 0;
+UIThreadGroupSettingsSave *UIThreadGroupSettingsSave::s_pInstance = 0;
 
 /* static */
-UIThreadGroupDefinitionSave *UIThreadGroupDefinitionSave::instance()
+UIThreadGroupSettingsSave *UIThreadGroupSettingsSave::instance()
 {
     return s_pInstance;
@@ -1113 +1113 @@
 
 /* static */
-void UIThreadGroupDefinitionSave::prepare()
-{
-    /* Make sure instance not prepared: */
+void UIThreadGroupSettingsSave::prepare()
+{
+    /* Make sure instance is not prepared: */
     if (s_pInstance)
         return;
 
     /* Crate instance: */
-    new UIThreadGroupDefinitionSave;
+    new UIThreadGroupSettingsSave;
 }
 
 /* static */
-void UIThreadGroupDefinitionSave::cleanup()
-{
-    /* Make sure instance prepared: */
+void UIThreadGroupSettingsSave::cleanup()
+{
+    /* Make sure instance is prepared: */
     if (!s_pInstance)
         return;
 
-    /* Crate instance: */
+    /* Delete instance: */
     delete s_pInstance;
 }
 
-void UIThreadGroupDefinitionSave::configure(QObject *pParent,
-                                            const QMap<QString, QStringList> &oldLists,
-                                            const QMap<QString, QStringList> &newLists)
+void UIThreadGroupSettingsSave::configure(QObject *pParent,
+                                          const QMap<QString, QStringList> &oldLists,
+                                          const QMap<QString, QStringList> &newLists)
 {
     m_oldLists = oldLists;
@@ -1143 +1143 @@
     AssertPtrReturnVoid(pChooserAbstractModel);
     {
-        connect(this, &UIThreadGroupDefinitionSave::sigComplete,
-                pChooserAbstractModel, &UIChooserAbstractModel::sltGroupDefinitionsSaveComplete);
-    }
-}
-
-UIThreadGroupDefinitionSave::UIThreadGroupDefinitionSave()
+        connect(this, &UIThreadGroupSettingsSave::sigComplete,
+                pChooserAbstractModel, &UIChooserAbstractModel::sltGroupSettingsSaveComplete);
+    }
+}
+
+UIThreadGroupSettingsSave::UIThreadGroupSettingsSave()
 {
     /* Assign instance: */
@@ -1154 +1154 @@
 }
 
-UIThreadGroupDefinitionSave::~UIThreadGroupDefinitionSave()
-{
-    /* Wait: */
+UIThreadGroupSettingsSave::~UIThreadGroupSettingsSave()
+{
+    /* Make sure thread work is complete: */
     wait();
 
@@ -1163 +1163 @@
 }
 
-void UIThreadGroupDefinitionSave::run()
+void UIThreadGroupSettingsSave::run()
 {
     /* COM prepare: */
@@ -1185 +1185 @@
          * with common cleanup in case of failure.
          * We have to simulate a try-catch block. */
-        CSession session;
-        CMachine machine;
+        CSession comSession;
+        CMachine comMachine;
         do
         {
             /* 1. Open session: */
-            session = uiCommon().openSession(QUuid(strId));
-            if (session.isNull())
+            comSession = uiCommon().openSession(QUuid(strId));
+            if (comSession.isNull())
                 break;
 
             /* 2. Get session machine: */
-            machine = session.GetMachine();
-            if (machine.isNull())
+            comMachine = comSession.GetMachine();
+            if (comMachine.isNull())
                 break;
 
             /* 3. Set new groups: */
-            machine.SetGroups(newGroupList.toVector());
-            if (!machine.isOk())
+            comMachine.SetGroups(newGroupList.toVector());
+            if (!comMachine.isOk())
             {
-                msgCenter().cannotSetGroups(machine);
+                msgCenter().cannotSetGroups(comMachine);
                 break;
             }
 
             /* 4. Save settings: */
-            machine.SaveSettings();
-            if (!machine.isOk())
+            comMachine.SaveSettings();
+            if (!comMachine.isOk())
             {
-                msgCenter().cannotSaveMachineSettings(machine);
+                msgCenter().cannotSaveMachineSettings(comMachine);
                 break;
             }
@@ -1217 +1217 @@
 
         /* Cleanup if necessary: */
-        if (machine.isNull() || !machine.isOk())
+        if (comMachine.isNull() || !comMachine.isOk())
             emit sigReload(QUuid(strId));
-        if (!session.isNull())
-            session.UnlockMachine();
+        if (!comSession.isNull())
+            comSession.UnlockMachine();
     }
 

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

@@ -128 +128 @@
     /** @name Group saving stuff.
       * @{ */
-        /** Handles group definition saving complete. */
-        void sltGroupDefinitionsSaveComplete();
+        /** Handles group settings saving complete. */
+        void sltGroupSettingsSaveComplete();
         /** Handles group order saving complete. */
         void sltGroupOrdersSaveComplete();
@@ -225 +225 @@
     /** @name Group saving stuff.
       * @{ */
-        /** Saves group definitions. */
-        void saveGroupDefinitions();
+        /** Saves group settings. */
+        void saveGroupSettings();
         /** Saves group orders. */
         void saveGroupOrders();
 
-        /** Gathers group @a definitions of @a pParentGroup. */
-        void gatherGroupDefinitions(QMap<QString, QStringList> &definitions, UIChooserNode *pParentGroup);
+        /** Gathers group @a settings of @a pParentGroup. */
+        void gatherGroupSettings(QMap<QString, QStringList> &settings, UIChooserNode *pParentGroup);
         /** Gathers group @a orders of @a pParentGroup. */
         void gatherGroupOrders(QMap<QString, QStringList> &orders, UIChooserNode *pParentGroup);
 
-        /** Makes sure group definitions saving is finished. */
-        void makeSureGroupDefinitionsSaveIsFinished();
+        /** Makes sure group settings saving is finished. */
+        void makeSureGroupSettingsSaveIsFinished();
         /** Makes sure group orders saving is finished. */
         void makeSureGroupOrdersSaveIsFinished();
@@ -261 +261 @@
     /** @name Group saving stuff.
       * @{ */
-        /** Holds the consolidated map of group definitions/orders. */
+        /** Holds the consolidated map of group settings/orders. */
         QMap<QString, QStringList>  m_groups;
     /** @} */
@@ -267 +267 @@
 
 
-/** QThread subclass allowing to save group definitions asynchronously. */
-class UIThreadGroupDefinitionSave : public QThread
+/** QThread subclass allowing to save group settings asynchronously. */
+class UIThreadGroupSettingsSave : public QThread
 {
     Q_OBJECT;
@@ -282 +282 @@
 public:
 
-    /** Returns group saving thread instance. */
-    static UIThreadGroupDefinitionSave* instance();
-    /** Prepares group saving thread instance. */
+    /** Returns group settings saving thread instance. */
+    static UIThreadGroupSettingsSave *instance();
+    /** Prepares group settings saving thread instance. */
     static void prepare();
-    /** Cleanups group saving thread instance. */
+    /** Cleanups group settings saving thread instance. */
     static void cleanup();
 
-    /** Configures @a groups saving thread with corresponding @a pListener.
-      * @param  oldLists  Brings the old definition list to be compared.
-      * @param  newLists  Brings the new definition list to be saved. */
+    /** Configures @a group settings saving thread with corresponding @a pListener.
+      * @param  oldLists  Brings the old settings list to be compared.
+      * @param  newLists  Brings the new settings list to be saved. */
     void configure(QObject *pParent,
                    const QMap<QString, QStringList> &oldLists,
@@ -298 +298 @@
 protected:
 
-    /** Constructs group saving thread. */
-    UIThreadGroupDefinitionSave();
-    /** Destructs group saving thread. */
-    virtual ~UIThreadGroupDefinitionSave() /* override */;
+    /** Constructs group settings saving thread. */
+    UIThreadGroupSettingsSave();
+    /** Destructs group settings saving thread. */
+    virtual ~UIThreadGroupSettingsSave() /* override */;
 
     /** Contains a thread task to be executed. */
@@ -307 +307 @@
 
     /** Holds the singleton instance. */
-    static UIThreadGroupDefinitionSave *s_pInstance;
-
-    /** Holds the map of group definitions to be compared. */
+    static UIThreadGroupSettingsSave *s_pInstance;
+
+    /** Holds the map of group settings to be compared. */
     QMap<QString, QStringList> m_oldLists;
-    /** Holds the map of group definitions to be saved. */
+    /** Holds the map of group settings to be saved. */
     QMap<QString, QStringList> m_newLists;
 };