Changeset 3928 in vbox for trunk/src

Timestamp:

Jul 30, 2007 7:51:17 PM (17 years ago)

Author:

vboxsync

Message:

Main: Fixed casting of HostUSBDeviceFilter to USBDeviceFilter filter and removed outdated @todo.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/ui/VBoxGlobalSettingsDlg.ui.h (modified) (7 diffs)
• Main/linux/server.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxGlobalSettingsDlg.ui.h

@@ -589 +589 @@
     /* usb filters page */
 
-    /// @todo currently, we always disable USB UI on XPCOM-based hosts because
-    /// QueryInterface on CUSBDeviceFilter doesn't return CHostUSBDeviceFilter
-    /// for host filters (most likely, our XPCOM/IPC/DCONNECT bug).
-
 #ifdef DEBUG_dmik
-#ifdef Q_OS_WIN32
     CHost host = vboxGlobal().virtualBox().GetHost();
     CHostUSBDeviceFilterCollection coll = host.GetUSBDeviceFilters();
@@ -600 +595 @@
     {
 #endif
-#endif
         /* disable the USB host filters category if the USB is
          * not available (i.e. in VirtualBox OSE) */
@@ -612 +606 @@
 
 #ifdef DEBUG_dmik
-#ifdef Q_OS_WIN32
         /* Show an error message (if there is any).
          * This message box may be suppressed if the user wishes so. */
@@ -629 +622 @@
         lvUSBFilters_currentChanged (lvUSBFilters->firstChild());
     }
-#endif
 #endif
 
@@ -1035 +1027 @@
     /* fix for usb page */
 
-    /// @todo currently, we always disable USB UI on XPCOM-based hosts because
-    /// QueryInterface on CUSBDeviceFilter doesn't return CHostUSBDeviceFilter
-    /// for host filters (most likely, our XPCOM/IPC/DCONNECT bug).
-
 #ifdef DEBUG_dmik
-#ifdef Q_OS_WIN32
     CHost host = vboxGlobal().virtualBox().GetHost();
     CHostUSBDeviceFilterCollection coll = host.GetUSBDeviceFilters();
@@ -1046 +1033 @@
     {
 #endif
-#endif
         /* disable the USB host filters category if the USB is
          * not available (i.e. in VirtualBox OSE) */
@@ -1058 +1044 @@
 
 #ifdef DEBUG_dmik
-#ifdef Q_OS_WIN32
     }
 #endif
-#endif
-}
+}

trunk/src/VBox/Main/linux/server.cpp

@@ -165 +165 @@
 NS_IMPL_THREADSAFE_ISUPPORTS2_CI(HostUSBDevice, IUSBDevice, IHostUSBDevice)
 NS_DECL_CLASSINFO(HostUSBDeviceFilter)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(HostUSBDeviceFilter, IHostUSBDeviceFilter)
+NS_IMPL_THREADSAFE_ISUPPORTS2_CI(HostUSBDeviceFilter, IUSBDeviceFilter, IHostUSBDeviceFilter)
 NS_DECL_CLASSINFO(AudioAdapter)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(AudioAdapter, IAudioAdapter)