Changeset 7207 in vbox for trunk/src/VBox/Frontends/VBoxBFE/HostUSBDeviceImpl.h

Timestamp:

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

Author:

vboxsync

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

28520

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/HostUSBDeviceImpl.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxBFE/HostUSBDeviceImpl.h

@@ -42 +42 @@
     /** Not supported by the VirtualBox server, not available to
         guests. */
-    USBDeviceState_USBDeviceNotSupported,
+    USBDeviceState_NotSupported,
     /** Being used by the host computer exclusively, not available
         to guests. */
-    USBDeviceState_USBDeviceUnavailable,
+    USBDeviceState_Unavailable,
     /** Being used by the host computer, potentially available to
        guests. */
-    USBDeviceState_USBDeviceBusy,
+    USBDeviceState_Busy,
     /** Not used by the host computer, available to guests. The
         host computer can also start using the device at any time. */
-    USBDeviceState_USBDeviceAvailable,
+    USBDeviceState_Available,
     /** Held by the VirtualBox server (ignored by the host computer),
         available to guests. */
-    USBDeviceState_USBDeviceHeld,
+    USBDeviceState_Held,
     /** Captured by one of the guest computers, not available to
         anybody else. */
-    USBDeviceState_USBDeviceCaptured
+    USBDeviceState_Captured
 } USBDeviceState_T;
 
@@ -97 +97 @@
     void setCaptured ();
     bool isCaptured()
-        { return mState == USBDeviceState_USBDeviceCaptured; }
+        { return mState == USBDeviceState_Captured; }
     int  setHostDriven();
     int  reset();