Changeset 93987 in vbox for trunk/src/VBox

Timestamp:

Feb 28, 2022 2:54:47 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: qt6: No implicit conversion from QString to QUuid, must use the QUuid string constructor. bugref:9898

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (4 diffs)
• medium/viso/UIVisoCreator.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (9 diffs)
• softkeyboard/UISoftKeyboard.cpp (modified) (1 diff)
• widgets/UITabBar.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -475 +475 @@
             enmOptType = OptType_VMRunner;
             if (++i < argc)
-                m_uFloppyImage = arguments.at(i);
+                m_uFloppyImage = QUuid(arguments.at(i));
         }
         else if (!::strcmp(arg, "--dvd") || !::strcmp(arg, "--cdrom"))
@@ -481 +481 @@
             enmOptType = OptType_VMRunner;
             if (++i < argc)
-                m_uDvdImage = arguments.at(i);
+                m_uDvdImage = QUuid(arguments.at(i));
         }
         /* VMM Options: */
@@ -591 +591 @@
         {
             if (machine.isNull() && showStartVMErrors())
-                return msgCenter().cannotFindMachineById(m_comVBox, vmNameOrUuid);
+                return msgCenter().cannotFindMachineById(m_comVBox, uuid);
         }
         else
@@ -1916 +1916 @@
             /* Use medium ID which was passed: */
             else if (!target.data.isNull() && target.data != uCurrentID.toString())
-                uNewID = target.data;
+                uNewID = QUuid(target.data);
 
             /* Should we mount or unmount? */

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -521 +521 @@
 
     if (!pVisoCreator)
-        return QString();
+        return QUuid();
     windowManager().registerNewParent(pVisoCreator, pDialogParent);
     pVisoCreator->setCurrentPath(gEDataManager->visoCreatorRecentFolder());

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -3220 +3220 @@
             newAttachmentData.m_fNonRotational = m_pModelStorage->data(attachmentIndex, StorageModel::R_AttIsNonRotational).toBool();
             newAttachmentData.m_fHotPluggable = m_pModelStorage->data(attachmentIndex, StorageModel::R_AttIsHotPluggable).toBool();
-            newAttachmentData.m_uMediumId = m_pModelStorage->data(attachmentIndex, StorageModel::R_AttMediumId).toString();
+            newAttachmentData.m_uMediumId = QUuid(m_pModelStorage->data(attachmentIndex, StorageModel::R_AttMediumId).toString());
             const QString strAttachmentKey = QString("%1:%2").arg(newAttachmentData.m_iPort).arg(newAttachmentData.m_iDevice);
 
@@ -3291 +3291 @@
             const QString value(QString("%1 (%2)").arg(ctrName, gpConverter->toString(attSlot)));
             /* Check for emptiness: */
-            if (uiCommon().medium(key).isNull() && enmDeviceType == KDeviceType_HardDisk)
+            if (uiCommon().medium(QUuid(key)).isNull() && enmDeviceType == KDeviceType_HardDisk)
             {
                 message.second << tr("No hard disk is selected for <i>%1</i>.").arg(value);
@@ -3297 +3297 @@
             }
             /* Check for coincidence: */
-            if (!uiCommon().medium(key).isNull() && config.contains(key) && enmDeviceType != KDeviceType_DVD)
+            if (!uiCommon().medium(QUuid(key)).isNull() && config.contains(key) && enmDeviceType != KDeviceType_DVD)
             {
                 message.second << tr("<i>%1</i> is using a disk that is already attached to <i>%2</i>.")
@@ -3501 +3501 @@
         {
             const QModelIndex attachmentIndex = m_pModelStorage->index(j, 0, controllerIndex);
-            const QUuid attMediumId = m_pModelStorage->data(attachmentIndex, StorageModel::R_AttMediumId).toString();
+            const QUuid attMediumId(m_pModelStorage->data(attachmentIndex, StorageModel::R_AttMediumId).toString());
             if (attMediumId == medium.id())
             {
@@ -3522 +3522 @@
         {
             QModelIndex attachmentIndex = m_pModelStorage->index(j, 0, controllerIndex);
-            QUuid attMediumId = m_pModelStorage->data(attachmentIndex, StorageModel::R_AttMediumId).toString();
+            QUuid attMediumId(m_pModelStorage->data(attachmentIndex, StorageModel::R_AttMediumId).toString());
             if (attMediumId == uMediumId)
             {
@@ -3805 +3805 @@
                 /* Fetch device-type, medium-id: */
                 m_pMediumIdHolder->setType(mediumTypeToLocal(enmDeviceType));
-                m_pMediumIdHolder->setId(m_pModelStorage->data(index, StorageModel::R_AttMediumId).toString());
+                m_pMediumIdHolder->setId(QUuid(m_pModelStorage->data(index, StorageModel::R_AttMediumId).toString()));
 
                 /* Get/fetch editable state: */
@@ -4043 +4043 @@
     AssertMsg(pChooseHostDriveAction, ("Can't access choose-host-drive action!\n"));
     if (pChooseHostDriveAction)
-        m_pMediumIdHolder->setId(pChooseHostDriveAction->data().toString());
+        m_pMediumIdHolder->setId(QUuid(pChooseHostDriveAction->data().toString()));
 }
 
@@ -4458 +4458 @@
     /* Then make sure we support such attachment device type: */
     const DeviceTypeList devicesList(m_pModelStorage->data(index, StorageModel::R_CtrDevices).value<DeviceTypeList>());
-    if (!devicesList.contains(m_pModelStorage->attachmentDeviceType(strControllerId, strAttachmentId)))
+    if (!devicesList.contains(m_pModelStorage->attachmentDeviceType(QUuid(strControllerId), QUuid(strAttachmentId))))
         return;
     /* Also make sure there is enough place for new attachment: */
@@ -4487 +4487 @@
         const QString strControllerId = pMimeData->data(UIMachineSettingsStorage::s_strControllerMimeType);
         const QString strAttachmentId = pMimeData->data(UIMachineSettingsStorage::s_strAttachmentMimeType);
-        m_pModelStorage->moveAttachment(strAttachmentId, strControllerId, pItemController->id());
+        m_pModelStorage->moveAttachment(QUuid(strAttachmentId), QUuid(strControllerId), pItemController->id());
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -3303 +3303 @@
             physicalLayout.setName(m_xmlReader.readElementText());
         else if (m_xmlReader.name() == QLatin1String("id"))
-            physicalLayout.setUid(m_xmlReader.readElementText());
+            physicalLayout.setUid(QUuid(m_xmlReader.readElementText()));
         else
             m_xmlReader.skipCurrentElement();

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp

@@ -937 +937 @@
     const QUuid tokenUuid = m_pItemToken->uuid();
     /* Determine ID of dropped-item: */
-    const QUuid droppedUuid = pMimeData->data(UITabBarItem::MimeType);
+    const QUuid droppedUuid(pMimeData->data(UITabBarItem::MimeType));
 
     /* Make sure these uuids are different: */