Changeset 74915 in vbox

Timestamp:

Oct 18, 2018 12:24:32 PM (6 years ago)

Author:

vboxsync

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

125916

Message:

FE/Qt: bugref:9261: VirtualBox Manager: Fixing regression for group saving mechanism after QString => QUuid change.

Location:

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

Files:

• UIChooserModel.cpp (modified) (8 diffs)
• UIChooserModel.h (modified) (1 diff)

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

@@ -1769 +1769 @@
 
     /* Which VM we are loading: */
-    LogRelFlow(("UIChooserModel: Loading VM with ID={%s}...\n", machine.GetId().toString().toUtf8().constData()));
+    LogRelFlow(("UIChooserModel: Loading VM with ID={%s}...\n", toOldStyleUuid(machine.GetId()).toUtf8().constData()));
     /* Is that machine accessible? */
     if (machine.GetAccessible())
@@ -1793 +1793 @@
         }
         /* Update group definitions: */
-        m_groups[machine.GetId().toString()] = groupList;
+        m_groups[toOldStyleUuid(machine.GetId())] = groupList;
     }
     /* Inaccessible machine: */
@@ -1799 +1799 @@
     {
         /* VM is accessible: */
-        LogRelFlow(("UIChooserModel:  VM {%s} is inaccessible.\n", machine.GetId().toString().toUtf8().constData()));
+        LogRelFlow(("UIChooserModel:  VM {%s} is inaccessible.\n", toOldStyleUuid(machine.GetId()).toUtf8().constData()));
         /* Create machine-item with main-root group-item as parent: */
         createMachineItem(machine, mainRoot());
@@ -1911 +1911 @@
             /* Which position should be current item placed by definitions? */
             QString strDefinitionName = pItem->type() == UIChooserItemType_Group ? pItem->name() :
-                                        pItem->type() == UIChooserItemType_Machine ? pItem->toMachineItem()->id().toString() :
+                                        pItem->type() == UIChooserItemType_Machine ? toOldStyleUuid(pItem->toMachineItem()->id()) :
                                         QString();
             AssertMsg(!strDefinitionName.isEmpty(), ("Wrong definition name!"));
@@ -1978 +1978 @@
 {
     /* Create machine-item: */
-    new UIChooserItemMachine(pParentItem, machine, getDesiredPosition(pParentItem, UIChooserItemType_Machine, machine.GetId().toString()));
+    new UIChooserItemMachine(pParentItem, machine, getDesiredPosition(pParentItem, UIChooserItemType_Machine, toOldStyleUuid(machine.GetId())));
 }
 
@@ -2160 +2160 @@
         if (UIChooserItemMachine *pMachineItem = pItem->toMachineItem())
             if (pMachineItem->accessible())
-                definitions[pMachineItem->id().toString()] << pParentGroup->fullName();
+                definitions[toOldStyleUuid(pMachineItem->id())] << pParentGroup->fullName();
     /* Iterate over all the group-items: */
     foreach (UIChooserItem *pItem, pParentGroup->items(UIChooserItemType_Group))
@@ -2180 +2180 @@
     /* Iterate over all the machine-items: */
     foreach (UIChooserItem *pItem, pParentItem->items(UIChooserItemType_Machine))
-        orders[strExtraDataKey] << QString("m=%1").arg(pItem->toMachineItem()->id().toString());
+        orders[strExtraDataKey] << QString("m=%1").arg(toOldStyleUuid(pItem->toMachineItem()->id()));
 }
 
@@ -2195 +2195 @@
     if (UIThreadGroupOrderSave::instance())
         UIThreadGroupOrderSave::cleanup();
+}
+
+/* static */
+QString UIChooserModel::toOldStyleUuid(const QUuid &uId)
+{
+    return uId.toString().remove(QRegExp("[{}]"));
 }
 

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

@@ -456 +456 @@
         /** Makes sure group orders saving is finished. */
         void makeSureGroupOrdersSaveIsFinished();
+
+        /** Returns QString representation for passed @a uId, wiping out {} symbols.
+          * @note  Required for backward compatibility after QString=>QUuid change. */
+        static QString toOldStyleUuid(const QUuid &uId);
     /** @} */