Changeset 17553 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 9, 2009 9:34:22 AM (16 years ago)

Author:

vboxsync

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

43992

Message:

#3551: “Main: Replace remaining collections with safe arrays”
Replaced IUSBDeviceCollection. Reviewed by Christian.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleWnd.cpp (modified) (1 diff)
• VBoxGlobal.cpp (modified) (1 diff)

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

@@ -1976 +1976 @@
                 mDevicesUSBMenu->setEnabled (isRunningOrPaused);
 
-                CUSBDeviceEnumerator en = cconsole.GetUSBDevices().Enumerate();
-                while (en.HasMore())
+                CUSBDeviceVector devsvec = cconsole.GetUSBDevices();
+                for (int i = 0; i < devsvec.size(); ++i)
                 {
-                    CUSBDevice usb = en.GetNext();
+                    CUSBDevice usb = devsvec[i];
                     info += QString ("<br><b><nobr>%1</nobr></b>")
                                      .arg (vboxGlobal().details (usb));

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

@@ -5544 +5544 @@
             {
                 CUSBDevice attachedUSB =
-                    mConsole.GetUSBDevices().FindById (usb.GetId());
+                    mConsole.FindUSBDeviceById (usb.GetId());
                 action->setChecked (!attachedUSB.isNull());
                 action->setEnabled (dev.GetState() !=