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

Timestamp:

Mar 11, 2009 12:15:33 PM (16 years ago)

Author:

vboxsync

Message:

#3551: “Main: Replace remaining collections with safe arrays”
Replaced HostUSBDeviceCollection. Reviewed/Okayed by dmik, sunlover.

Location:

trunk/src/VBox/Main/include

Files:

• Collection.h (deleted)
• ConsoleImpl.h (modified) (1 diff)
• GuestOSTypeImpl.h (modified) (1 diff)
• HostImpl.h (modified) (2 diffs)
• HostNetworkInterfaceImpl.h (modified) (2 diffs)
• MachineImpl.h (modified) (2 diffs)
• NetworkAdapterImpl.h (modified) (2 diffs)
• ProgressImpl.h (modified) (2 diffs)
• RemoteUSBDeviceImpl.h (modified) (3 diffs)
• SharedFolderImpl.h (modified) (2 diffs)
• SnapshotImpl.h (modified) (2 diffs)

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

@@ -116 +116 @@
     STDMETHOD(COMGETTER(Debugger)) (IMachineDebugger **aDebugger);
     STDMETHOD(COMGETTER(USBDevices)) (ComSafeArrayOut (IUSBDevice *, aUSBDevices));
-    STDMETHOD(COMGETTER(RemoteUSBDevices)) (IHostUSBDeviceCollection **aRemoteUSBDevices);
+    STDMETHOD(COMGETTER(RemoteUSBDevices)) (ComSafeArrayOut (IHostUSBDevice *, aRemoteUSBDevices));
     STDMETHOD(COMGETTER(RemoteDisplayInfo)) (IRemoteDisplayInfo **aRemoteDisplayInfo);
     STDMETHOD(COMGETTER(SharedFolders)) (ComSafeArrayOut (ISharedFolder *, aSharedFolders));

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

@@ -24 +24 @@
 
 #include "VirtualBoxBase.h"
-#include "Collection.h"
 #include "Global.h"
 

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

@@ -79 +79 @@
     STDMETHOD(COMGETTER(DVDDrives))(ComSafeArrayOut (IHostDVDDrive*, drives));
     STDMETHOD(COMGETTER(FloppyDrives))(ComSafeArrayOut (IHostFloppyDrive*, drives));
-    STDMETHOD(COMGETTER(USBDevices))(IHostUSBDeviceCollection **aUSBDevices);
+    STDMETHOD(COMGETTER(USBDevices))(ComSafeArrayOut (IHostUSBDevice *, aUSBDevices));
     STDMETHOD(COMGETTER(USBDeviceFilters))(ComSafeArrayOut (IHostUSBDeviceFilter *, aUSBDeviceFilters));
     STDMETHOD(COMGETTER(NetworkInterfaces))(ComSafeArrayOut (IHostNetworkInterface *, aNetworkInterfaces));
@@ -111 +111 @@
     STDMETHOD(FindHostNetworkInterfaceById) (IN_GUID id, IHostNetworkInterface **networkInterface);
     STDMETHOD(FindHostNetworkInterfacesOfType) (HostNetworkInterfaceType_T type, ComSafeArrayOut (IHostNetworkInterface *, aNetworkInterfaces));
+    STDMETHOD(FindUSBDeviceByAddress) (IN_BSTR aAddress, IHostUSBDevice **aDevice);
+    STDMETHOD(FindUSBDeviceById) (IN_GUID aId, IHostUSBDevice **aDevice);
 
     // public methods only for internal purposes

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

@@ -7 +7 @@
 
 /*
- * 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
@@ -26 +26 @@
 
 #include "VirtualBoxBase.h"
-#include "Collection.h"
 #include "VirtualBoxImpl.h"
 

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -32 +32 @@
 #include "FloppyDriveImpl.h"
 #include "HardDiskAttachmentImpl.h"
-#include "Collection.h"
 #include "NetworkAdapterImpl.h"
 #include "AudioAdapterImpl.h"

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26 +26 @@
 
 #include "VirtualBoxBase.h"
-#include "Collection.h"
 
 class Machine;

trunk/src/VBox/Main/include/ProgressImpl.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 <VBox/com/SupportErrorInfo.h>

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

@@ -8 +8 @@
 
 /*
- * 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
@@ -27 +27 @@
 
 #include "VirtualBoxBase.h"
-#include "Collection.h"
 
 struct _VRDPUSBDEVICEDESC;
@@ -138 +137 @@
 };
 
-COM_DECL_READONLY_ENUM_AND_COLLECTION_EX_BEGIN (ComObjPtr <RemoteUSBDevice>, IHostUSBDevice, RemoteUSBDevice)
-
-    STDMETHOD(FindById) (IN_GUID aId, IHostUSBDevice **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 setError (E_INVALIDARG, RemoteUSBDeviceCollection::tr (
-                "Could not find a USB device with UUID {%s}"),
-                idToFind.toString().raw());
-
-        return found.queryInterfaceTo (aDevice);
-    }
-
-    STDMETHOD(FindByAddress) (IN_BSTR aAddress, IHostUSBDevice **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 setError (E_INVALIDARG, RemoteUSBDeviceCollection::tr (
-                "Could not find a USB device with address '%ls'"),
-                aAddress);
-
-        return found.queryInterfaceTo (aDevice);
-    }
-
-COM_DECL_READONLY_ENUM_AND_COLLECTION_EX_END (ComObjPtr <RemoteUSBDevice>, IHostUSBDevice, RemoteUSBDevice)
-
-
 #endif // ____H_REMOTEUSBDEVICEIMPL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -24 +24 @@
 
 #include "VirtualBoxBase.h"
-#include "Collection.h"
 #include <VBox/shflsvc.h>
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -24 +24 @@
 
 #include "VirtualBoxBase.h"
-#include "Collection.h"
 
 #include <iprt/time.h>