Changeset 23880 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 19, 2009 5:48:04 PM (16 years ago)

Author:

vboxsync

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

53660

Message:

Main/MediumAttachment: change return value of Controller getter to return a reference to the StorageController instead of just the name

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxMediaManagerDlg.cpp (modified) (3 diffs)
• VBoxSelectorWnd.cpp (modified) (1 diff)

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

@@ -1265 +1265 @@
                 if (attachment.GetMedium().GetId() == aMedium.id())
                 {
-                    machine.DetachDevice (attachment.GetController(), attachment.GetPort(), attachment.GetDevice());
+                    CStorageController controller = attachment.GetController();
+                    machine.DetachDevice (controller.GetName(), attachment.GetPort(), attachment.GetDevice());
                     if (!machine.isOk())
                     {
-                        CStorageController controller = machine.GetStorageControllerByName (attachment.GetController());
                         vboxProblem().cannotDetachDevice (this, machine, VBoxDefs::MediumType_HardDisk, aMedium.location(),
                                                           controller.GetBus(), attachment.GetPort(), attachment.GetDevice());
@@ -1288 +1288 @@
                 if (medium.id() == aMedium.id())
                 {
-                    machine.MountMedium (attachment.GetController(), attachment.GetPort(), attachment.GetDevice(), QString());
+                    machine.MountMedium (attachment.GetController().GetName(), attachment.GetPort(), attachment.GetDevice(), QString());
                     if (!machine.isOk())
                     {
-                        CStorageController controller = machine.GetStorageControllerByName (attachment.GetController());
                         vboxProblem().cannotUnmountMedium (this, machine, aMedium);
                         success = false;
@@ -1310 +1309 @@
                 if (medium.id() == aMedium.id())
                 {
-                    machine.MountMedium (attachment.GetController(), attachment.GetPort(), attachment.GetDevice(), QString());
+                    machine.MountMedium (attachment.GetController().GetName(), attachment.GetPort(), attachment.GetDevice(), QString());
                     if (!machine.isOk())
                     {
-                        CStorageController controller = machine.GetStorageControllerByName (attachment.GetController());
                         vboxProblem().cannotUnmountMedium (this, machine, aMedium);
                         success = false;

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

@@ -911 +911 @@
             {
                 CMediumAttachment hda = vec [i];
-                const QString ctlName = hda.GetController();
-
-                machine.DetachDevice(ctlName, hda.GetPort(), hda.GetDevice());
+                CStorageController controller = hda.GetController();
+                machine.DetachDevice(controller.GetName(), hda.GetPort(), hda.GetDevice());
                 if (!machine.isOk())
                 {
-                    CStorageController ctl = machine.GetStorageControllerByName(ctlName);
                     vboxProblem().cannotDetachDevice (this, machine, VBoxDefs::MediumType_HardDisk,
                         vboxGlobal().getMedium (CMedium (hda.GetMedium())).location(),
-                        ctl.GetBus(), hda.GetPort(), hda.GetDevice());
+                        controller.GetBus(), hda.GetPort(), hda.GetDevice());
                 }
             }