Changeset 7207 in vbox for trunk/src/VBox/Frontends/VBoxBFE/HostUSBImpl.cpp

Timestamp:

Feb 28, 2008 6:43:08 PM (17 years ago)

Author:

vboxsync

Message:

Main: Reworked enums to avoid 1) weird duplication of enum name when referring to enum values in cross-platform code; 2) possible clashes on Win32 due to putting identifiers like Paused or Disabled to the global namespace (via C enums). In the new style, enums are used like this: a) USBDeviceState_T v = USBDeviceState_Busy from cross-platform non-Qt code; b) KUSBDeviceState v = KUSBDeviceState_Busy from Qt code; c) USBDeviceState v = USBDeviceState_Busy from plain Win32 and d) PRUInt32 USBDeviceState v = USBDeviceState::Busy from plain XPCOM.

File:

• trunk/src/VBox/Frontends/VBoxBFE/HostUSBImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBFE/HostUSBImpl.cpp

@@ -216 +216 @@
      */
     USBDeviceState_T eState = hostDevice->state();
-    if (eState != USBDeviceState_USBDeviceBusy &&
-        eState != USBDeviceState_USBDeviceAvailable &&
-        eState != USBDeviceState_USBDeviceHeld)
+    if (eState != USBDeviceState_Busy &&
+        eState != USBDeviceState_Available &&
+        eState != USBDeviceState_Held)
         return setError (E_FAIL,
                          tr ("Device is not in a capturable state"));