Changeset 23982 in vbox for trunk/src

Timestamp:

Oct 22, 2009 1:26:00 PM (15 years ago)

Author:

vboxsync

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

53813

Message:

Frontends/VirtualBox: NULL strings are not valid as medium UUIDs for AttachDevice and MountMedium

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxMediaManagerDlg.cpp (modified) (2 diffs)
• VBoxNewVMWzd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp

@@ -1199 +1199 @@
                 if (medium.id() == aMedium.id())
                 {
-                    machine.MountMedium (attachment.GetController().GetName(), attachment.GetPort(), attachment.GetDevice(), QString());
+                    machine.MountMedium (attachment.GetController().GetName(), attachment.GetPort(), attachment.GetDevice(), QString(""));
                     if (!machine.isOk())
                     {
@@ -1220 +1220 @@
                 if (medium.id() == aMedium.id())
                 {
-                    machine.MountMedium (attachment.GetController().GetName(), attachment.GetPort(), attachment.GetDevice(), QString());
+                    machine.MountMedium (attachment.GetController().GetName(), attachment.GetPort(), attachment.GetDevice(), QString(""));
                     if (!machine.isOk())
                     {

trunk/src/VBox/Frontends/VirtualBox/src/VBoxNewVMWzd.cpp

@@ -386 +386 @@
 
             /* Attach empty CD/DVD ROM Device */
-            m.AttachDevice (ideCtrName, 1, 0, KDeviceType_DVD, QString());
+            m.AttachDevice (ideCtrName, 1, 0, KDeviceType_DVD, QString(""));
             if (!m.isOk())
                 vboxProblem().cannotAttachDevice (this, m, VBoxDefs::MediumType_DVD, QString(), ideBus, 1, 0);
 
             /* Attach empty Floppy Device */
-            m.AttachDevice (floppyCtrName, 0, 0, KDeviceType_Floppy, QString());
+            m.AttachDevice (floppyCtrName, 0, 0, KDeviceType_Floppy, QString(""));
             if (!m.isOk())
                 vboxProblem().cannotAttachDevice (this, m, VBoxDefs::MediumType_Floppy, QString(), floppyBus, 0, 0);