Changeset 17553 in vbox for trunk/src/VBox/Main/include

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (2 diffs)
• USBDeviceImpl.h (modified) (3 diffs)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -115 +115 @@
     STDMETHOD(COMGETTER(Display)) (IDisplay **aDisplay);
     STDMETHOD(COMGETTER(Debugger)) (IMachineDebugger **aDebugger);
-    STDMETHOD(COMGETTER(USBDevices)) (IUSBDeviceCollection **aUSBDevices);
+    STDMETHOD(COMGETTER(USBDevices)) (ComSafeArrayOut (IUSBDevice *, aUSBDevices));
     STDMETHOD(COMGETTER(RemoteUSBDevices)) (IHostUSBDeviceCollection **aRemoteUSBDevices);
     STDMETHOD(COMGETTER(RemoteDisplayInfo)) (IRemoteDisplayInfo **aRemoteDisplayInfo);
@@ -139 +139 @@
     STDMETHOD(AttachUSBDevice) (IN_GUID aId);
     STDMETHOD(DetachUSBDevice) (IN_GUID aId, IUSBDevice **aDevice);
+    STDMETHOD(FindUSBDeviceByAddress) (IN_BSTR aAddress, IUSBDevice **aDevice);
+    STDMETHOD(FindUSBDeviceById) (IN_GUID aId, IUSBDevice **aDevice);
     STDMETHOD(CreateSharedFolder) (IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable);
     STDMETHOD(RemoveSharedFolder) (IN_BSTR aName);

trunk/src/VBox/Main/include/USBDeviceImpl.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2008 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 
 #include "VirtualBoxBase.h"
-#include "Collection.h"
 #include "Logging.h"
 
@@ -121 +120 @@
 };
 
-COM_DECL_READONLY_ENUM_AND_COLLECTION_EX_BEGIN (ComObjPtr <OUSBDevice>, IUSBDevice, OUSBDevice)
-
-    STDMETHOD(FindById) (IN_GUID aId, IUSBDevice **aDevice)
-    {
-        Guid idToFind = aId;
-        if (idToFind.isEmpty())
-            return E_INVALIDARG;
-        if (!aDevice)
-            return E_POINTER;
-
-        *aDevice = NULL;
-        Vector::value_type found;
-        Vector::iterator it = vec.begin();
-        while (!found && it != vec.end())
-        {
-            Guid id;
-            (*it)->COMGETTER(Id) (id.asOutParam());
-            if (id == idToFind)
-                found = *it;
-            ++ it;
-        }
-
-        if (!found)
-        {
-            return setErrorNoLog (E_INVALIDARG, OUSBDeviceCollection::tr (
-                "Could not find a USB device with UUID {%s}"),
-                idToFind.toString().raw());
-        }
-
-        return found.queryInterfaceTo (aDevice);
-    }
-
-    STDMETHOD(FindByAddress) (IN_BSTR aAddress, IUSBDevice **aDevice)
-    {
-        if (!aAddress)
-            return E_INVALIDARG;
-        if (!aDevice)
-            return E_POINTER;
-
-        *aDevice = NULL;
-        Vector::value_type found;
-        Vector::iterator it = vec.begin();
-        while (!found && it != vec.end())
-        {
-            Bstr address;
-            (*it)->COMGETTER(Address) (address.asOutParam());
-            if (address == aAddress)
-                found = *it;
-            ++ it;
-        }
-
-        if (!found)
-            return setErrorNoLog (E_INVALIDARG, OUSBDeviceCollection::tr (
-                "Could not find a USB device with address '%ls'"),
-                aAddress);
-
-        return found.queryInterfaceTo (aDevice);
-    }
-
-COM_DECL_READONLY_ENUM_AND_COLLECTION_EX_END (ComObjPtr <OUSBDevice>, IUSBDevice, OUSBDevice)
-
 #endif // ____H_USBDEVICEIMPL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */