Changeset 7207 in vbox for trunk/src/VBox/Main

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.

Location:

trunk/src/VBox/Main

Files:

• AudioAdapterImpl.cpp (modified) (17 diffs)
• BIOSSettingsImpl.cpp (modified) (8 diffs)
• ConsoleImpl.cpp (modified) (27 diffs)
• ConsoleImpl2.cpp (modified) (24 diffs)
• DisplayImpl.cpp (modified) (13 diffs)
• HardDiskAttachmentImpl.cpp (modified) (1 diff)
• HardDiskImpl.cpp (modified) (15 diffs)
• HostImpl.cpp (modified) (14 diffs)
• HostUSBDeviceImpl.cpp (modified) (27 diffs)
• MachineImpl.cpp (modified) (72 diffs)
• NetworkAdapterImpl.cpp (modified) (20 diffs)
• RemoteUSBDeviceImpl.cpp (modified) (1 diff)
• SerialPortImpl.cpp (modified) (14 diffs)
• SessionImpl.cpp (modified) (31 diffs)
• USBDeviceFilterImpl.cpp (modified) (3 diffs)
• USBProxyService.cpp (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (9 diffs)
• idl/VirtualBox.xidl (modified) (65 diffs)
• idl/midl.xsl (modified) (2 diffs)
• include/AudioAdapterImpl.h (modified) (1 diff)
• include/BIOSSettingsImpl.h (modified) (1 diff)
• include/HardDiskImpl.h (modified) (7 diffs)
• include/MachineImpl.h (modified) (4 diffs)
• include/NetworkAdapterImpl.h (modified) (1 diff)
• include/RemoteUSBDeviceImpl.h (modified) (1 diff)
• include/SerialPortImpl.h (modified) (1 diff)
• include/USBDeviceFilterImpl.h (modified) (1 diff)
• testcase/tstAPI.cpp (modified) (2 diffs)
• testcase/tstVBoxAPILinux.cpp (modified) (2 diffs)

trunk/src/VBox/Main/AudioAdapterImpl.cpp

@@ -225 +225 @@
         switch (aAudioDriver)
         {
-            case AudioDriverType_NullAudioDriver:
+            case AudioDriverType_Null:
 #ifdef RT_OS_WINDOWS
 # ifdef VBOX_WITH_WINMM
-            case AudioDriverType_WINMMAudioDriver:
-# endif
-            case AudioDriverType_DSOUNDAudioDriver:
+            case AudioDriverType_WINMM:
+# endif
+            case AudioDriverType_DSOUND:
 #endif /* RT_OS_WINDOWS */
 #ifdef RT_OS_LINUX
-            case AudioDriverType_OSSAudioDriver:
+            case AudioDriverType_OSS:
 # ifdef VBOX_WITH_ALSA
-            case AudioDriverType_ALSAAudioDriver:
+            case AudioDriverType_ALSA:
 # endif
 # ifdef VBOX_WITH_PULSE
-            case AudioDriverType_PulseAudioDriver:
+            case AudioDriverType_Pulse:
 # endif
 #endif /* RT_OS_LINUX */
 #ifdef RT_OS_DARWIN
-            case AudioDriverType_CoreAudioDriver:
-#endif 
+            case AudioDriverType_Core:
+#endif
 #ifdef RT_OS_OS2
-            case AudioDriverType_MMPMAudioDriver:
-#endif 
+            case AudioDriverType_MMPM:
+#endif
             {
                 mData.backup();
@@ -324 +324 @@
 /////////////////////////////////////////////////////////////////////////////
 
-/** 
+/**
  *  Loads settings from the given machine node.
  *  May be called once right after this object creation.
- * 
+ *
  *  @param aMachineNode <Machine> node.
- * 
- *  @note Locks this object for writing. 
+ *
+ *  @note Locks this object for writing.
  */
 HRESULT AudioAdapter::loadSettings (const settings::Key &aMachineNode)
@@ -352 +352 @@
      * place when a setting of a newly created object must default to A while
      * the same setting of an object loaded from the old settings file must
-     * default to B. */ 
+     * default to B. */
 
     /* AudioAdapter node (required) */
@@ -369 +369 @@
     /* now check the audio driver (required) */
     const char *driver = audioAdapterNode.stringValue ("driver");
-    mData->mAudioDriver = AudioDriverType_NullAudioDriver;
+    mData->mAudioDriver = AudioDriverType_Null;
     if      (strcmp (driver, "null") == 0)
         ; /* Null has been set above */
@@ -375 +375 @@
     else if (strcmp (driver, "winmm") == 0)
 #ifdef VBOX_WITH_WINMM
-        mData->mAudioDriver = AudioDriverType_WINMMAudioDriver;
+        mData->mAudioDriver = AudioDriverType_WINMM;
 #else
         /* fall back to dsound */
-        mData->mAudioDriver = AudioDriverType_DSOUNDAudioDriver;
+        mData->mAudioDriver = AudioDriverType_DSOUND;
 #endif
     else if (strcmp (driver, "dsound") == 0)
-        mData->mAudioDriver = AudioDriverType_DSOUNDAudioDriver;
+        mData->mAudioDriver = AudioDriverType_DSOUND;
 #endif // RT_OS_WINDOWS
 #ifdef RT_OS_LINUX
     else if (strcmp (driver, "oss") == 0)
-        mData->mAudioDriver = AudioDriverType_OSSAudioDriver;
+        mData->mAudioDriver = AudioDriverType_OSS;
     else if (strcmp (driver, "alsa") == 0)
 # ifdef VBOX_WITH_ALSA
-        mData->mAudioDriver = AudioDriverType_ALSAAudioDriver;
+        mData->mAudioDriver = AudioDriverType_ALSA;
 # else
         /* fall back to OSS */
-        mData->mAudioDriver = AudioDriverType_OSSAudioDriver;
+        mData->mAudioDriver = AudioDriverType_OSS;
 # endif
     else if (strcmp (driver, "pulse") == 0)
 # ifdef VBOX_WITH_PULSE
-        mData->mAudioDriver = AudioDriverType_PulseAudioDriver;
+        mData->mAudioDriver = AudioDriverType_Pulse;
 # else
         /* fall back to OSS */
-        mData->mAudioDriver = AudioDriverType_OSSAudioDriver;
+        mData->mAudioDriver = AudioDriverType_OSS;
 # endif
 #endif // RT_OS_LINUX
 #ifdef RT_OS_DARWIN
     else if (strcmp (driver, "coreaudio") == 0)
-        mData->mAudioDriver = AudioDriverType_CoreAudioDriver;
+        mData->mAudioDriver = AudioDriverType_Core;
 #endif
 #ifdef RT_OS_OS2
     else if (strcmp (driver, "mmpm") == 0)
-        mData->mAudioDriver = AudioDriverType_MMPMAudioDriver;
+        mData->mAudioDriver = AudioDriverType_MMPM;
 #endif
     else
@@ -415 +415 @@
 }
 
-/** 
+/**
  *  Saves settings to the given machine node.
- * 
+ *
  *  @param aMachineNode <Machine> node.
- * 
- *  @note Locks this object for reading. 
+ *
+ *  @note Locks this object for reading.
  */
 HRESULT AudioAdapter::saveSettings (settings::Key &aMachineNode)
@@ -454 +454 @@
     switch (mData->mAudioDriver)
     {
-        case AudioDriverType_NullAudioDriver:
+        case AudioDriverType_Null:
         {
             driverStr = "null";
@@ -460 +460 @@
         }
 #ifdef RT_OS_WINDOWS
-            case AudioDriverType_WINMMAudioDriver:
+            case AudioDriverType_WINMM:
 # ifdef VBOX_WITH_WINMM
             {
@@ -467 +467 @@
             }
 # endif
-            case AudioDriverType_DSOUNDAudioDriver:
+            case AudioDriverType_DSOUND:
             {
                 driverStr = "dsound";
@@ -474 +474 @@
 #endif /* RT_OS_WINDOWS */
 #ifdef RT_OS_LINUX
-            case AudioDriverType_ALSAAudioDriver:
+            case AudioDriverType_ALSA:
 # ifdef VBOX_WITH_ALSA
             {
@@ -481 +481 @@
             }
 # endif
-            case AudioDriverType_PulseAudioDriver:
+            case AudioDriverType_Pulse:
 # ifdef VBOX_WITH_PULSE
             {
@@ -488 +488 @@
             }
 # endif
-            case AudioDriverType_OSSAudioDriver:
+            case AudioDriverType_OSS:
             {
                 driverStr = "oss";
@@ -495 +495 @@
 #endif /* RT_OS_LINUX */
 #ifdef RT_OS_DARWIN
-            case AudioDriverType_CoreAudioDriver:
+            case AudioDriverType_Core:
             {
                 driverStr = "coreaudio";
@@ -502 +502 @@
 #endif
 #ifdef RT_OS_OS2
-            case AudioDriverType_MMPMAudioDriver:
+            case AudioDriverType_MMPM:
             {
                 driverStr = "mmpm";
@@ -520 +520 @@
 }
 
-/** 
+/**
  *  @note Locks this object for writing.
  */
@@ -544 +544 @@
 }
 
-/** 
+/**
  *  @note Locks this object for writing, together with the peer object (also
  *  for writing) if there is one.
@@ -572 +572 @@
 }
 
-/** 
+/**
  *  @note Locks this object for writing, together with the peer object
  *  represented by @a aThat (locked for reading).

trunk/src/VBox/Main/BIOSSettingsImpl.cpp

@@ -434 +434 @@
     switch (aControllerType)
     {
-        case IDEControllerType_IDEControllerPIIX3:
-        case IDEControllerType_IDEControllerPIIX4:
+        case IDEControllerType_PIIX3:
+        case IDEControllerType_PIIX4:
             break;
         default:
@@ -441 +441 @@
                 tr("Invalid IDE controller type '%d'"),
                 aControllerType);
-    }    
+    }
 
     mData.backup();
@@ -489 +489 @@
 /////////////////////////////////////////////////////////////////////////////
 
-/** 
+/**
  *  Loads settings from the given machine node.
  *  May be called once right after this object creation.
- * 
+ *
  *  @param aMachineNode <Machine> node.
- * 
- *  @note Locks this object for writing. 
+ *
+ *  @note Locks this object for writing.
  */
 HRESULT BIOSSettings::loadSettings (const settings::Key &aMachineNode)
@@ -517 +517 @@
      * place when a setting of a newly created object must default to A while
      * the same setting of an object loaded from the old settings file must
-     * default to B. */ 
+     * default to B. */
 
     /* BIOS node (required) */
@@ -585 +585 @@
      * defaults to PIIX3) */
     {
-        mData->mIDEControllerType = IDEControllerType_IDEControllerPIIX3;
+        mData->mIDEControllerType = IDEControllerType_PIIX3;
 
         Key ideControllerNode = biosNode.findKey ("IDEController");
@@ -592 +592 @@
             const char *typeStr = ideControllerNode.stringValue ("type");
             if (strcmp (typeStr, "PIIX3") == 0)
-                mData->mIDEControllerType = IDEControllerType_IDEControllerPIIX3;
+                mData->mIDEControllerType = IDEControllerType_PIIX3;
             else if (strcmp (typeStr, "PIIX4") == 0)
-                mData->mIDEControllerType = IDEControllerType_IDEControllerPIIX4;
+                mData->mIDEControllerType = IDEControllerType_PIIX4;
             else
                 ComAssertMsgFailedRet (("Invalid boot menu mode '%s'\n", typeStr),
@@ -604 +604 @@
 }
 
-/** 
+/**
  *  Saves settings to the given machine node.
- * 
+ *
  *  @param aMachineNode <Machine> node.
- * 
- *  @note Locks this object for reading. 
+ *
+ *  @note Locks this object for reading.
  */
 HRESULT BIOSSettings::saveSettings (settings::Key &aMachineNode)
@@ -686 +686 @@
         switch (mData->mIDEControllerType)
         {
-            case IDEControllerType_IDEControllerPIIX3:
+            case IDEControllerType_PIIX3:
                 ideControllerTypeStr = "PIIX3";
                 break;
-            case IDEControllerType_IDEControllerPIIX4:
+            case IDEControllerType_PIIX4:
                 ideControllerTypeStr = "PIIX4";
                 break;

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -189 +189 @@
         : VMProgressTask (aConsole, aProgress, true /* aUsesVMPtr */)
         , mIsSnapshot (false)
-        , mLastMachineState (MachineState_InvalidMachineState) {}
+        , mLastMachineState (MachineState_Null) {}
 
     bool mIsSnapshot;
@@ -477 +477 @@
     AssertComRCReturn (hrc, VERR_ACCESS_DENIED);
 
-    VRDPAuthType_T authType = VRDPAuthType_VRDPAuthNull;
+    VRDPAuthType_T authType = VRDPAuthType_Null;
     hrc = mVRDPServer->COMGETTER(AuthType) (&authType);
     AssertComRCReturn (hrc, VERR_ACCESS_DENIED);
@@ -492 +492 @@
     LogRel (("VRDPAUTH: User: [%s]. Domain: [%s]. Authentication type: [%s]\n",
                 pszUser, pszDomain,
-                authType == VRDPAuthType_VRDPAuthNull?
+                authType == VRDPAuthType_Null?
                     "null":
-                    (authType == VRDPAuthType_VRDPAuthExternal?
+                    (authType == VRDPAuthType_External?
                         "external":
-                        (authType == VRDPAuthType_VRDPAuthGuest?
+                        (authType == VRDPAuthType_Guest?
                             "guest":
                             "INVALID"
@@ -526 +526 @@
     switch (authType)
     {
-        case VRDPAuthType_VRDPAuthNull:
+        case VRDPAuthType_Null:
         {
             result = VRDPAuthAccessGranted;
@@ -532 +532 @@
         }
 
-        case VRDPAuthType_VRDPAuthExternal:
+        case VRDPAuthType_External:
         {
             /* Call the external library. */
@@ -547 +547 @@
         } /* pass through */
 
-        case VRDPAuthType_VRDPAuthGuest:
+        case VRDPAuthType_Guest:
         {
             guestJudgement = VRDPAuthGuestNotReacted;
@@ -590 +590 @@
             }
 
-            if (authType == VRDPAuthType_VRDPAuthExternal)
+            if (authType == VRDPAuthType_External)
             {
                 LogRel(("VRDPAUTH: Guest judgement %d.\n", guestJudgement));
@@ -709 +709 @@
     AssertComRC (hrc);
 
-    VRDPAuthType_T authType = VRDPAuthType_VRDPAuthNull;
+    VRDPAuthType_T authType = VRDPAuthType_Null;
     hrc = mVRDPServer->COMGETTER(AuthType) (&authType);
     AssertComRC (hrc);
 
-    if (authType == VRDPAuthType_VRDPAuthExternal)
+    if (authType == VRDPAuthType_External)
         mConsoleVRDPServer->AuthDisconnect (uuid, u32ClientId);
 
@@ -1266 +1266 @@
         switch (netattach)
         {
-            case NetworkAttachmentType_HostInterfaceNetworkAttachment:
+            case NetworkAttachmentType_HostInterface:
             {
 #ifdef RT_OS_WINDOWS
@@ -1853 +1853 @@
     switch (aDeviceType)
     {
-        case DeviceType_FloppyDevice:
+        case DeviceType_Floppy:
         {
             for (unsigned i = 0; i < ELEMENTS(mapFDLeds); i++)
@@ -1860 +1860 @@
         }
 
-        case DeviceType_DVDDevice:
+        case DeviceType_DVD:
         {
             SumLed.u32 |= readAndClearLed(mapIDELeds[2]);
@@ -1866 +1866 @@
         }
 
-        case DeviceType_HardDiskDevice:
+        case DeviceType_HardDisk:
         {
             SumLed.u32 |= readAndClearLed(mapIDELeds[0]);
@@ -1874 +1874 @@
         }
 
-        case DeviceType_NetworkDevice:
+        case DeviceType_Network:
         {
             for (unsigned i = 0; i < ELEMENTS(mapNetworkLeds); i++)
@@ -1881 +1881 @@
         }
 
-        case DeviceType_USBDevice:
+        case DeviceType_USB:
         {
             SumLed.u32 |= readAndClearLed(mapUSBLed);
@@ -1887 +1887 @@
         }
 
-        case DeviceType_SharedFolderDevice:
+        case DeviceType_SharedFolder:
         {
             SumLed.u32 |= readAndClearLed(mapSharedFolderLed);
@@ -1902 +1902 @@
     {
         case 0:
-            *aDeviceActivity = DeviceActivity_DeviceIdle;
+            *aDeviceActivity = DeviceActivity_Idle;
             break;
         case PDMLED_READING:
-            *aDeviceActivity = DeviceActivity_DeviceReading;
+            *aDeviceActivity = DeviceActivity_Reading;
             break;
         case PDMLED_WRITING:
         case PDMLED_READING | PDMLED_WRITING:
-            *aDeviceActivity = DeviceActivity_DeviceWriting;
+            *aDeviceActivity = DeviceActivity_Writing;
             break;
     }
@@ -2111 +2111 @@
         CallbackList::iterator it = mCallbacks.begin();
         while (it != mCallbacks.end())
-            (*it++)->OnSharedFolderChange (Scope_SessionScope);
+            (*it++)->OnSharedFolderChange (Scope_Session);
     }
 
@@ -2170 +2170 @@
         CallbackList::iterator it = mCallbacks.begin();
         while (it != mCallbacks.end())
-            (*it++)->OnSharedFolderChange (Scope_SessionScope);
+            (*it++)->OnSharedFolderChange (Scope_Session);
     }
 
@@ -2369 +2369 @@
             mMachineState);
 
-    MachineState_T machineState = MachineState_InvalidMachineState;
+    MachineState_T machineState = MachineState_Null;
     HRESULT rc = mControl->DiscardSnapshot (this, aId, &machineState, aProgress);
     CheckComRCReturnRC (rc);
@@ -2390 +2390 @@
             mMachineState);
 
-    MachineState_T machineState = MachineState_InvalidMachineState;
+    MachineState_T machineState = MachineState_Null;
     HRESULT rc = mControl->DiscardCurrentState (this, &machineState, aProgress);
     CheckComRCReturnRC (rc);
@@ -2411 +2411 @@
             mMachineState);
 
-    MachineState_T machineState = MachineState_InvalidMachineState;
+    MachineState_T machineState = MachineState_Null;
     HRESULT rc =
         mControl->DiscardCurrentSnapshotAndState (this, &machineState, aProgress);
@@ -3350 +3350 @@
         CallbackList::iterator it = mCallbacks.begin();
         while (it != mCallbacks.end())
-            (*it++)->OnSharedFolderChange (aGlobal ? (Scope_T)Scope_GlobalScope
-                                                   : (Scope_T)Scope_MachineScope);
+            (*it++)->OnSharedFolderChange (aGlobal ? (Scope_T) Scope_Global
+                                                   : (Scope_T) Scope_Machine);
     }
 
@@ -4244 +4244 @@
              *  can lead to various unexpected results (like the machine state being
              *  >= MachineState_Running on the server, while the session state is
-             *  already SessionState_SessionClosed at the same time there).
+             *  already SessionState_Closed at the same time there).
              *
              *  Cross-lock conditions should be carefully watched out: calling
@@ -5140 +5140 @@
     NetworkAttachmentType_T attachment;
     networkAdapter->COMGETTER(AttachmentType)(&attachment);
-    Assert(attachment == NetworkAttachmentType_HostInterfaceNetworkAttachment);
+    Assert(attachment == NetworkAttachmentType_HostInterface);
 #endif /* DEBUG */
 
@@ -5339 +5339 @@
     NetworkAttachmentType_T attachment;
     networkAdapter->COMGETTER(AttachmentType)(&attachment);
-    Assert(attachment == NetworkAttachmentType_HostInterfaceNetworkAttachment);
+    Assert(attachment == NetworkAttachmentType_HostInterface);
 #endif /* DEBUG */
 
@@ -5449 +5449 @@
         NetworkAttachmentType_T attachment;
         networkAdapter->COMGETTER(AttachmentType)(&attachment);
-        if (attachment == NetworkAttachmentType_HostInterfaceNetworkAttachment)
+        if (attachment == NetworkAttachmentType_HostInterface)
         {
             HRESULT rc2 = detachFromHostInterface(networkAdapter);
@@ -6127 +6127 @@
     switch (enmCtl)
     {
-        case DiskControllerType_IDE0Controller:
+        case DiskControllerType_IDE0:
             i = 0;
             break;
-        case DiskControllerType_IDE1Controller:
+        case DiskControllerType_IDE1:
             i = 2;
             break;

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -150 +150 @@
 
     /* hardware virtualization extensions */
-    TriStateBool_T hwVirtExEnabled;
+    TSBool_T hwVirtExEnabled;
     BOOL fHWVirtExEnabled;
     hrc = pMachine->COMGETTER(HWVirtExEnabled)(&hwVirtExEnabled);                   H();
-    if (hwVirtExEnabled == TriStateBool_TSDefault)
+    if (hwVirtExEnabled == TSBool_Default)
     {
         /* check the default value */
@@ -159 +159 @@
     }
     else
-        fHWVirtExEnabled = (hwVirtExEnabled == TriStateBool_TSTrue);
+        fHWVirtExEnabled = (hwVirtExEnabled == TSBool_True);
 #ifndef RT_OS_DARWIN /** @todo Implement HWVirtExt on darwin. See #1865. */
     if (fHWVirtExEnabled)
@@ -183 +183 @@
     switch (controllerType)
     {
-        case IDEControllerType_IDEControllerPIIX3:
+        case IDEControllerType_PIIX3:
             fPIIX4 = FALSE;
             break;
-        case IDEControllerType_IDEControllerPIIX4:
+        case IDEControllerType_PIIX4:
             fPIIX4 = TRUE;
             break;
@@ -267 +267 @@
         switch (bootDevice)
         {
-            case DeviceType_NoDevice:
+            case DeviceType_Null:
                 pszBootDevice = "NONE";
                 break;
-            case DeviceType_HardDiskDevice:
+            case DeviceType_HardDisk:
                 pszBootDevice = "IDE";
                 break;
-            case DeviceType_DVDDevice:
+            case DeviceType_DVD:
                 pszBootDevice = "DVD";
                 break;
-            case DeviceType_FloppyDevice:
+            case DeviceType_Floppy:
                 pszBootDevice = "FLOPPY";
                 break;
-            case DeviceType_NetworkDevice:
+            case DeviceType_Network:
                 pszBootDevice = "LAN";
                 break;
@@ -611 +611 @@
         switch (enmCtl)
         {
-            case DiskControllerType_IDE0Controller:
+            case DiskControllerType_IDE0:
                 i = 0;
                 break;
-            case DiskControllerType_IDE1Controller:
+            case DiskControllerType_IDE1:
                 i = 2;
                 break;
@@ -867 +867 @@
         switch (adapterType)
         {
-            case NetworkAdapterType_NetworkAdapterAm79C970A:
-            case NetworkAdapterType_NetworkAdapterAm79C973:
+            case NetworkAdapterType_Am79C970A:
+            case NetworkAdapterType_Am79C973:
                 pDev = pDevPCNet;
                 break;
 #ifdef VBOX_WITH_E1000
-            case NetworkAdapterType_NetworkAdapter82540EM:
+            case NetworkAdapterType_I82540EM:
                 pDev = pDevE1000;
                 break;
@@ -899 +899 @@
         switch (adapterType)
         {
-            case NetworkAdapterType_NetworkAdapterAm79C970A:
+            case NetworkAdapterType_Am79C970A:
                 rc = CFGMR3InsertInteger(pCfg, "Am79C973", 0);                      RC_CHECK();
                 break;
-            case NetworkAdapterType_NetworkAdapterAm79C973:
+            case NetworkAdapterType_Am79C973:
                 rc = CFGMR3InsertInteger(pCfg, "Am79C973", 1);                      RC_CHECK();
                 break;
@@ -977 +977 @@
         switch (networkAttachment)
         {
-            case NetworkAttachmentType_NoNetworkAttachment:
-                break;
-
-            case NetworkAttachmentType_NATNetworkAttachment:
+            case NetworkAttachmentType_Null:
+                break;
+
+            case NetworkAttachmentType_NAT:
             {
                 if (fSniffer)
@@ -1015 +1015 @@
             }
 
-            case NetworkAttachmentType_HostInterfaceNetworkAttachment:
+            case NetworkAttachmentType_HostInterface:
             {
                 /*
@@ -1126 +1126 @@
             }
 
-            case NetworkAttachmentType_InternalNetworkAttachment:
+            case NetworkAttachmentType_Internal:
             {
                 hrc = networkAdapter->COMGETTER(InternalNetwork)(&str);                 H();
@@ -1185 +1185 @@
         rc = CFGMR3InsertInteger(pCfg,   "IRQ", ulIRQ);                             RC_CHECK();
         rc = CFGMR3InsertInteger(pCfg,   "IOBase", ulIOBase);                       RC_CHECK();
-        if (HostMode != PortMode_DisconnectedPort)
+        if (HostMode != PortMode_Disconnected)
         {
             rc = CFGMR3InsertNode(pInst,     "LUN#0", &pLunL0);                     RC_CHECK();
-            if (HostMode == PortMode_HostPipePort)
+            if (HostMode == PortMode_HostPipe)
             {
                 rc = CFGMR3InsertString(pLunL0,  "Driver", "Char");                 RC_CHECK();
@@ -1197 +1197 @@
                 rc = CFGMR3InsertInteger(pLunL2, "IsServer", fServer);              RC_CHECK();
             }
-            else if (HostMode == PortMode_HostDevicePort)
+            else if (HostMode == PortMode_HostDevice)
             {
                 rc = CFGMR3InsertString(pLunL0,  "Driver", "Host Serial");          RC_CHECK();
@@ -1335 +1335 @@
         switch (audioDriver)
         {
-            case AudioDriverType_NullAudioDriver:
+            case AudioDriverType_Null:
             {
                 rc = CFGMR3InsertString(pCfg, "AudioDriver", "null");                   RC_CHECK();
@@ -1342 +1342 @@
 #ifdef RT_OS_WINDOWS
 #ifdef VBOX_WITH_WINMM
-            case AudioDriverType_WINMMAudioDriver:
+            case AudioDriverType_WINMM:
             {
                 rc = CFGMR3InsertString(pCfg, "AudioDriver", "winmm");                  RC_CHECK();
@@ -1348 +1348 @@
             }
 #endif
-            case AudioDriverType_DSOUNDAudioDriver:
+            case AudioDriverType_DSOUND:
             {
                 rc = CFGMR3InsertString(pCfg, "AudioDriver", "dsound");                 RC_CHECK();
@@ -1355 +1355 @@
 #endif /* RT_OS_WINDOWS */
 #ifdef RT_OS_LINUX
-            case AudioDriverType_OSSAudioDriver:
+            case AudioDriverType_OSS:
             {
                 rc = CFGMR3InsertString(pCfg, "AudioDriver", "oss");                    RC_CHECK();
@@ -1361 +1361 @@
             }
 # ifdef VBOX_WITH_ALSA
-            case AudioDriverType_ALSAAudioDriver:
+            case AudioDriverType_ALSA:
             {
                 rc = CFGMR3InsertString(pCfg, "AudioDriver", "alsa");                   RC_CHECK();
@@ -1368 +1368 @@
 # endif
 # ifdef VBOX_WITH_PULSE
-            case AudioDriverType_PulseAudioDriver:
+            case AudioDriverType_Pulse:
             {
                 rc = CFGMR3InsertString(pCfg, "AudioDriver", "pulse");                  RC_CHECK();
@@ -1376 +1376 @@
 #endif /* RT_OS_LINUX */
 #ifdef RT_OS_DARWIN
-            case AudioDriverType_CoreAudioDriver:
+            case AudioDriverType_Core:
             {
                 rc = CFGMR3InsertString(pCfg, "AudioDriver", "coreaudio");              RC_CHECK();
@@ -1472 +1472 @@
      */
     {
-        ClipboardMode_T mode = ClipboardMode_ClipDisabled;
+        ClipboardMode_T mode = ClipboardMode_Disabled;
         hrc = pMachine->COMGETTER(ClipboardMode) (&mode);                               H();
 
-        if (mode != ClipboardMode_ClipDisabled)
+        if (mode != ClipboardMode_Disabled)
         {
             /* Load the service */
@@ -1496 +1496 @@
                 {
                     default:
-                    case ClipboardMode_ClipDisabled:
+                    case ClipboardMode_Disabled:
                     {
                         LogRel(("VBoxSharedClipboard mode: Off\n"));
@@ -1502 +1502 @@
                         break;
                     }
-                    case ClipboardMode_ClipGuestToHost:
+                    case ClipboardMode_GuestToHost:
                     {
                         LogRel(("VBoxSharedClipboard mode: Guest to Host\n"));
@@ -1508 +1508 @@
                         break;
                     }
-                    case ClipboardMode_ClipHostToGuest:
+                    case ClipboardMode_HostToGuest:
                     {
                         LogRel(("VBoxSharedClipboard mode: Host to Guest\n"));
@@ -1514 +1514 @@
                         break;
                     }
-                    case ClipboardMode_ClipBidirectional:
+                    case ClipboardMode_Bidirectional:
                     {
                         LogRel(("VBoxSharedClipboard mode: Bidirectional\n"));

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -242 +242 @@
 /**
  *  Handles display resize event.
- *  Disables access to VGA device; 
+ *  Disables access to VGA device;
  *  calls the framebuffer RequestResize method;
  *  if framebuffer resizes synchronously,
@@ -282 +282 @@
             break;
         default:
-            pixelFormat = FramebufferPixelFormat_PixelFormatOpaque;
+            pixelFormat = FramebufferPixelFormat_Opaque;
             bpp = cbLine = 0;
             break;
@@ -331 +331 @@
 {
     LogFlowFunc(("\n"));
-    
+
     unsigned uScreenId;
     for (uScreenId = 0; uScreenId < mcMonitors; uScreenId++)
@@ -350 +350 @@
             /* Primary framebuffer has completed the resize. Update the connector data for VGA device. */
             updateDisplayData();
-    
+
             /* Check the framebuffer pixel format to setup the rendering in VGA device. */
             BOOL usesGuestVRAM = FALSE;
@@ -542 +542 @@
     prgn->pDisplay = pd;
     prgn->pPort = pp;
-    
+
     unsigned uScreenId;
     for (uScreenId = 0; uScreenId < cMonitors; uScreenId++)
@@ -794 +794 @@
                 ASMAtomicIncS32 (&mcVideoAccelVRDPRefs):
                 ASMAtomicDecS32 (&mcVideoAccelVRDPRefs);
-                
+
     Assert (c >= 0);
-    
+
     if (c == 0)
     {
-        /* The last client has disconnected, and the accel can be 
+        /* The last client has disconnected, and the accel can be
          * disabled.
          */
         Assert (fEnable == false);
-        
+
         mfVideoAccelVRDP = false;
         mfu32SupportedOrders = 0;
-        
+
         vbvaSetMemoryFlags (mpVbvaMemory, mfVideoAccelEnabled, mfVideoAccelVRDP, mfu32SupportedOrders, maFramebuffers, mcMonitors);
-        
+
         LogRel(("VBVA: VRDP acceleration has been disabled.\n"));
     }
@@ -814 +814 @@
              && !mfVideoAccelVRDP)
     {
-        /* The first client has connected. Enable the accel. 
+        /* The first client has connected. Enable the accel.
          */
         Assert (fEnable == true);
-        
+
         mfVideoAccelVRDP = true;
         /* Supporting all orders. */
         mfu32SupportedOrders = ~0;
-        
+
         vbvaSetMemoryFlags (mpVbvaMemory, mfVideoAccelEnabled, mfVideoAccelVRDP, mfu32SupportedOrders, maFramebuffers, mcMonitors);
-    
+
         LogRel(("VBVA: VRDP acceleration has been requested.\n"));
     }
     else
     {
-        /* A client is connected or disconnected but there is no change in the 
+        /* A client is connected or disconnected but there is no change in the
          * accel state. It remains enabled.
          */
@@ -1190 +1190 @@
             phdr->w = (uint16_t)w;
             phdr->h = (uint16_t)h;
-            
+
             DISPLAYFBINFO *pFBInfo = &maFramebuffers[uScreenId];
 
@@ -1212 +1212 @@
                 /* Forward the command to VRDP server. */
                 mParent->consoleVRDPServer()->SendUpdate (uScreenId, phdr, cbCmd);
-                
+
                 *phdr = hdrSaved;
             }
@@ -2161 +2161 @@
          uint8_t *pu8 = (uint8_t *)pvVRAM;
          pu8 += u32VRAMSize - VBOX_VIDEO_ADAPTER_INFORMATION_SIZE;
-         
+
          // @todo
          uint8_t *pu8End = pu8 + VBOX_VIDEO_ADAPTER_INFORMATION_SIZE;
 
          VBOXVIDEOINFOHDR *pHdr;
-    
+
          for (;;)
          {
              pHdr = (VBOXVIDEOINFOHDR *)pu8;
              pu8 += sizeof (VBOXVIDEOINFOHDR);
-             
+
              if (pu8 >= pu8End)
              {
@@ -2218 +2218 @@
                          pConf32->u32Value = pDrv->pDisplay->mcMonitors;
                      } break;
-                     
+
                      case VBOX_VIDEO_QCI32_OFFSCREEN_HEAP_SIZE:
                      {
@@ -2224 +2224 @@
                          pConf32->u32Value = _1M;
                      } break;
-                     
+
                      default:
                          LogRel(("VBoxVideo: CONF32 %d not supported!!! Skipping.\n", pConf32->u32Index));
@@ -2269 +2269 @@
     uint8_t *pu8 = (uint8_t *)pvVRAM;
     pu8 += pFBInfo->u32Offset + pFBInfo->u32MaxFramebufferSize;
-         
+
     // @todo
     uint8_t *pu8End = pu8 + pFBInfo->u32InformationSize;
 
     VBOXVIDEOINFOHDR *pHdr;
-    
+
     for (;;)
     {
         pHdr = (VBOXVIDEOINFOHDR *)pu8;
         pu8 += sizeof (VBOXVIDEOINFOHDR);
-             
+
         if (pu8 >= pu8End)
         {

trunk/src/VBox/Main/HardDiskAttachmentImpl.cpp

@@ -28 +28 @@
 HRESULT HardDiskAttachment::FinalConstruct()
 {
-    mController = DiskControllerType_InvalidController;
+    mController = DiskControllerType_Null;
     mDeviceNumber = 0;
 

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -102 +102 @@
 
     mStorageType = HardDiskStorageType_VirtualDiskImage;
-    mType = HardDiskType_NormalHardDisk;
+    mType = HardDiskType_Normal;
 
     mBusy = false;
@@ -888 +888 @@
     AutoLock chLock (childrenLock());
 
-    if (mParent.isNull() && mType == HardDiskType_NormalHardDisk &&
+    if (mParent.isNull() && mType == HardDiskType_Normal &&
         children().size() != 0)
     {
@@ -1220 +1220 @@
         const char *type = aHDNode.stringValue ("type");
         if (strcmp (type, "normal") == 0)
-            mType = HardDiskType_NormalHardDisk;
+            mType = HardDiskType_Normal;
         else if (strcmp (type, "immutable") == 0)
-            mType = HardDiskType_ImmutableHardDisk;
+            mType = HardDiskType_Immutable;
         else if (strcmp (type, "writethrough") == 0)
-            mType = HardDiskType_WritethroughHardDisk;
+            mType = HardDiskType_Writethrough;
         else
             ComAssertMsgFailedRet (("Invalid hard disk type '%s'\n", type),
@@ -1230 +1230 @@
     }
     else
-        mType = HardDiskType_NormalHardDisk;
+        mType = HardDiskType_Normal;
 
     HRESULT rc = mVirtualBox->registerHardDisk (this, VirtualBox::RHD_OnStartUp);
@@ -1279 +1279 @@
         switch (mType)
         {
-            case HardDiskType_NormalHardDisk:
+            case HardDiskType_Normal:
                 type = "normal";
                 break;
-            case HardDiskType_ImmutableHardDisk:
+            case HardDiskType_Immutable:
                 type = "immutable";
                 break;
-            case HardDiskType_WritethroughHardDisk:
+            case HardDiskType_Writethrough:
                 type = "writethrough";
                 break;
@@ -2876 +2876 @@
         CheckComRCBreakRC (rc);
 
-        if (mType != HardDiskType_WritethroughHardDisk)
+        if (mType != HardDiskType_Writethrough)
         {
             rc = setError (E_FAIL,
@@ -2921 +2921 @@
         mId.create();
         /* currently, all iSCSI hard disks are writethrough */
-        mType = HardDiskType_WritethroughHardDisk;
+        mType = HardDiskType_Writethrough;
         mRegistered = FALSE;
     }
@@ -3410 +3410 @@
  */
 HRESULT HVMDKImage::init (VirtualBox *aVirtualBox, HardDisk *aParent,
-                          const settings::Key &aHDNode, 
+                          const settings::Key &aHDNode,
                           const settings::Key &aVMDKNode)
 {
@@ -3445 +3445 @@
         CheckComRCBreakRC (rc);
 
-        if (mType != HardDiskType_WritethroughHardDisk)
+        if (mType != HardDiskType_Writethrough)
         {
             rc = setError (E_FAIL,
@@ -3507 +3507 @@
 
         /* currently, all VMDK hard disks are writethrough */
-        mType = HardDiskType_WritethroughHardDisk;
+        mType = HardDiskType_Writethrough;
 
         Assert (mId.isEmpty());
@@ -4334 +4334 @@
         CheckComRCBreakRC (rc);
 
-        if (mType != HardDiskType_WritethroughHardDisk)
+        if (mType != HardDiskType_Writethrough)
         {
             rc = setError (E_FAIL,
@@ -4396 +4396 @@
 
         /* currently, all custom hard disks are writethrough */
-        mType = HardDiskType_WritethroughHardDisk;
+        mType = HardDiskType_Writethrough;
 
         Assert (mId.isEmpty());
@@ -5112 +5112 @@
  */
 HRESULT HVHDImage::init (VirtualBox *aVirtualBox, HardDisk *aParent,
-                         const settings::Key &aHDNode, 
+                         const settings::Key &aHDNode,
                          const settings::Key &aVHDNode)
 {
@@ -5146 +5146 @@
         CheckComRCBreakRC (rc);
 
-        if (mType != HardDiskType_WritethroughHardDisk)
+        if (mType != HardDiskType_Writethrough)
         {
             rc = setError (E_FAIL,
@@ -5208 +5208 @@
 
         /* currently, all VHD hard disks are writethrough */
-        mType = HardDiskType_WritethroughHardDisk;
+        mType = HardDiskType_Writethrough;
 
         Assert (mId.isEmpty());

trunk/src/VBox/Main/HostImpl.cpp

@@ -1158 +1158 @@
 
         USBDeviceFilterAction_T action;
-        action = USBDeviceFilterAction_USBDeviceFilterIgnore;
+        action = USBDeviceFilterAction_Ignore;
         const char *actionStr = (*it).stringValue ("action");
         if (strcmp (actionStr, "Ignore") == 0)
-            action = USBDeviceFilterAction_USBDeviceFilterIgnore;
+            action = USBDeviceFilterAction_Ignore;
         else
         if (strcmp (actionStr, "Hold") == 0)
-            action = USBDeviceFilterAction_USBDeviceFilterHold;
+            action = USBDeviceFilterAction_Hold;
         else
             AssertMsgFailed (("Invalid action: '%s'\n", actionStr));
@@ -1242 +1242 @@
 
         /* action is mandatory */
-        if (data.mAction == USBDeviceFilterAction_USBDeviceFilterIgnore)
+        if (data.mAction == USBDeviceFilterAction_Ignore)
             filter.setStringValue ("action", "Ignore");
         else
-        if (data.mAction == USBDeviceFilterAction_USBDeviceFilterHold)
+        if (data.mAction == USBDeviceFilterAction_Hold)
             filter.setStringValue ("action", "Hold");
         else
@@ -1283 +1283 @@
 
         /* action is mandatory */
-        ULONG action = USBDeviceFilterAction_InvalidUSBDeviceFilterAction;
+        ULONG action = USBDeviceFilterAction_Null;
         (*it)->COMGETTER (Action) (&action);
-        if (action == USBDeviceFilterAction_USBDeviceFilterIgnore)
+        if (action == USBDeviceFilterAction_Ignore)
             filter.setStringValue ("action", "Ignore");
-        else if (action == USBDeviceFilterAction_USBDeviceFilterHold)
+        else if (action == USBDeviceFilterAction_Hold)
             filter.setStringValue ("action", "Hold");
         else
@@ -1341 +1341 @@
             device->name().raw(), id.raw());
 
-    if (device->state() == USBDeviceState_USBDeviceNotSupported)
+    if (device->state() == USBDeviceState_NotSupported)
         return setError (E_INVALIDARG,
             tr ("USB device '%s' with UUID {%Vuuid} cannot be accessed by guest "
@@ -1347 +1347 @@
             device->name().raw(), id.raw());
 
-    if (device->state() == USBDeviceState_USBDeviceUnavailable)
+    if (device->state() == USBDeviceState_Unavailable)
         return setError (E_INVALIDARG,
             tr ("USB device '%s' with UUID {%Vuuid} is being exclusively used by the "
@@ -1353 +1353 @@
             device->name().raw(), id.raw());
 
-    if (device->state() == USBDeviceState_USBDeviceCaptured)
+    if (device->state() == USBDeviceState_Captured)
     {
         /* Machine::name() requires a read lock */
@@ -1491 +1491 @@
             continue;
 
-        if (device->state() == USBDeviceState_USBDeviceBusy ||
-            device->state() == USBDeviceState_USBDeviceAvailable ||
-            device->state() == USBDeviceState_USBDeviceHeld)
+        if (device->state() == USBDeviceState_Busy ||
+            device->state() == USBDeviceState_Available ||
+            device->state() == USBDeviceState_Held)
         {
             applyMachineUSBFilters (aMachine, device);
@@ -1536 +1536 @@
                 if (!device->isStatePending())
                 {
-                    Assert (device->state() == USBDeviceState_USBDeviceCaptured);
+                    Assert (device->state() == USBDeviceState_Captured);
 
                     /* re-apply filters on the device before giving it back to the
@@ -2060 +2060 @@
     AssertReturn (aDevice->isLockedOnCurrentThread(), E_FAIL);
 
-    AssertReturn (aDevice->state() != USBDeviceState_USBDeviceCaptured, E_FAIL);
+    AssertReturn (aDevice->state() != USBDeviceState_Captured, E_FAIL);
 
     AssertReturn (aDevice->isStatePending() == false, E_FAIL);
 
     /* ignore unsupported devices */
-    if (aDevice->state() == USBDeviceState_USBDeviceNotSupported)
+    if (aDevice->state() == USBDeviceState_NotSupported)
         return S_OK;
     /* ignore unavailable devices as well */
-    if (aDevice->state() == USBDeviceState_USBDeviceUnavailable)
+    if (aDevice->state() == USBDeviceState_Unavailable)
         return S_OK;
 
@@ -2089 +2089 @@
             USBDeviceFilterAction_T action = data.mAction;
 #else
-            ULONG action = USBDeviceFilterAction_InvalidUSBDeviceFilterAction;
+            ULONG action = USBDeviceFilterAction_Null;
             (*it)->COMGETTER (Action) (&action);
 #endif
-            if (action == USBDeviceFilterAction_USBDeviceFilterIgnore)
+            if (action == USBDeviceFilterAction_Ignore)
             {
                 /* request to give the device back to the host*/
@@ -2099 +2099 @@
                 return S_OK;
             }
-            if (action == USBDeviceFilterAction_USBDeviceFilterHold)
+            if (action == USBDeviceFilterAction_Hold)
                 break;
         }
@@ -2160 +2160 @@
     AssertReturn (aDevice->isLockedOnCurrentThread(), false);
 
-    AssertReturn (aDevice->state() != USBDeviceState_USBDeviceNotSupported, false);
-    AssertReturn (aDevice->state() != USBDeviceState_USBDeviceUnavailable, false);
+    AssertReturn (aDevice->state() != USBDeviceState_NotSupported, false);
+    AssertReturn (aDevice->state() != USBDeviceState_Unavailable, false);
 
     AssertReturn (aDevice->isStatePending() == false, false);
@@ -2282 +2282 @@
             ComObjPtr <SessionMachine> machine (device->machine());
             device->handlePendingStateChange();
-            if (device->state() == USBDeviceState_USBDeviceCaptured)
+            if (device->state() == USBDeviceState_Captured)
             {
                 Log (("USB: running filters on async detached device\n"));
@@ -2291 +2291 @@
             else
                 Log (("USB: async detached devices reappeared in stated %d instead of %d!\n",
-                      device->state(), USBDeviceState_USBDeviceCaptured));
+                      device->state(), USBDeviceState_Captured));
         }
         else
             device->handlePendingStateChange();
     }
-    else if (   device->state() == USBDeviceState_USBDeviceAvailable
-             || device->state() == USBDeviceState_USBDeviceBusy)
+    else if (   device->state() == USBDeviceState_Available
+             || device->state() == USBDeviceState_Busy)
     {
         /* The device has gone from being unavailable (not subject to filters) to being

trunk/src/VBox/Main/HostUSBDeviceImpl.cpp

@@ -83 +83 @@
             AssertMsgFailed(("aUsb->enmState=%d\n", aUsb->enmState));
         case USBDEVICESTATE_UNSUPPORTED:
-            mState = USBDeviceState_USBDeviceNotSupported;
+            mState = USBDeviceState_NotSupported;
             break;
         case USBDEVICESTATE_USED_BY_HOST:
-            mState = USBDeviceState_USBDeviceUnavailable;
+            mState = USBDeviceState_Unavailable;
             break;
         case USBDEVICESTATE_USED_BY_HOST_CAPTURABLE:
-            mState = USBDeviceState_USBDeviceBusy;
+            mState = USBDeviceState_Busy;
             break;
         case USBDEVICESTATE_UNUSED:
-            mState = USBDeviceState_USBDeviceAvailable;
+            mState = USBDeviceState_Available;
             break;
         case USBDEVICESTATE_HELD_BY_PROXY:
-            mState = USBDeviceState_USBDeviceHeld;
+            mState = USBDeviceState_Held;
             break;
         case USBDEVICESTATE_USED_BY_GUEST:
@@ -400 +400 @@
 
     AssertReturn (
-        mState == USBDeviceState_USBDeviceBusy ||
-        mState == USBDeviceState_USBDeviceAvailable ||
-        mState == USBDeviceState_USBDeviceHeld,
+        mState == USBDeviceState_Busy ||
+        mState == USBDeviceState_Available ||
+        mState == USBDeviceState_Held,
         false);
 
-    if (mState == USBDeviceState_USBDeviceHeld)
+    if (mState == USBDeviceState_Held)
     {
         /* can perform immediate capture, inform the VM process */
@@ -437 +437 @@
         if (SUCCEEDED (rc))
         {
-            mState = mPendingState = USBDeviceState_USBDeviceCaptured;
+            mState = mPendingState = USBDeviceState_Captured;
             mMachine = aMachine;
             return true;
@@ -446 +446 @@
 
     mIsStatePending = true;
-    mPendingState = USBDeviceState_USBDeviceCaptured;
+    mPendingState = USBDeviceState_Captured;
     mPendingStateEx = kNothingPending;
     mPendingSince = RTTimeNanoTS();
@@ -475 +475 @@
 
     AssertReturnVoid (
-        mState == USBDeviceState_USBDeviceBusy ||
-        mState == USBDeviceState_USBDeviceAvailable ||
-        mState == USBDeviceState_USBDeviceHeld);
-
-    if (mState != USBDeviceState_USBDeviceHeld)
+        mState == USBDeviceState_Busy ||
+        mState == USBDeviceState_Available ||
+        mState == USBDeviceState_Held);
+
+    if (mState != USBDeviceState_Held)
         return;
 
     mIsStatePending = true;
-    mPendingState = USBDeviceState_USBDeviceAvailable;
+    mPendingState = USBDeviceState_Available;
     mPendingStateEx = kNothingPending;
     mPendingSince = RTTimeNanoTS();
@@ -509 +509 @@
 
     AssertReturnVoid (
-        mState == USBDeviceState_USBDeviceBusy ||
-        mState == USBDeviceState_USBDeviceAvailable ||
-        mState == USBDeviceState_USBDeviceHeld);
+        mState == USBDeviceState_Busy ||
+        mState == USBDeviceState_Available ||
+        mState == USBDeviceState_Held);
 
     mMachine.setNull();
 
-    if (mState == USBDeviceState_USBDeviceHeld)
+    if (mState == USBDeviceState_Held)
         return;
 
     mIsStatePending = true;
-    mPendingState = USBDeviceState_USBDeviceHeld;
+    mPendingState = USBDeviceState_Held;
     mPendingStateEx = kNothingPending;
     mPendingSince = RTTimeNanoTS();
@@ -538 +538 @@
     AssertReturnVoid (isLockedOnCurrentThread());
 
-    AssertReturnVoid (mState == USBDeviceState_USBDeviceCaptured);
-    AssertReturnVoid (mPendingState == USBDeviceState_USBDeviceCaptured);
+    AssertReturnVoid (mState == USBDeviceState_Captured);
+    AssertReturnVoid (mPendingState == USBDeviceState_Captured);
     AssertReturnVoid (mIsStatePending == false);
 
-    mState = USBDeviceState_USBDeviceHeld;
+    mState = USBDeviceState_Held;
     mMachine.setNull();
 }
@@ -559 +559 @@
     AssertReturnVoid (isLockedOnCurrentThread());
 
-    if (!mMachine.isNull() && mState == USBDeviceState_USBDeviceCaptured)
+    if (!mMachine.isNull() && mState == USBDeviceState_Captured)
     {
         /* the device is captured by a machine, instruct it to release */
@@ -592 +592 @@
          * matter what state we put it in. */
         mIsStatePending = false;
-        mState = mPendingState = USBDeviceState_USBDeviceNotSupported;
+        mState = mPendingState = USBDeviceState_NotSupported;
         mPendingStateEx = kNothingPending;
         mMachine.setNull();
@@ -611 +611 @@
 
     AssertReturnVoid (mIsStatePending == true);
-    AssertReturnVoid (mState != USBDeviceState_USBDeviceCaptured || mPendingStateEx != kNothingPending);
+    AssertReturnVoid (mState != USBDeviceState_Captured || mPendingStateEx != kNothingPending);
 
     bool wasCapture = false;
@@ -623 +623 @@
             switch (mPendingState)
             {
-                case USBDeviceState_USBDeviceCaptured:
+                case USBDeviceState_Captured:
                 {
-                    if (mState == USBDeviceState_USBDeviceHeld)
+                    if (mState == USBDeviceState_Held)
                     {
                         if (!mMachine.isNull())
@@ -633 +633 @@
                             /* it is a canceled capture request. Give the device back
                              * to the host. */
-                            mPendingState = USBDeviceState_USBDeviceAvailable;
+                            mPendingState = USBDeviceState_Available;
                             mUSBProxyService->releaseDevice (this);
                         }
@@ -656 +656 @@
                     break;
                 }
-                case USBDeviceState_USBDeviceAvailable:
+                case USBDeviceState_Available:
                 {
                     Assert (mMachine.isNull());
 
-                    if (mState == USBDeviceState_USBDeviceHeld)
+                    if (mState == USBDeviceState_Held)
                     {
                         /* couldn't release the device (give it back to the host).
@@ -674 +674 @@
                     break;
                 }
-                case USBDeviceState_USBDeviceHeld:
+                case USBDeviceState_Held:
                 {
-                    if (mState == USBDeviceState_USBDeviceHeld)
+                    if (mState == USBDeviceState_Held)
                     {
                         /* All right, the device is now held (due to some global
@@ -757 +757 @@
         {
             mIsStatePending = false;
-            mState = mPendingState = USBDeviceState_USBDeviceCaptured;
+            mState = mPendingState = USBDeviceState_Captured;
             mPendingStateEx = kNothingPending;
             return;
@@ -792 +792 @@
             switch (mPendingState)
             {
-                case USBDeviceState_USBDeviceCaptured:
+                case USBDeviceState_Captured:
                     /* reset mMachine to deassociate it from the filter and tell
                      * handlePendingStateChange() what to do */
@@ -798 +798 @@
                     if (!aTimeout)
                         break;
-                case USBDeviceState_USBDeviceAvailable:
-                case USBDeviceState_USBDeviceHeld:
+                case USBDeviceState_Available:
+                case USBDeviceState_Held:
                     if (aTimeout)
                     {
@@ -1079 +1079 @@
             AssertMsgFailed (("aDev->enmState=%d\n", aDev->enmState));
         case USBDEVICESTATE_UNSUPPORTED:
-            Assert (mState == USBDeviceState_USBDeviceNotSupported);
+            Assert (mState == USBDeviceState_NotSupported);
             switch (mState)
             {
-                case USBDeviceState_USBDeviceCaptured:
+                case USBDeviceState_Captured:
                     isImportant = mIsStatePending;
                     break;
@@ -1091 +1091 @@
             switch (mState)
             {
-                case USBDeviceState_USBDeviceUnavailable:
+                case USBDeviceState_Unavailable:
                     return false;
                 /* the following state changes don't require any action for now */
-                case USBDeviceState_USBDeviceBusy:
-                case USBDeviceState_USBDeviceAvailable:
+                case USBDeviceState_Busy:
+                case USBDeviceState_Available:
                     isImportant = false;
                     break;
 #ifndef RT_OS_WINDOWS /* Only windows really knows whether the device is unavailable or captured. */
-                case USBDeviceState_USBDeviceCaptured:
+                case USBDeviceState_Captured:
                     if (!mIsStatePending)
                         return false;
@@ -1108 +1108 @@
             }
             LogFlowThisFunc (("%d -> %d\n",
-                              mState, USBDeviceState_USBDeviceUnavailable));
-            mState = USBDeviceState_USBDeviceUnavailable;
+                              mState, USBDeviceState_Unavailable));
+            mState = USBDeviceState_Unavailable;
             return isImportant;
 
@@ -1115 +1115 @@
             switch (mState)
             {
-                case USBDeviceState_USBDeviceBusy:
+                case USBDeviceState_Busy:
                     return false;
-                case USBDeviceState_USBDeviceAvailable:
+                case USBDeviceState_Available:
                     isImportant = false;
                     break;
-                case USBDeviceState_USBDeviceCaptured:
+                case USBDeviceState_Captured:
 #ifndef RT_OS_WINDOWS /* Only Windows really knows whether the device is busy or captured. */
                     if (!mIsStatePending)
@@ -1133 +1133 @@
                     /* fall thru */
                 default:
-                    /* USBDeviceState_USBDeviceUnavailable: The device has become capturable, re-run filters. */
-                    /* USBDeviceState_USBDeviceHeld:        Pending request. */
-                    /* USBDeviceState_USBDeviceCaptured:    Pending request. */
-                    /* USBDeviceState_USBDeviceNotSupported: Something is broken. */
+                    /* USBDeviceState_Unavailable: The device has become capturable, re-run filters. */
+                    /* USBDeviceState_Held:        Pending request. */
+                    /* USBDeviceState_Captured:    Pending request. */
+                    /* USBDeviceState_NotSupported: Something is broken. */
                     isImportant = true;
             }
             LogFlowThisFunc (("%d -> %d\n",
-                              mState, USBDeviceState_USBDeviceBusy));
-            mState = USBDeviceState_USBDeviceBusy;
+                              mState, USBDeviceState_Busy));
+            mState = USBDeviceState_Busy;
             return isImportant;
 
@@ -1147 +1147 @@
             switch (mState)
             {
-                case USBDeviceState_USBDeviceAvailable:
+                case USBDeviceState_Available:
                     return false;
 #if defined(RT_OS_LINUX)  /* Hack for /proc/bus/usb/devices not necessarily putting up a driver. */ \
  || defined(RT_OS_DARWIN) /* We're a bit clueless as to the exact device state, just like linux. */
-                case USBDeviceState_USBDeviceCaptured:
+                case USBDeviceState_Captured:
                     if (    !mIsStatePending
                         ||  mPendingStateEx != kNothingPending)
@@ -1159 +1159 @@
 #endif
                 /* the following state changes don't require any action for now */
-                case USBDeviceState_USBDeviceBusy:
+                case USBDeviceState_Busy:
                     isImportant = false;
                     break;
                 default:
-                /* USBDeviceState_USBDeviceUnavailable: The device has become available, re-run filters. */
-                /* USBDeviceState_USBDeviceHeld:        Pending request. */
-                /* USBDeviceState_USBDeviceNotSupported: Something is broken. */
+                /* USBDeviceState_Unavailable: The device has become available, re-run filters. */
+                /* USBDeviceState_Held:        Pending request. */
+                /* USBDeviceState_NotSupported: Something is broken. */
                     isImportant = true;
             }
             LogFlowThisFunc (("%d -> %d\n",
-                              mState, USBDeviceState_USBDeviceAvailable));
-            mState = USBDeviceState_USBDeviceAvailable;
+                              mState, USBDeviceState_Available));
+            mState = USBDeviceState_Available;
             return isImportant;
 
@@ -1176 +1176 @@
             switch (mState)
             {
-                case USBDeviceState_USBDeviceHeld:
+                case USBDeviceState_Held:
                     return false;
-                case USBDeviceState_USBDeviceCaptured:
+                case USBDeviceState_Captured:
                     if (!mIsStatePending)
                         return false;
@@ -1184 +1184 @@
                 default:
                     LogFlowThisFunc (("%d -> %d\n",
-                                      mState, USBDeviceState_USBDeviceHeld));
-                    mState = USBDeviceState_USBDeviceHeld;
+                                      mState, USBDeviceState_Held));
+                    mState = USBDeviceState_Held;
                     return true;
             }
@@ -1198 +1198 @@
             switch (mState)
             {
-                case USBDeviceState_USBDeviceCaptured:
+                case USBDeviceState_Captured:
                 /* the proxy may confuse following state(s) with captured */
-                case USBDeviceState_USBDeviceHeld:
-                case USBDeviceState_USBDeviceAvailable:
-                case USBDeviceState_USBDeviceBusy:
+                case USBDeviceState_Held:
+                case USBDeviceState_Available:
+                case USBDeviceState_Busy:
                     return false;
                 default:
                     LogFlowThisFunc (("%d -> %d\n",
-                                      mState, USBDeviceState_USBDeviceHeld));
-                    mState = USBDeviceState_USBDeviceHeld;
+                                      mState, USBDeviceState_Held));
+                    mState = USBDeviceState_Held;
                     return true;
             }

trunk/src/VBox/Main/MachineImpl.cpp

@@ -127 +127 @@
 
     mSession.mPid = NIL_RTPROCESS;
-    mSession.mState = SessionState_SessionClosed;
+    mSession.mState = SessionState_Closed;
 }
 
@@ -169 +169 @@
     mVRAMSize = 8;
     mMonitorCount = 1;
-    mHWVirtExEnabled = TriStateBool_TSFalse;
+    mHWVirtExEnabled = TSBool_False;
 
     /* default boot order: floppy - DVD - HDD */
-    mBootOrder [0] = DeviceType_FloppyDevice;
-    mBootOrder [1] = DeviceType_DVDDevice;
-    mBootOrder [2] = DeviceType_HardDiskDevice;
+    mBootOrder [0] = DeviceType_Floppy;
+    mBootOrder [1] = DeviceType_DVD;
+    mBootOrder [2] = DeviceType_HardDisk;
     for (size_t i = 3; i < ELEMENTS (mBootOrder); i++)
-        mBootOrder [i] = DeviceType_NoDevice;
-
-    mClipboardMode = ClipboardMode_ClipBidirectional;
+        mBootOrder [i] = DeviceType_Null;
+
+    mClipboardMode = ClipboardMode_Bidirectional;
 }
 
@@ -1079 +1079 @@
 }
 
-STDMETHODIMP Machine::COMGETTER(HWVirtExEnabled)(TriStateBool_T *enabled)
+STDMETHODIMP Machine::COMGETTER(HWVirtExEnabled)(TSBool_T *enabled)
 {
     if (!enabled)
@@ -1094 +1094 @@
 }
 
-STDMETHODIMP Machine::COMSETTER(HWVirtExEnabled)(TriStateBool_T enable)
+STDMETHODIMP Machine::COMSETTER(HWVirtExEnabled)(TSBool_T enable)
 {
     AutoCaller autoCaller (this);
@@ -1551 +1551 @@
                 aPosition, SchemaDefs::MaxBootPosition);
 
-    if (aDevice == DeviceType_USBDevice)
+    if (aDevice == DeviceType_USB)
         return setError (E_FAIL,
             tr ("Booting from USB devices is not currently supported"));
@@ -1592 +1592 @@
 
     if (id.isEmpty() ||
-        aCtl == DiskControllerType_InvalidController ||
+        aCtl == DiskControllerType_Null ||
         aDev < 0 || aDev > 1)
         return E_INVALIDARG;
@@ -1647 +1647 @@
     switch (hd->type())
     {
-        case HardDiskType_ImmutableHardDisk:
+        case HardDiskType_Immutable:
         {
             Assert (hd->machineId().isEmpty());
@@ -1659 +1659 @@
             break;
         }
-        case HardDiskType_WritethroughHardDisk:
+        case HardDiskType_Writethrough:
         {
             Assert (hd->children().size() == 0);
@@ -1665 +1665 @@
             /* fall through */
         }
-        case HardDiskType_NormalHardDisk:
+        case HardDiskType_Normal:
         {
             if (hd->machineId().isEmpty())
@@ -1722 +1722 @@
                 {
                     /*
-                     *  here we go when the HardDiskType_NormalHardDisk
+                     *  here we go when the HardDiskType_Normal
                      *  is attached to some VM (probably to this one, too)
                      *  at some particular snapshot, so we can create a diff
@@ -1758 +1758 @@
                                    LONG aDev, IHardDisk **aHardDisk)
 {
-    if (aCtl == DiskControllerType_InvalidController ||
+    if (aCtl == DiskControllerType_Null ||
         aDev < 0 || aDev > 1)
         return E_INVALIDARG;
@@ -1787 +1787 @@
 STDMETHODIMP Machine::DetachHardDisk (DiskControllerType_T aCtl, LONG aDev)
 {
-    if (aCtl == DiskControllerType_InvalidController ||
+    if (aCtl == DiskControllerType_Null ||
         aDev < 0 || aDev > 1)
         return E_INVALIDARG;
@@ -1821 +1821 @@
                 switch (hd->type())
                 {
-                    case HardDiskType_ImmutableHardDisk:
+                    case HardDiskType_Immutable:
                     {
                         /* decrease readers increased in AttachHardDisk() */
@@ -1828 +1828 @@
                         break;
                     }
-                    case HardDiskType_WritethroughHardDisk:
+                    case HardDiskType_Writethrough:
                     {
                         /* deassociate from this machine */
@@ -1835 +1835 @@
                         break;
                     }
-                    case HardDiskType_NormalHardDisk:
+                    case HardDiskType_Normal:
                     {
                         if (hd->snapshotId().isEmpty())
@@ -2454 +2454 @@
         AutoReaderLock alock (this);
 
-        if (mData->mSession.mState != SessionState_SessionOpen)
+        if (mData->mSession.mState != SessionState_Open)
             return setError (E_FAIL,
                 tr ("Machine session is not open (session state: %d)"),
@@ -2482 +2482 @@
         AutoReaderLock alock (this);
 
-        if (mData->mSession.mState != SessionState_SessionOpen)
+        if (mData->mSession.mState != SessionState_Open)
             return setError (E_FAIL,
                 tr ("Machine session is not open (session state: %d)"),
@@ -2522 +2522 @@
     sm = mData->mSession.mMachine;
     Assert (!sm.isNull() ||
-            mData->mSession.mState != SessionState_SessionOpen);
+            mData->mSession.mState != SessionState_Open);
 
     return  sm;
@@ -2689 +2689 @@
         }
 
-        if (!(aUsage & ResourceUsage_PermanentUsage))
+        if (!(aUsage & ResourceUsage_Permanent))
             d [0] = NULL;
-        if (!(aUsage & ResourceUsage_TemporaryUsage))
+        if (!(aUsage & ResourceUsage_Temporary))
             d [1] = NULL;
 
@@ -2709 +2709 @@
 
     /* then, check snapshots if any */
-    if (aUsage & ResourceUsage_PermanentUsage)
+    if (aUsage & ResourceUsage_Permanent)
     {
         if (!mData->mFirstSnapshot.isNull() &&
@@ -2765 +2765 @@
         }
 
-        if (!(aUsage & ResourceUsage_PermanentUsage))
+        if (!(aUsage & ResourceUsage_Permanent))
             d [0] = NULL;
-        if (!(aUsage & ResourceUsage_TemporaryUsage))
+        if (!(aUsage & ResourceUsage_Temporary))
             d [1] = NULL;
 
@@ -2785 +2785 @@
 
     /* then, check snapshots if any */
-    if (aUsage & ResourceUsage_PermanentUsage)
+    if (aUsage & ResourceUsage_Permanent)
     {
         if (!mData->mFirstSnapshot.isNull() &&
@@ -2817 +2817 @@
     LogFlowThisFunc (("mSession.mState=%d\n", mData->mSession.mState));
 
-    if (mData->mSession.mState == SessionState_SessionOpen ||
-        mData->mSession.mState == SessionState_SessionClosing)
+    if (mData->mSession.mState == SessionState_Open ||
+        mData->mSession.mState == SessionState_Closing)
         return setError (E_ACCESSDENIED,
             tr ("A session for the machine '%ls' is currently open "
@@ -2833 +2833 @@
     Assert (pid != NIL_RTPROCESS);
 
-    if (mData->mSession.mState == SessionState_SessionSpawning)
+    if (mData->mSession.mState == SessionState_Spawning)
     {
         /* This machine is awaiting for a spawning session to be opened, so
@@ -2865 +2865 @@
          */
         SessionState_T origState = mData->mSession.mState;
-        mData->mSession.mState = SessionState_SessionSpawning;
+        mData->mSession.mState = SessionState_Spawning;
 
         /*
@@ -2888 +2888 @@
                 tr ("Failed to assign the machine to the session"));
 
-        if (SUCCEEDED (rc) && origState == SessionState_SessionSpawning)
+        if (SUCCEEDED (rc) && origState == SessionState_Spawning)
         {
             /* complete the remote session initialization */
@@ -2933 +2933 @@
 
     /* finalize spawning amyway (this is why we don't return on errors above) */
-    if (mData->mSession.mState == SessionState_SessionSpawning)
+    if (mData->mSession.mState == SessionState_Spawning)
     {
         /* Note that the progress object is finalized later */
@@ -2946 +2946 @@
              * and reset session state to Closed. */
             mData->mSession.mRemoteControls.clear();
-            mData->mSession.mState = SessionState_SessionClosed;
+            mData->mSession.mState = SessionState_Closed;
         }
     }
@@ -2960 +2960 @@
         /* memorize the direct session control and cache IUnknown for it */
         mData->mSession.mDirectControl = aControl;
-        mData->mSession.mState = SessionState_SessionOpen;
+        mData->mSession.mState = SessionState_Open;
         /* associate the SessionMachine with this Machine */
         mData->mSession.mMachine = sessionMachine;
@@ -3011 +3011 @@
     LogFlowThisFunc (("mSession.mState=%d\n", mData->mSession.mState));
 
-    if (mData->mSession.mState == SessionState_SessionOpen ||
-        mData->mSession.mState == SessionState_SessionSpawning ||
-        mData->mSession.mState == SessionState_SessionClosing)
+    if (mData->mSession.mState == SessionState_Open ||
+        mData->mSession.mState == SessionState_Spawning ||
+        mData->mSession.mState == SessionState_Closing)
         return setError (E_ACCESSDENIED,
             tr ("A session for the machine '%ls' is currently open "
@@ -3172 +3172 @@
     {
         /* restore the session state */
-        mData->mSession.mState = SessionState_SessionClosed;
+        mData->mSession.mState = SessionState_Closed;
         /* The failure may w/o any error info (from RPC), so provide one */
         return setError (rc,
@@ -3183 +3183 @@
     mData->mSession.mProgress = aProgress;
     mData->mSession.mPid = pid;
-    mData->mSession.mState = SessionState_SessionSpawning;
+    mData->mSession.mState = SessionState_Spawning;
     mData->mSession.mType = type;
 
@@ -3211 +3211 @@
     LogFlowThisFunc (("mSession.state=%d\n", mData->mSession.mState));
 
-    if (mData->mSession.mState != SessionState_SessionOpen)
+    if (mData->mSession.mState != SessionState_Open)
         return setError (E_ACCESSDENIED,
             tr ("The machine '%ls' does not have an open session"),
@@ -3258 +3258 @@
 
     /* need to revalidate the state after entering the lock again */
-    if (mData->mSession.mState != SessionState_SessionOpen)
+    if (mData->mSession.mState != SessionState_Open)
     {
         aControl->Uninitialize();
@@ -3349 +3349 @@
                 mUserData->mName.raw(), snapshotCount);
 
-        if (mData->mSession.mState != SessionState_SessionClosed)
+        if (mData->mSession.mState != SessionState_Closed)
             return setError (E_FAIL,
                 tr ("Cannot unregister the machine '%ls' because it has an "
@@ -4140 +4140 @@
     {
         /* default value in case the node is not there */
-        mHWData->mHWVirtExEnabled = TriStateBool_TSDefault;
+        mHWData->mHWVirtExEnabled = TSBool_Default;
 
         Key cpuNode = aNode.findKey ("CPU");
@@ -4150 +4150 @@
                 const char *enabled = hwVirtExNode.stringValue ("enabled");
                 if      (strcmp (enabled, "false") == 0)
-                    mHWData->mHWVirtExEnabled = TriStateBool_TSFalse;
+                    mHWData->mHWVirtExEnabled = TSBool_False;
                 else if (strcmp (enabled, "true") == 0)
-                    mHWData->mHWVirtExEnabled = TriStateBool_TSTrue;
+                    mHWData->mHWVirtExEnabled = TSBool_True;
                 else
-                    mHWData->mHWVirtExEnabled = TriStateBool_TSDefault;
+                    mHWData->mHWVirtExEnabled = TSBool_Default;
             }
         }
@@ -4170 +4170 @@
         /* reset all boot order positions to NoDevice */
         for (size_t i = 0; i < ELEMENTS (mHWData->mBootOrder); i++)
-            mHWData->mBootOrder [i] = DeviceType_NoDevice;
+            mHWData->mBootOrder [i] = DeviceType_Null;
 
         Key bootNode = aNode.key ("Boot");
@@ -4187 +4187 @@
             const char *device = (*it).stringValue ("device");
             if      (strcmp (device, "None") == 0)
-                mHWData->mBootOrder [position] = DeviceType_NoDevice;
+                mHWData->mBootOrder [position] = DeviceType_Null;
             else if (strcmp (device, "Floppy") == 0)
-                mHWData->mBootOrder [position] = DeviceType_FloppyDevice;
+                mHWData->mBootOrder [position] = DeviceType_Floppy;
             else if (strcmp (device, "DVD") == 0)
-                mHWData->mBootOrder [position] = DeviceType_DVDDevice;
+                mHWData->mBootOrder [position] = DeviceType_DVD;
             else if (strcmp (device, "HardDisk") == 0)
-                mHWData->mBootOrder [position] = DeviceType_HardDiskDevice;
+                mHWData->mBootOrder [position] = DeviceType_HardDisk;
             else if (strcmp (device, "Network") == 0)
-                mHWData->mBootOrder [position] = DeviceType_NetworkDevice;
+                mHWData->mBootOrder [position] = DeviceType_Network;
             else
                 ComAssertMsgFailed (("Invalid device: %s\n", device));
@@ -4331 +4331 @@
     {
         /* default value in case if the node is not there */
-        mHWData->mClipboardMode = ClipboardMode_ClipDisabled;
+        mHWData->mClipboardMode = ClipboardMode_Disabled;
 
         Key clipNode = aNode.findKey ("Clipboard");
@@ -4338 +4338 @@
             const char *mode = clipNode.stringValue ("mode");
             if      (strcmp (mode, "Disabled") == 0)
-                mHWData->mClipboardMode = ClipboardMode_ClipDisabled;
+                mHWData->mClipboardMode = ClipboardMode_Disabled;
             else if (strcmp (mode, "HostToGuest") == 0)
-                mHWData->mClipboardMode = ClipboardMode_ClipHostToGuest;
+                mHWData->mClipboardMode = ClipboardMode_HostToGuest;
             else if (strcmp (mode, "GuestToHost") == 0)
-                mHWData->mClipboardMode = ClipboardMode_ClipGuestToHost;
+                mHWData->mClipboardMode = ClipboardMode_GuestToHost;
             else if (strcmp (mode, "Bidirectional") == 0)
-                mHWData->mClipboardMode = ClipboardMode_ClipBidirectional;
+                mHWData->mClipboardMode = ClipboardMode_Bidirectional;
             else
                 AssertMsgFailed (("Invalid clipboard mode '%s'\n", mode));
@@ -4430 +4430 @@
         }
 
-        if (hd->type() == HardDiskType_ImmutableHardDisk)
+        if (hd->type() == HardDiskType_Immutable)
         {
             return setError (E_FAIL,
@@ -4440 +4440 @@
 
         /* attach the device */
-        DiskControllerType_T ctl = DiskControllerType_InvalidController;
+        DiskControllerType_T ctl = DiskControllerType_Null;
         LONG dev = -1;
 
         if (strcmp (bus, "ide0") == 0)
         {
-            ctl = DiskControllerType_IDE0Controller;
+            ctl = DiskControllerType_IDE0;
             if (strcmp (device, "master") == 0)
                 dev = 0;
@@ -4456 +4456 @@
         else if (strcmp (bus, "ide1") == 0)
         {
-            ctl = DiskControllerType_IDE1Controller;
+            ctl = DiskControllerType_IDE1;
             if (strcmp (device, "master") == 0)
                 rc = setError (E_FAIL, tr("Could not attach a disk as a master "
@@ -5528 +5528 @@
         switch (mHWData->mHWVirtExEnabled)
         {
-            case TriStateBool_TSFalse:
+            case TSBool_False:
                 value = "false";
                 break;
-            case TriStateBool_TSTrue:
+            case TSBool_True:
                 value = "true";
                 break;
-            case TriStateBool_TSDefault:
+            case TSBool_Default:
                 value = "default";
         }
@@ -5555 +5555 @@
             switch (mHWData->mBootOrder [pos])
             {
-                case DeviceType_NoDevice:
+                case DeviceType_Null:
                     /* skip, this is allowed for <Order> nodes
                      * when loading, the default value NoDevice will remain */
                     continue;
-                case DeviceType_FloppyDevice:   device = "Floppy"; break;
-                case DeviceType_DVDDevice:      device = "DVD"; break;
-                case DeviceType_HardDiskDevice: device = "HardDisk"; break;
-                case DeviceType_NetworkDevice:  device = "Network"; break;
+                case DeviceType_Floppy:         device = "Floppy"; break;
+                case DeviceType_DVD:            device = "DVD"; break;
+                case DeviceType_HardDisk:       device = "HardDisk"; break;
+                case DeviceType_Network:        device = "Network"; break;
                 default:
                 {
@@ -5679 +5679 @@
         switch (mHWData->mClipboardMode)
         {
-            case ClipboardMode_ClipDisabled:
+            case ClipboardMode_Disabled:
                 /* already assigned */
                 break;
-            case ClipboardMode_ClipHostToGuest:
+            case ClipboardMode_HostToGuest:
                 modeStr = "HostToGuest";
                 break;
-            case ClipboardMode_ClipGuestToHost:
+            case ClipboardMode_GuestToHost:
                 modeStr = "GuestToHost";
                 break;
-            case ClipboardMode_ClipBidirectional:
+            case ClipboardMode_Bidirectional:
                 modeStr = "Bidirectional";
                 break;
@@ -5742 +5742 @@
             switch (att->controller())
             {
-                case DiskControllerType_IDE0Controller: bus = "ide0"; break;
-                case DiskControllerType_IDE1Controller: bus = "ide1"; break;
+                case DiskControllerType_IDE0: bus = "ide0"; break;
+                case DiskControllerType_IDE1: bus = "ide1"; break;
                 default:
                     ComAssertFailedRet (E_FAIL);
@@ -5956 +5956 @@
                 switch (hd->type())
                 {
-                    case HardDiskType_ImmutableHardDisk:
+                    case HardDiskType_Immutable:
                     {
                         /* decrease readers increased in AttachHardDisk() */
@@ -5965 +5965 @@
                         break;
                     }
-                    case HardDiskType_WritethroughHardDisk:
+                    case HardDiskType_Writethrough:
                     {
                         /* reset the dirty flag */
@@ -5972 +5972 @@
                         break;
                     }
-                    case HardDiskType_NormalHardDisk:
+                    case HardDiskType_Normal:
                     {
                         if (hd->snapshotId().isEmpty())
@@ -6236 +6236 @@
             switch (hd->type())
             {
-                case HardDiskType_ImmutableHardDisk:
+                case HardDiskType_Immutable:
                 {
                     /* decrease readers increased in AttachHardDisk() */
@@ -6243 +6243 @@
                     break;
                 }
-                case HardDiskType_WritethroughHardDisk:
+                case HardDiskType_Writethrough:
                 {
                     /* deassociate from this machine */
@@ -6250 +6250 @@
                     break;
                 }
-                case HardDiskType_NormalHardDisk:
+                case HardDiskType_Normal:
                 {
                     if (hd->snapshotId().isEmpty())
@@ -6324 +6324 @@
             AutoLock hdLock (hd);
 
-            ComAssertMsgBreak (hd->type() == HardDiskType_NormalHardDisk,
+            ComAssertMsgBreak (hd->type() == HardDiskType_Normal,
                                ("Invalid hard disk type %d\n", hd->type()),
                                rc = E_FAIL);
@@ -6394 +6394 @@
         {
             // checked in the first pass
-            Assert (hd->type() == HardDiskType_NormalHardDisk);
+            Assert (hd->type() == HardDiskType_Normal);
 
             aProgress->advanceOperation (Bstr (Utf8StrFmt (
@@ -6434 +6434 @@
             {
                 // associate the snapshot id with the old hard disk
-                if (hd->type() != HardDiskType_WritethroughHardDisk && aSnapshotId)
+                if (hd->type() != HardDiskType_Writethrough && aSnapshotId)
                     hd->setSnapshotId (*aSnapshotId);
 
@@ -7317 +7317 @@
         /* this must be null here (see #OnSessionEnd()) */
         Assert (mData->mSession.mDirectControl.isNull());
-        Assert (mData->mSession.mState == SessionState_SessionClosing);
+        Assert (mData->mSession.mState == SessionState_Closing);
         Assert (!mData->mSession.mProgress.isNull());
 
@@ -7330 +7330 @@
     /* reset the rest of session data */
     mData->mSession.mMachine.setNull();
-    mData->mSession.mState = SessionState_SessionClosed;
+    mData->mSession.mState = SessionState_Closed;
     mData->mSession.mType.setNull();
 
@@ -7351 +7351 @@
 
     /* fire an event */
-    mParent->onSessionStateChange (mData->mUuid, SessionState_SessionClosed);
+    mParent->onSessionStateChange (mData->mUuid, SessionState_Closed);
 
     uninitDataAndChildObjects();
@@ -7547 +7547 @@
         /* go to the closing state (essential for all open*Session() calls and
          * for #checkForDeath()) */
-        Assert (mData->mSession.mState == SessionState_SessionOpen);
-        mData->mSession.mState = SessionState_SessionClosing;
+        Assert (mData->mSession.mState == SessionState_Open);
+        mData->mSession.mState = SessionState_Closing;
 
         /* set direct control to NULL to release the remote instance */
@@ -7604 +7604 @@
 
     AssertReturn (mData->mMachineState == MachineState_Paused &&
-                  mSnapshotData.mLastState == MachineState_InvalidMachineState &&
+                  mSnapshotData.mLastState == MachineState_Null &&
                   mSnapshotData.mProgressId.isEmpty() &&
                   mSnapshotData.mStateFilePath.isNull(),
@@ -7652 +7652 @@
 
     AssertReturn (mData->mMachineState == MachineState_Saving &&
-                  mSnapshotData.mLastState != MachineState_InvalidMachineState &&
+                  mSnapshotData.mLastState != MachineState_Null &&
                   !mSnapshotData.mProgressId.isEmpty() &&
                   !mSnapshotData.mStateFilePath.isNull(),
@@ -7727 +7727 @@
     AssertReturn ((mData->mMachineState < MachineState_Running ||
                    mData->mMachineState == MachineState_Paused) &&
-                  mSnapshotData.mLastState == MachineState_InvalidMachineState &&
+                  mSnapshotData.mLastState == MachineState_Null &&
                   mSnapshotData.mSnapshot.isNull() &&
                   mSnapshotData.mServerProgress.isNull() &&
@@ -7753 +7753 @@
         ComObjPtr <HardDisk> hd = (*it)->hardDisk();
         AutoLock hdLock (hd);
-        if (hd->type() == HardDiskType_WritethroughHardDisk)
+        if (hd->type() == HardDiskType_Writethrough)
             return setError (E_FAIL,
                 tr ("Cannot take a snapshot when there is a Writethrough hard "
@@ -7887 +7887 @@
     AssertReturn (!aSuccess ||
                   (mData->mMachineState == MachineState_Saving &&
-                   mSnapshotData.mLastState != MachineState_InvalidMachineState &&
+                   mSnapshotData.mLastState != MachineState_Null &&
                    !mSnapshotData.mSnapshot.isNull() &&
                    !mSnapshotData.mServerProgress.isNull() &&
@@ -8187 +8187 @@
          *  (see Session::uninit() for details).
          */
-        reason = mData->mSession.mState == SessionState_SessionClosing ?
+        reason = mData->mSession.mState == SessionState_Closing ?
                  Uninit::Normal :
                  Uninit::Abnormal;
@@ -8539 +8539 @@
 
     /* clear out the temporary saved state data */
-    mSnapshotData.mLastState = MachineState_InvalidMachineState;
+    mSnapshotData.mLastState = MachineState_Null;
     mSnapshotData.mProgressId.clear();
     mSnapshotData.mStateFilePath.setNull();
@@ -8622 +8622 @@
 
     /* clear out the snapshot data */
-    mSnapshotData.mLastState = MachineState_InvalidMachineState;
+    mSnapshotData.mLastState = MachineState_Null;
     mSnapshotData.mSnapshot.setNull();
     mSnapshotData.mServerProgress.setNull();
@@ -8800 +8800 @@
             }
 
-            if (hd->type() == HardDiskType_NormalHardDisk)
+            if (hd->type() == HardDiskType_Normal)
             {
                 AutoLock hdChildrenLock (hd->childrenLock());
@@ -8916 +8916 @@
                 }
             }
-            else if (hd->type() == HardDiskType_NormalHardDisk)
+            else if (hd->type() == HardDiskType_Normal)
             {
                 /*
@@ -9599 +9599 @@
          * and simply do nothing here. */
 
-        if (mData->mSession.mState == SessionState_SessionClosing)
+        if (mData->mSession.mState == SessionState_Closing)
             return S_OK;
 

trunk/src/VBox/Main/NetworkAdapterImpl.cpp

@@ -68 +68 @@
 
     /* default to Am79C973 */
-    mData->mAdapterType = NetworkAdapterType_NetworkAdapterAm79C973;
+    mData->mAdapterType = NetworkAdapterType_Am79C973;
 
     /* generate the MAC address early to guarantee it is the same both after
@@ -199 +199 @@
     switch (aAdapterType)
     {
-        case NetworkAdapterType_NetworkAdapterAm79C970A:
-        case NetworkAdapterType_NetworkAdapterAm79C973:
+        case NetworkAdapterType_Am79C970A:
+        case NetworkAdapterType_Am79C973:
 #ifdef VBOX_WITH_E1000
-        case NetworkAdapterType_NetworkAdapter82540EM:
+        case NetworkAdapterType_I82540EM:
 #endif
             break;
@@ -631 +631 @@
         /* if an empty string is to be set, internal networking must be turned off */
         if (   (aInternalNetwork == Bstr(""))
-            && (mData->mAttachmentType = NetworkAttachmentType_InternalNetworkAttachment))
+            && (mData->mAttachmentType = NetworkAttachmentType_Internal))
         {
             return setError (E_FAIL, tr ("Empty internal network name is not valid"));
@@ -821 +821 @@
     AutoLock alock (this);
 
-    if (mData->mAttachmentType != NetworkAttachmentType_NATNetworkAttachment)
+    if (mData->mAttachmentType != NetworkAttachmentType_NAT)
     {
         mData.backup();
@@ -827 +827 @@
         detach();
 
-        mData->mAttachmentType = NetworkAttachmentType_NATNetworkAttachment;
+        mData->mAttachmentType = NetworkAttachmentType_NAT;
 
         /* leave the lock before informing callbacks */
@@ -850 +850 @@
 
     /* don't do anything if we're already host interface attached */
-    if (mData->mAttachmentType != NetworkAttachmentType_HostInterfaceNetworkAttachment)
+    if (mData->mAttachmentType != NetworkAttachmentType_HostInterface)
     {
         mData.backup();
@@ -857 +857 @@
         detach();
 
-        mData->mAttachmentType = NetworkAttachmentType_HostInterfaceNetworkAttachment;
+        mData->mAttachmentType = NetworkAttachmentType_HostInterface;
 
         /* leave the lock before informing callbacks */
@@ -880 +880 @@
 
     /* don't do anything if we're already internal network attached */
-    if (mData->mAttachmentType != NetworkAttachmentType_InternalNetworkAttachment)
+    if (mData->mAttachmentType != NetworkAttachmentType_Internal)
     {
         mData.backup();
@@ -896 +896 @@
         }
 
-        mData->mAttachmentType = NetworkAttachmentType_InternalNetworkAttachment;
+        mData->mAttachmentType = NetworkAttachmentType_Internal;
 
         /* leave the lock before informing callbacks */
@@ -918 +918 @@
     AutoLock alock (this);
 
-    if (mData->mAttachmentType != NetworkAttachmentType_NoNetworkAttachment)
+    if (mData->mAttachmentType != NetworkAttachmentType_Null)
     {
         mData.backup();
@@ -939 +939 @@
  *  Loads settings from the given adapter node.
  *  May be called once right after this object creation.
- * 
+ *
  *  @param aAdapterNode <Adapter> node.
- * 
- *  @note Locks this object for writing. 
+ *
+ *  @note Locks this object for writing.
  */
 HRESULT NetworkAdapter::loadSettings (const settings::Key &aAdapterNode)
@@ -964 +964 @@
      * place when a setting of a newly created object must default to A while
      * the same setting of an object loaded from the old settings file must
-     * default to B. */ 
+     * default to B. */
 
     HRESULT rc = S_OK;
@@ -972 +972 @@
 
     if (strcmp (adapterType, "Am79C970A") == 0)
-        mData->mAdapterType = NetworkAdapterType_NetworkAdapterAm79C970A;
+        mData->mAdapterType = NetworkAdapterType_Am79C970A;
     else if (strcmp (adapterType, "Am79C973") == 0)
-        mData->mAdapterType = NetworkAdapterType_NetworkAdapterAm79C973;
+        mData->mAdapterType = NetworkAdapterType_Am79C973;
     else if (strcmp (adapterType, "82540EM") == 0)
-        mData->mAdapterType = NetworkAdapterType_NetworkAdapter82540EM;
+        mData->mAdapterType = NetworkAdapterType_I82540EM;
     else
         ComAssertMsgFailedRet (("Invalid adapter type '%s'", adapterType),
@@ -1047 +1047 @@
 }
 
-/** 
+/**
  *  Saves settings to the given adapter node.
- * 
+ *
  *  Note that the given Adapter node is comletely empty on input.
  *
  *  @param aAdapterNode <Adapter> node.
- * 
- *  @note Locks this object for reading. 
+ *
+ *  @note Locks this object for reading.
  */
 HRESULT NetworkAdapter::saveSettings (settings::Key &aAdapterNode)
@@ -1081 +1081 @@
     switch (mData->mAdapterType)
     {
-        case NetworkAdapterType_NetworkAdapterAm79C970A:
+        case NetworkAdapterType_Am79C970A:
             typeStr = "Am79C970A";
             break;
-        case NetworkAdapterType_NetworkAdapterAm79C973:
+        case NetworkAdapterType_Am79C973:
             typeStr = "Am79C973";
             break;
-        case NetworkAdapterType_NetworkAdapter82540EM:
+        case NetworkAdapterType_I82540EM:
             typeStr = "82540EM";
             break;
@@ -1099 +1099 @@
     switch (mData->mAttachmentType)
     {
-        case NetworkAttachmentType_NoNetworkAttachment:
+        case NetworkAttachmentType_Null:
         {
             /* do nothing -- empty content */
             break;
         }
-        case NetworkAttachmentType_NATNetworkAttachment:
+        case NetworkAttachmentType_NAT:
         {
             Key attachmentNode = aAdapterNode.createKey ("NAT");
             break;
         }
-        case NetworkAttachmentType_HostInterfaceNetworkAttachment:
+        case NetworkAttachmentType_HostInterface:
         {
             Key attachmentNode = aAdapterNode.createKey ("HostInterface");
@@ -1129 +1129 @@
             break;
         }
-        case NetworkAttachmentType_InternalNetworkAttachment:
+        case NetworkAttachmentType_Internal:
         {
             Key attachmentNode = aAdapterNode.createKey ("InternalNetwork");
@@ -1234 +1234 @@
     switch (mData->mAttachmentType)
     {
-        case NetworkAttachmentType_NoNetworkAttachment:
+        case NetworkAttachmentType_Null:
         {
             /* nothing to do here */
             break;
         }
-        case NetworkAttachmentType_NATNetworkAttachment:
+        case NetworkAttachmentType_NAT:
         {
             break;
         }
-        case NetworkAttachmentType_HostInterfaceNetworkAttachment:
+        case NetworkAttachmentType_HostInterface:
         {
             /* reset handle and device name */
@@ -1255 +1255 @@
             break;
         }
-        case NetworkAttachmentType_InternalNetworkAttachment:
+        case NetworkAttachmentType_Internal:
         {
             mData->mInternalNetwork.setNull();
@@ -1262 +1262 @@
     }
 
-    mData->mAttachmentType = NetworkAttachmentType_NoNetworkAttachment;
+    mData->mAttachmentType = NetworkAttachmentType_Null;
 }
 

trunk/src/VBox/Main/RemoteUSBDeviceImpl.cpp

@@ -73 +73 @@
     mPortVersion  = mVersion; /** @todo fix this */
 
-    mState        = USBDeviceState_USBDeviceAvailable;
+    mState        = USBDeviceState_Available;
 
     mDirty        = false;

trunk/src/VBox/Main/SerialPortImpl.cpp

@@ -160 +160 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-/** 
+/**
  *  Loads settings from the given port node.
  *  May be called once right after this object creation.
- * 
+ *
  *  @param aPortNode <Port> node.
- * 
- *  @note Locks this object for writing. 
+ *
+ *  @note Locks this object for writing.
  */
 HRESULT SerialPort::loadSettings (const settings::Key &aPortNode)
@@ -188 +188 @@
      * place when a setting of a newly created object must default to A while
      * the same setting of an object loaded from the old settings file must
-     * default to B. */ 
+     * default to B. */
 
     /* enabled (required) */
@@ -199 +199 @@
     const char *mode = aPortNode.stringValue ("hostMode");
     if (strcmp (mode, "HostPipe") == 0)
-        mData->mHostMode = PortMode_HostPipePort;
+        mData->mHostMode = PortMode_HostPipe;
     else if (strcmp (mode, "HostDevice") == 0)
-        mData->mHostMode = PortMode_HostDevicePort;
+        mData->mHostMode = PortMode_HostDevice;
     else if (strcmp (mode, "Disconnected") == 0)
-        mData->mHostMode = PortMode_DisconnectedPort;
+        mData->mHostMode = PortMode_Disconnected;
     else
         ComAssertMsgFailedRet (("Invalid port mode '%s'\n", mode), E_FAIL);
@@ -225 +225 @@
  *
  *  @param aPortNode <Port> node.
- * 
+ *
  *  @note Locks this object for reading.
  */
@@ -246 +246 @@
     switch (mData->mHostMode)
     {
-        case PortMode_DisconnectedPort:
+        case PortMode_Disconnected:
             mode = "Disconnected";
             break;
-        case PortMode_HostPipePort:
+        case PortMode_HostPipe:
             mode = "HostPipe";
             break;
-        case PortMode_HostDevicePort:
+        case PortMode_HostDevice:
             mode = "HostDevice";
             break;
@@ -261 +261 @@
     }
     aPortNode.setStringValue ("hostMode", mode);
-    
+
     /* Always save non-null mPath and mServer to preserve the user values for
      * later use. Note that 'server' is false by default in XML so we don't
@@ -273 +273 @@
 }
 
-/** 
+/**
  *  @note Locks this object for writing.
  */
@@ -297 +297 @@
 }
 
-/** 
+/**
  *  @note Locks this object for writing, together with the peer object (also
  *  for writing) if there is one.
@@ -325 +325 @@
 }
 
-/** 
+/**
  *  @note Locks this object for writing, together with the peer object
  *  represented by @a aThat (locked for reading).
@@ -426 +426 @@
         switch (aHostMode)
         {
-            case PortMode_HostPipePort:
+            case PortMode_HostPipe:
                 if (mData->mPath.isEmpty())
                     return setError (E_INVALIDARG,
@@ -433 +433 @@
                         mData->mSlot);
                 break;
-            case PortMode_HostDevicePort:
+            case PortMode_HostDevice:
                 if (mData->mPath.isEmpty())
                     return setError (E_INVALIDARG,
@@ -440 +440 @@
                         mData->mSlot);
                 break;
-            case PortMode_DisconnectedPort:
+            case PortMode_Disconnected:
                 break;
         }
@@ -601 +601 @@
 }
 
-/** 
+/**
  *  Validates COMSETTER(Path) arguments.
  */
@@ -608 +608 @@
     AssertReturn (isLockedOnCurrentThread(), E_FAIL);
 
-    if ((mData->mHostMode == PortMode_HostDevicePort ||
-         mData->mHostMode == PortMode_HostPipePort) &&
+    if ((mData->mHostMode == PortMode_HostDevice ||
+         mData->mHostMode == PortMode_HostPipe) &&
         (aPath == NULL || *aPath == '\0'))
         return setError (E_INVALIDARG,

trunk/src/VBox/Main/SessionImpl.cpp

@@ -48 +48 @@
 #define CHECK_OPEN() \
     do { \
-        if (mState != SessionState_SessionOpen) \
+        if (mState != SessionState_Open) \
             return setError (E_UNEXPECTED, \
                 tr ("The session is not open")); \
@@ -84 +84 @@
     LogFlowThisFuncEnter();
 
-    mState = SessionState_SessionClosed;
-    mType = SessionType_InvalidSessionType;
+    mState = SessionState_Closed;
+    mType = SessionType_Null;
 
 #if defined(RT_OS_WINDOWS)
@@ -128 +128 @@
     AutoLock alock (this);
 
-    if (mState != SessionState_SessionClosed)
-    {
-        Assert (mState == SessionState_SessionOpen ||
-                mState == SessionState_SessionSpawning);
+    if (mState != SessionState_Closed)
+    {
+        Assert (mState == SessionState_Open ||
+                mState == SessionState_Spawning);
 
         HRESULT rc = close (aFinalRelease, false /* aFromServer */);
@@ -265 +265 @@
     AutoReaderLock alock (this);
 
-    AssertReturn (mState == SessionState_SessionOpen, E_FAIL);
-
-    AssertMsgReturn (mType == SessionType_DirectSession && !!mConsole,
+    AssertReturn (mState == SessionState_Open, E_FAIL);
+
+    AssertMsgReturn (mType == SessionType_Direct && !!mConsole,
                      ("This is not a direct session!\n"), E_FAIL);
 
@@ -285 +285 @@
     AutoLock alock (this);
 
-    AssertReturn (mState == SessionState_SessionClosed, E_FAIL);
+    AssertReturn (mState == SessionState_Closed, E_FAIL);
 
     if (!aMachine)
@@ -296 +296 @@
          */
 
-        AssertReturn (mType == SessionType_InvalidSessionType, E_FAIL);
-        mType = SessionType_RemoteSession;
-        mState = SessionState_SessionSpawning;
+        AssertReturn (mType == SessionType_Null, E_FAIL);
+        mType = SessionType_Remote;
+        mState = SessionState_Spawning;
 
         LogFlowThisFuncLeave();
@@ -327 +327 @@
     if (SUCCEEDED (rc))
     {
-        mType = SessionType_DirectSession;
-        mState = SessionState_SessionOpen;
+        mType = SessionType_Direct;
+        mState = SessionState_Open;
     }
     else
@@ -356 +356 @@
     AutoLock alock (this);
 
-    AssertReturn (mState == SessionState_SessionClosed ||
-                  mState == SessionState_SessionSpawning, E_FAIL);
+    AssertReturn (mState == SessionState_Closed ||
+                  mState == SessionState_Spawning, E_FAIL);
 
     HRESULT rc = E_FAIL;
@@ -396 +396 @@
          *  argument is NULL (a special case)
          */
-        if (mType != SessionType_RemoteSession)
-            mType = SessionType_ExistingSession;
+        if (mType != SessionType_Remote)
+            mType = SessionType_Existing;
         else
-            Assert (mState == SessionState_SessionSpawning);
-
-        mState = SessionState_SessionOpen;
+            Assert (mState == SessionState_Spawning);
+
+        mState = SessionState_Open;
     }
     else
@@ -433 +433 @@
     AutoReaderLock alock (this);
 
-    if (mState == SessionState_SessionClosing)
+    if (mState == SessionState_Closing)
     {
         LogFlowThisFunc (("Already being closed.\n"));
@@ -439 +439 @@
     }
 
-    AssertReturn (mState == SessionState_SessionOpen &&
-                  mType == SessionType_DirectSession, E_FAIL);
+    AssertReturn (mState == SessionState_Open &&
+                  mType == SessionType_Direct, E_FAIL);
 
     AssertReturn (!mControl.isNull(), E_FAIL);
@@ -462 +462 @@
         LogFlowThisFunc (("mState=%d, mType=%d\n", mState, mType));
 
-        if (mState == SessionState_SessionClosing)
+        if (mState == SessionState_Closing)
         {
             LogFlowThisFunc (("Already being closed.\n"));
@@ -468 +468 @@
         }
 
-        AssertReturn (mState == SessionState_SessionOpen, E_FAIL);
+        AssertReturn (mState == SessionState_Open, E_FAIL);
 
         /* close ourselves */
@@ -501 +501 @@
 
     AutoReaderLock alock (this);
-    AssertReturn (mState == SessionState_SessionOpen &&
-                  mType == SessionType_DirectSession, E_FAIL);
+    AssertReturn (mState == SessionState_Open &&
+                  mType == SessionType_Direct, E_FAIL);
 
     return mConsole->onDVDDriveChange();
@@ -515 +515 @@
 
     AutoReaderLock alock (this);
-    AssertReturn (mState == SessionState_SessionOpen &&
-                  mType == SessionType_DirectSession, E_FAIL);
+    AssertReturn (mState == SessionState_Open &&
+                  mType == SessionType_Direct, E_FAIL);
 
     return mConsole->onFloppyDriveChange();
@@ -529 +529 @@
 
     AutoReaderLock alock (this);
-    AssertReturn (mState == SessionState_SessionOpen &&
-                  mType == SessionType_DirectSession, E_FAIL);
+    AssertReturn (mState == SessionState_Open &&
+                  mType == SessionType_Direct, E_FAIL);
 
     return mConsole->onNetworkAdapterChange(networkAdapter);
@@ -543 +543 @@
 
     AutoReaderLock alock (this);
-    AssertReturn (mState == SessionState_SessionOpen &&
-                  mType == SessionType_DirectSession, E_FAIL);
+    AssertReturn (mState == SessionState_Open &&
+                  mType == SessionType_Direct, E_FAIL);
 
     return mConsole->onSerialPortChange(serialPort);
@@ -557 +557 @@
 
     AutoReaderLock alock (this);
-    AssertReturn (mState == SessionState_SessionOpen &&
-                  mType == SessionType_DirectSession, E_FAIL);
+    AssertReturn (mState == SessionState_Open &&
+                  mType == SessionType_Direct, E_FAIL);
 
     return mConsole->onParallelPortChange(parallelPort);
@@ -571 +571 @@
 
     AutoReaderLock alock (this);
-    AssertReturn (mState == SessionState_SessionOpen &&
-                  mType == SessionType_DirectSession, E_FAIL);
+    AssertReturn (mState == SessionState_Open &&
+                  mType == SessionType_Direct, E_FAIL);
 
     return mConsole->onVRDPServerChange();
@@ -585 +585 @@
 
     AutoReaderLock alock (this);
-    AssertReturn (mState == SessionState_SessionOpen &&
-                  mType == SessionType_DirectSession, E_FAIL);
+    AssertReturn (mState == SessionState_Open &&
+                  mType == SessionType_Direct, E_FAIL);
 
     return mConsole->onUSBControllerChange();
@@ -599 +599 @@
 
     AutoReaderLock alock (this);
-    AssertReturn (mState == SessionState_SessionOpen &&
-                  mType == SessionType_DirectSession, E_FAIL);
+    AssertReturn (mState == SessionState_Open &&
+                  mType == SessionType_Direct, E_FAIL);
 
     return mConsole->onSharedFolderChange (aGlobal);
@@ -615 +615 @@
 
     AutoReaderLock alock (this);
-    AssertReturn (mState == SessionState_SessionOpen &&
-                  mType == SessionType_DirectSession, E_FAIL);
+    AssertReturn (mState == SessionState_Open &&
+                  mType == SessionType_Direct, E_FAIL);
 
     return mConsole->onUSBDeviceAttach (aDevice, aError, aMaskedIfs);
@@ -630 +630 @@
 
     AutoReaderLock alock (this);
-    AssertReturn (mState == SessionState_SessionOpen &&
-                  mType == SessionType_DirectSession, E_FAIL);
+    AssertReturn (mState == SessionState_Open &&
+                  mType == SessionType_Direct, E_FAIL);
 
     return mConsole->onUSBDeviceDetach (aId, aError);
@@ -642 +642 @@
 
     AutoReaderLock alock (this);
-    AssertReturn (mState == SessionState_SessionOpen &&
-                  mType == SessionType_DirectSession, E_FAIL);
+    AssertReturn (mState == SessionState_Open &&
+                  mType == SessionType_Direct, E_FAIL);
 
     return mConsole->onShowWindow (aCheck, aCanShow, aWinId);
@@ -673 +673 @@
     LogFlowThisFunc (("mState=%d, mType=%d\n", mState, mType));
 
-    if (mState != SessionState_SessionOpen)
-    {
-        Assert (mState == SessionState_SessionSpawning);
+    if (mState != SessionState_Open)
+    {
+        Assert (mState == SessionState_Spawning);
 
         /* The session object is going to be uninitialized by the client before
@@ -685 +685 @@
         AssertFailed();
 
-        mState = SessionState_SessionClosed;
-        mType = SessionType_InvalidSessionType;
+        mState = SessionState_Closed;
+        mType = SessionType_Null;
 #if defined(RT_OS_WINDOWS)
         Assert (!mIPCSem && !mIPCThreadSem);
@@ -702 +702 @@
 
     /* go to the closing state */
-    mState =  SessionState_SessionClosing;
-
-    if (mType == SessionType_DirectSession)
+    mState =  SessionState_Closing;
+
+    if (mType == SessionType_Direct)
     {
         mConsole->uninit();
@@ -734 +734 @@
          *  direct session has initiated a closure just a bit before us) so
          *  we need to release the lock to avoid deadlocks. The state is already
-         *  SessionState_SessionClosing here, so it's safe.
+         *  SessionState_Closing here, so it's safe.
          */
         alock.leave();
@@ -748 +748 @@
          *  been closed, we're just too late with our notification and nothing more
          */
-        if (mType != SessionType_DirectSession && rc == E_UNEXPECTED)
+        if (mType != SessionType_Direct && rc == E_UNEXPECTED)
             rc = S_OK;
 
@@ -756 +756 @@
     mControl.setNull();
 
-    if (mType == SessionType_DirectSession)
+    if (mType == SessionType_Direct)
     {
         releaseIPCSemaphore();
@@ -772 +772 @@
     }
 
-    mState = SessionState_SessionClosed;
-    mType = SessionType_InvalidSessionType;
+    mState = SessionState_Closed;
+    mType = SessionType_Null;
 
     /* release the VirtualBox instance as the very last step */

trunk/src/VBox/Main/USBDeviceFilterImpl.cpp

@@ -1301 +1301 @@
     mData->mActive = FALSE;
 #ifndef VBOX_WITH_USBFILTER
-    mData->mAction = USBDeviceFilterAction_USBDeviceFilterIgnore;
+    mData->mAction = USBDeviceFilterAction_Ignore;
 #endif /* !VBOX_WITH_USBFILTER */
 
@@ -1864 +1864 @@
     switch (USBFilterGetFilterType (&mData->mUSBFilter))
     {
-        case USBFILTERTYPE_IGNORE:   *aAction = USBDeviceFilterAction_USBDeviceFilterIgnore; break;
-        case USBFILTERTYPE_CAPTURE:  *aAction = USBDeviceFilterAction_USBDeviceFilterHold; break;
-        default:                     *aAction = USBDeviceFilterAction_InvalidUSBDeviceFilterAction; break;
+        case USBFILTERTYPE_IGNORE:   *aAction = USBDeviceFilterAction_Ignore; break;
+        case USBFILTERTYPE_CAPTURE:  *aAction = USBDeviceFilterAction_Hold; break;
+        default:                     *aAction = USBDeviceFilterAction_Null; break;
     }
 #endif  /* VBOX_WITH_USBFILTER */
@@ -1895 +1895 @@
     switch (aAction)
     {
-        case USBDeviceFilterAction_USBDeviceFilterIgnore:   filterType = USBFILTERTYPE_IGNORE; break;
-        case USBDeviceFilterAction_USBDeviceFilterHold:     filterType = USBFILTERTYPE_CAPTURE; break;
-        case USBDeviceFilterAction_InvalidUSBDeviceFilterAction:
+        case USBDeviceFilterAction_Ignore:   filterType = USBFILTERTYPE_IGNORE; break;
+        case USBDeviceFilterAction_Hold:     filterType = USBFILTERTYPE_CAPTURE; break;
+        case USBDeviceFilterAction_Null:
             return setError (E_INVALIDARG,
                 tr ("Action value InvalidUSBDeviceFilterAction is not permitted"));

trunk/src/VBox/Main/USBProxyService.cpp

@@ -511 +511 @@
                      * quite logical because the proxy doesn't know anything about guest VMs. We use HELD_BY_PROXY
                      * instead -- it is sufficient and is what Main expects. */
-                    case USBDeviceState_USBDeviceCaptured:      aUSBDevice->enmState = USBDEVICESTATE_HELD_BY_PROXY; break;
-                    case USBDeviceState_USBDeviceHeld:          aUSBDevice->enmState = USBDEVICESTATE_HELD_BY_PROXY; break;
-                    case USBDeviceState_USBDeviceAvailable:     aUSBDevice->enmState = USBDEVICESTATE_UNUSED; break;
-                    case USBDeviceState_USBDeviceUnavailable:   aUSBDevice->enmState = USBDEVICESTATE_USED_BY_HOST; break;
-                    case USBDeviceState_USBDeviceBusy:          aUSBDevice->enmState = USBDEVICESTATE_USED_BY_HOST_CAPTURABLE; break;
+                    case USBDeviceState_Captured:      aUSBDevice->enmState = USBDEVICESTATE_HELD_BY_PROXY; break;
+                    case USBDeviceState_Held:          aUSBDevice->enmState = USBDEVICESTATE_HELD_BY_PROXY; break;
+                    case USBDeviceState_Available:     aUSBDevice->enmState = USBDEVICESTATE_UNUSED; break;
+                    case USBDeviceState_Unavailable:   aUSBDevice->enmState = USBDEVICESTATE_USED_BY_HOST; break;
+                    case USBDeviceState_Busy:          aUSBDevice->enmState = USBDEVICESTATE_USED_BY_HOST_CAPTURABLE; break;
                     default:
                         AssertMsgFailed(("%d\n", aDevice->pendingState()));

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1347 +1347 @@
     if (!aMachineIDs)
         return E_POINTER;
-    if (aUsage == ResourceUsage_InvalidUsage)
+    if (aUsage == ResourceUsage_Null)
         return E_INVALIDARG;
 
@@ -1386 +1386 @@
     CheckComRCReturnRC (rc);
 
-    if (!getDVDImageUsage (aId, ResourceUsage_AllUsage))
+    if (!getDVDImageUsage (aId, ResourceUsage_All))
     {
         /* remove from the collection */
@@ -1516 +1516 @@
     if (!aMachineIDs)
         return E_POINTER;
-    if (aUsage == ResourceUsage_InvalidUsage)
+    if (aUsage == ResourceUsage_Null)
         return E_INVALIDARG;
 
@@ -1555 +1555 @@
     CheckComRCReturnRC (rc);
 
-    if (!getFloppyImageUsage (aId, ResourceUsage_AllUsage))
+    if (!getFloppyImageUsage (aId, ResourceUsage_All))
     {
         /* remove from the collection */
@@ -1918 +1918 @@
     CheckComRCReturnRC (rc);
 
-    if (state != SessionState_SessionClosed)
+    if (state != SessionState_Closed)
         return setError (E_INVALIDARG,
             tr ("The given session is already open or being opened"));
@@ -1938 +1938 @@
 
         /* fire an event */
-        onSessionStateChange (aMachineId, SessionState_SessionOpen);
+        onSessionStateChange (aMachineId, SessionState_Open);
     }
 
@@ -1972 +1972 @@
     CheckComRCReturnRC (rc);
 
-    if (state != SessionState_SessionClosed)
+    if (state != SessionState_Closed)
         return setError (E_INVALIDARG,
             tr ("The given session is already open or being opened"));
@@ -1995 +1995 @@
 
         /* fire an event */
-        onSessionStateChange (aMachineId, SessionState_SessionSpawning);
+        onSessionStateChange (aMachineId, SessionState_Spawning);
     }
 
@@ -2024 +2024 @@
     CheckComRCReturnRC (rc);
 
-    if (state != SessionState_SessionClosed)
+    if (state != SessionState_Closed)
         return setError (E_INVALIDARG,
             tr ("The given session is already open or being opened"));

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -98 +98 @@
 
   <enum
-     name="TriStateBool"
-     uuid="523ff64d-842a-4b1a-80e7-c311b028cb3a"
-     >
+    name="TSBool"
+    uuid="523ff64d-842a-4b1a-80e7-c311b028cb3a"
+  >
     <desc>
-      This represents a boolean variable having a third state, default.
+      Boolean variable having a third state, default.
     </desc>
 
-    <const name="TSFalse"   value="0"/>
-    <const name="TSTrue"    value="1"/>
-    <const name="TSDefault" value="2"/>
+    <const name="False"   value="0"/>
+    <const name="True"    value="1"/>
+    <const name="Default" value="2"/>
   </enum>
 
   <enum
-     name="MachineState"
-     uuid="73bf04d0-7c4f-4684-9abf-d65a9ad74343"
-     >
+    name="MachineState"
+    uuid="73bf04d0-7c4f-4684-9abf-d65a9ad74343"
+  >
     <desc>
       Virtual machine execution state. This enumeration represents possible
@@ -119 +119 @@
     </desc>
 
-    <const name="InvalidMachineState"   value="0">
-      <desc>
-        Invalid machine state. This state is never used by the virtual machine
-        and may be used as a <tt>null</tt> value for state
-        variables.
-      </desc>
+    <const name="Null"                  value="0">
+      <desc><tt>null</tt> value. Never used by the API.</desc>
     </const>
     <const name="PoweredOff"            value="1">
@@ -228 +224 @@
 
   <enum
-     name="SessionState"
-     uuid="CF2700C0-EA4B-47ae-9725-7810114B94D8"
-     >
+    name="SessionState"
+    uuid="CF2700C0-EA4B-47ae-9725-7810114B94D8"
+  >
     <desc>
       Session state. This enumeration represents possible values of
@@ -238 +234 @@
     </desc>
 
-    <const name="InvalidSessionState"   value="0"/>
-    <const name="SessionClosed"         value="1">
+    <const name="Null"                  value="0">
+      <desc><tt>null</tt> value. Never used by the API.</desc>
+    </const>
+    <const name="Closed"                value="1">
       <desc>
         The machine has no open sessions (<link to="IMachine::sessionState"/>);
@@ -245 +243 @@
       </desc>
     </const>
-    <const name="SessionOpen"           value="2">
+    <const name="Open"                  value="2">
       <desc>
         The machine has an open direct session (<link to="IMachine::sessionState"/>);
@@ -251 +249 @@
       </desc>
     </const>
-    <const name="SessionSpawning"       value="3">
+    <const name="Spawning"              value="3">
       <desc>
         A new (direct) session is being opened for the machine
@@ -261 +259 @@
       </desc>
     </const>
-    <const name="SessionClosing"       value="4">
+    <const name="Closing"               value="4">
       <desc>
         The direct session is being closed (<link to="IMachine::sessionState"/>);
@@ -270 +268 @@
 
   <enum
-     name="SessionType"
-     uuid="A13C02CB-0C2C-421E-8317-AC0E8AAA153A"
-     >
+    name="SessionType"
+    uuid="A13C02CB-0C2C-421E-8317-AC0E8AAA153A"
+  >
     <desc>
       Session type. This enumeration represents possible values of the
@@ -278 +276 @@
     </desc>
 
-    <const name="InvalidSessionType"    value="0"/>
-    <const name="DirectSession"         value="1">
+    <const name="Null"                  value="0">
+      <desc><tt>null</tt> value. Never used by the API.</desc>
+    </const>
+    <const name="Direct"                value="1">
       <desc>
         Direct session
@@ -285 +285 @@
       </desc>
     </const>
-    <const name="RemoteSession"         value="2">
+    <const name="Remote"                value="2">
       <desc>
         Remote session
@@ -291 +291 @@
       </desc>
     </const>
-    <const name="ExistingSession"       value="3">
+    <const name="Existing"              value="3">
       <desc>
         Existing session
@@ -300 +300 @@
 
   <enum
-     name="DeviceType"
-     uuid="6d9420f7-0b56-4636-99f9-7346f1b01e57"
-     >
+    name="DeviceType"
+    uuid="6d9420f7-0b56-4636-99f9-7346f1b01e57"
+  >
     <desc>
       Device type.
     </desc>
-    <const name="NoDevice"          value="0">
-      <desc>
-        No Device. This value is not used by
-        <link to="IConsole::getDeviceActivity"/>
+    <const name="Null"              value="0">
+      <desc>
+        <tt>null</tt> value which may also mean "no device".
+        <note>
+          This value is not allowed for
+          <link to="IConsole::getDeviceActivity"/>
+        </note>
       </desc>
     </const>
-    <const name="FloppyDevice"      value="1">
+    <const name="Floppy"            value="1">
       <desc>Floppy device.</desc>
     </const>
-    <const name="DVDDevice"         value="2">
+    <const name="DVD"               value="2">
       <desc>CD/DVD-ROM device.</desc>
     </const>
-    <const name="HardDiskDevice"    value="3">
+    <const name="HardDisk"          value="3">
       <desc>Hard disk device.</desc>
     </const>
-    <const name="NetworkDevice"     value="4">
+    <const name="Network"           value="4">
       <desc>Network device.</desc>
     </const>
-    <const name="USBDevice"         value="5">
+    <const name="USB"               value="5">
       <desc>USB device.</desc>
     </const>
-    <const name="SharedFolderDevice" value="6">
+    <const name="SharedFolder"      value="6">
       <desc>Shared folder device.</desc>
     </const>
@@ -333 +336 @@
 
   <enum
-     name="DeviceActivity"
-     uuid="6FC8AEAA-130A-4eb5-8954-3F921422D707"
-     >
-    <const name="InvalidActivity"   value="0"/>
-    <const name="DeviceIdle"        value="1"/>
-    <const name="DeviceReading"     value="2"/>
-    <const name="DeviceWriting"     value="3"/>
+    name="DeviceActivity"
+    uuid="6FC8AEAA-130A-4eb5-8954-3F921422D707"
+  >
+    <desc>
+      Device activity for <link to="IConsole::getDeviceActivity"/>.
+    </desc>
+
+    <const name="Null"              value="0"/>
+    <const name="Idle"              value="1"/>
+    <const name="Reading"           value="2"/>
+    <const name="Writing"           value="3"/>
   </enum>
 
   <enum
-     name="ResourceUsage"
-     uuid="FC56E4B6-B195-48e2-A5E1-A667B0D9F809"
-     >
+    name="ResourceUsage"
+    uuid="FC56E4B6-B195-48e2-A5E1-A667B0D9F809"
+  >
     <desc>
       Usage type constants for
@@ -351 +358 @@
       <link to="IVirtualBox::getFloppyImageUsage"/>.
     </desc>
-    <const name="InvalidUsage"      value="0"/>
-    <const name="PermanentUsage"    value="1">
+
+    <const name="Null"              value="0">
+      <desc><tt>null</tt> value. Never used by the API.</desc>
+    </const>
+    <const name="Permanent"         value="1">
       <desc>
         Scopes the VMs that use the resource permanently
@@ -359 +369 @@
       </desc>
     </const>
-    <const name="TemporaryUsage"    value="2">
+    <const name="Temporary"         value="2">
       <desc>
         Scopes the VMs that are temporarily using the resource
@@ -367 +377 @@
       </desc>
     </const>
-    <const name="AllUsage"          value="3">
-      <desc>
-        Combines PermanentUsage and TemporaryUsage.
+    <const name="All"               value="3">
+      <desc>
+        Combines Permanent and Temporary.
       </desc>
     </const>
@@ -375 +385 @@
 
   <enum
-     name="DiskControllerType"
-     uuid="1115b810-2ee7-4ebd-8b39-92e98c9a2b48"
-     >
-    <const name="InvalidController"  value="0"/>
-    <const name="IDE0Controller"     value="1"/>
-    <const name="IDE1Controller"     value="2"/>
+    name="DiskControllerType"
+    uuid="1115b810-2ee7-4ebd-8b39-92e98c9a2b48"
+  >
+    <desc>
+      Disk controller type for hard disk attachments.
+    </desc>
+
+    <const name="Null"              value="0">
+      <desc><tt>null</tt> value. Never used by the API.</desc>
+    </const>
+    <const name="IDE0"              value="1"/>
+    <const name="IDE1"              value="2"/>
   </enum>
 
   <enum
-     name="ClipboardMode"
-     uuid="33364716-4008-4701-8f14-be0fa3d62950"
-     >
-    <const name="ClipDisabled"         value="0"/>
-    <const name="ClipHostToGuest"      value="1"/>
-    <const name="ClipGuestToHost"      value="2"/>
-    <const name="ClipBidirectional"    value="3"/>
+    name="ClipboardMode"
+    uuid="33364716-4008-4701-8f14-be0fa3d62950"
+  >
+    <desc>
+     Host-Guest clipboard interchange mode.
+    </desc>
+
+    <const name="Disabled"          value="0"/>
+    <const name="HostToGuest"       value="1"/>
+    <const name="GuestToHost"       value="2"/>
+    <const name="Bidirectional"     value="3"/>
   </enum>
 
   <enum
-     name="Scope"
-     uuid="7c91096e-499e-4eca-9f9b-9001438d7855"
-     >
+    name="Scope"
+    uuid="7c91096e-499e-4eca-9f9b-9001438d7855"
+  >
     <desc>
       Scope of the operation.
@@ -403 +423 @@
       argument scope.
     </desc>
-    <const name="GlobalScope"         value="0"/>
-    <const name="MachineScope"        value="1"/>
-    <const name="SessionScope"        value="2"/>
+
+    <const name="Global"          value="0"/>
+    <const name="Machine"         value="1"/>
+    <const name="Session"         value="2"/>
   </enum>
 
   <enum
-     name="GuestStatisticType"
-     uuid="aa7c1d71-aafe-47a8-9608-27d2d337cf55"
-     >
+    name="GuestStatisticType"
+    uuid="aa7c1d71-aafe-47a8-9608-27d2d337cf55"
+  >
+    <desc>
+      Statistics type for <link to="IGuest::getStatistic"/>.
+    </desc>
+
     <const name="CPULoad_Idle"         value="0">
       <desc>
@@ -498 +523 @@
     </const>
     <const name="MaxVal"               value="17"/>
+  </enum>
+
+  <enum
+    name="BIOSBootMenuMode"
+    uuid="ae4fb9f7-29d2-45b4-b2c7-d579603135d5"
+  >
+    <desc>
+      BIOS boot menu mode.
+    </desc>
+
+    <const name="Disabled"        value="0"/>
+    <const name="MenuOnly"        value="1"/>
+    <const name="MessageAndMenu"  value="2"/>
+  </enum>
+
+  <enum
+    name="IDEControllerType"
+    uuid="445330e3-202a-4dab-854f-ce22e6cb9715"
+  >
+    <desc>
+      IDE controller type.
+    </desc>
+
+    <const name="Null"            value="0">
+      <desc><tt>null</tt> value. Never used by the API.</desc>
+    </const>
+    <const name="PIIX3"           value="1"/>
+    <const name="PIIX4"           value="2"/>
+  </enum>
+
+  <enum
+    name="DriveState"
+    uuid="cb7233b7-c519-42a5-8310-1830953cacbc"
+  >
+    <const name="Null"              value="0">
+      <desc><tt>null</tt> value. Never used by the API.</desc>
+    </const>
+    <const name="NotMounted"        value="1"/>
+    <const name="ImageMounted"      value="2"/>
+    <const name="HostDriveCaptured" value="3"/>
   </enum>
 
@@ -699 +764 @@
         values are:
 
-        - <link to="HardDiskDevice"/>: the media is a hard disk
+        - <link to="DeviceType::HardDisk"/>: the media is a hard disk
         that, if registered, can be obtained using the
         <link to="IVirtualBox::getHardDisk"/> call.
-        - <link to="DVDDevice"/>: the media is a CD/DVD image
+        - <link to="DeviceType::DVD"/>: the media is a CD/DVD image
         that, if registered, can be obtained using the
         <link to="IVirtualBox::getDVDImage"/> call.
-        - <link to="FloppyDevice"/>: the media is a Floppy image
+        - <link to="DeviceType::Floppy"/>: the media is a Floppy image
         that, if registered, can be obtained using the
         <link to="IVirtualBox::getFloppyImage"/> call.
@@ -811 +876 @@
 
   <interface
-     name="IVirtualBox" extends="$dispatched"
-     uuid="64f652cb-7fdf-482d-ae19-4dbb289a5ca0"
-     wsmap="managed"
-     >
+    name="IVirtualBox" extends="$dispatched"
+    uuid="64f652cb-7fdf-482d-ae19-4dbb289a5ca0"
+    wsmap="managed"
+  >
     <desc>
       The IVirtualBox interface represents the main interface exposed by the
@@ -820 +885 @@
 
       An instance of IVirtualBox is required for the product to do anything
-      useful. Even though the interface does not expose this, internally, IVirtualBox
-      is implemented as a singleton and actually lives in the process of the
-      VirtualBox server (VBoxSVC.exe). This makes sure that IVirtualBox can
-      track the state of all virtual machines on a particular host, regardless
-      of which frontend started them.
-
-      To enumerate all the virtual machines on the host, use the <link to="IVirtualBox::machines" />
-      attribute.</desc>
+      useful. Even though the interface does not expose this, internally,
+      IVirtualBox is implemented as a singleton and actually lives in the
+      process of the VirtualBox server (VBoxSVC.exe). This makes sure that
+      IVirtualBox can track the state of all virtual machines on a particular
+      host, regardless of which frontend started them.
+
+      To enumerate all the virtual machines on the host, use the
+      <link to="IVirtualBox::machines"/> attribute.
+    </desc>
 
     <attribute name="version" type="wstring" readonly="yes">
@@ -1428 +1494 @@
           by spaces. A null string means that the image is not used.
           <note>
-            When the usage type is <link to="ResourceUsage::AllUsage"/>
-            and the image is used by the VM both permanently
-            and temporarily, the VM's UUID will be present only
-            once in the list.
+            When the usage type is <link to="ResourceUsage::All"/> and the image
+            is used by the VM both permanently and temporarily, the VM's UUID
+            will be present only once in the list.
           </note>
         </desc>
@@ -1543 +1608 @@
           by spaces. A null string means that the image is not used.
           <note>
-            When the usage type is <link to="ResourceUsage::AllUsage"/>
-            and the image is used by the VM both permanently
-            and temporarily, the VM's UUID will be present only
-            once in the list.
+            When the usage type is <link to="ResourceUsage::All"/> and the image
+            is used by the VM both permanently and temporarily, the VM's UUID
+            will be present only once in the list.
           </note>
         </desc>
@@ -2178 +2242 @@
 
   </interface>
-
-  <enum
-     name="BIOSBootMenuMode"
-     uuid="ae4fb9f7-29d2-45b4-b2c7-d579603135d5"
-     >
-    <desc>
-      This represents the BIOS boot menu state.
-    </desc>
-
-    <const name="Disabled"       value="0"/>
-    <const name="MenuOnly"       value="1"/>
-    <const name="MessageAndMenu" value="2"/>
-  </enum>
-
-  <enum
-     name="IDEControllerType"
-     uuid="445330e3-202a-4dab-854f-ce22e6cb9715"
-     >
-    <const name="InvalidIDEControllerType"       value="0"/>
-    <const name="IDEControllerPIIX3"             value="1"/>
-    <const name="IDEControllerPIIX4"             value="2"/>
-  </enum>
 
   <interface
@@ -2484 +2526 @@
     </attribute>
 
-    <attribute name="HWVirtExEnabled" type="TriStateBool">
+    <attribute name="HWVirtExEnabled" type="TSBool">
       <desc>
         This setting determines whether VirtualBox will try to make use of
@@ -2730 +2772 @@
 
         To indicate that no device is associated with the given position,
-        <link to="DeviceType::NoDevice"/> should be used.
+        <link to="DeviceType::Null"/> should be used.
 
         @todo setHardDiskBootOrder(), setNetworkBootOrder()
@@ -2759 +2801 @@
 
         If here are no devices at the given position, then
-        <link to="DeviceType::NoDevice"/> is returned.
+        <link to="DeviceType::Null"/> is returned.
 
         @todo getHardDiskBootOrder(), getNetworkBootOrder()
@@ -3362 +3404 @@
         The @a scope argument defines one of three scopes:
         <link to="IVirtualBox::sharedFolders">global shared folders</link>
-        (<link to="Scope::GlobalScope">GlobalScope</link>),
+        (<link to="Scope::Global">Global</link>),
         <link to="IMachine::sharedFolders">permanent shared folders</link> of
-        the machine (<link to="Scope::MachineScope">MachineScope</link>)
-        or <link to="IConsole::sharedFolders">transient shared folders</link>
-        of the machine
-        (<link to="Scope::SessionScope">SessionScope</link>). Interested
-        callees should use query the corresponding collections to find out
-        what has changed.
+        the machine (<link to="Scope::Machine">Machine</link>) or <link
+        to="IConsole::sharedFolders">transient shared folders</link> of the
+        machine (<link to="Scope::Session">Session</link>). Interested callees
+        should use query the corresponding collections to find out what has
+        changed.
       </desc>
       <param name="scope" type="Scope" dir="in">
@@ -3887 +3928 @@
 
         The device needs to be in one of the following states:
-        <link to="USBDeviceState::USBDeviceBusy">USBDeviceBusy</link>,
-        <link to="USBDeviceState::USBDeviceAvailable">USBDeviceAvailable</link> or
-        <link to="USBDeviceState::USBDeviceHeld">USBDeviceHeld</link>,
+        <link to="USBDeviceState::Busy">Busy</link>,
+        <link to="USBDeviceState::Available">Available</link> or
+        <link to="USBDeviceState::Held">Held</link>,
         otherwise an error is immediately returned.
 
         When the device state is
-        <link to="USBDeviceState::USBDeviceBusy">USBDeviceBusy</link>,
-        an error may also be returned if the host computer
-        refuses to release it for some reason.
+        <link to="USBDeviceState::Busy">Busy</link>, an error may also
+        be returned if the host computer refuses to release it for some reason.
 
         <see>IUSBController::deviceFilters, USBDeviceState</see>
@@ -4017 +4057 @@
 
         You cannot discard the snapshot if it
-        stores <link to="HardDiskType::NormalHardDisk">normal</link>
-        (non-differencing) hard disks that have differencing hard disks based
-        on them. Snapshots of such kind can be discarded only when every
-        normal hard disk has either no children at all or exactly one
-        child. In the former case, the normal hard disk simply becomes unused
-        (i.e. not attached to any VM). In the latter case, it receives all the
-        changes strored in the child hard disk, and then it replaces the child
-        hard disk in the configuration of the corresponding snapshot or
-        machine.
+        stores <link to="HardDiskType::Normal">normal</link> (non-differencing)
+        hard disks that have differencing hard disks based on them. Snapshots of
+        such kind can be discarded only when every normal hard disk has either
+        no children at all or exactly one child. In the former case, the normal
+        hard disk simply becomes unused (i.e. not attached to any VM). In the
+        latter case, it receives all the changes strored in the child hard disk,
+        and then it replaces the child hard disk in the configuration of the
+        corresponding snapshot or machine.
 
         Also, you cannot discard the snapshot if it stores hard disks
@@ -5331 +5370 @@
 
   <enum
-     name="HardDiskStorageType"
-     uuid="48138584-ad99-479d-a36f-eb82a7663685"
-     >
+    name="HardDiskStorageType"
+    uuid="48138584-ad99-479d-a36f-eb82a7663685"
+  >
     <desc>
       Virtual hard disk storage type.
       <see>IHardDisk</see>
     </desc>
-    <const name="VirtualDiskImage" value="0">
+
+    <const name="VirtualDiskImage"  value="0">
       <desc>
         Virtual Disk Image, VDI (a regular file in the file
@@ -5344 +5384 @@
       </desc>
     </const>
-    <const name="ISCSIHardDisk" value="1">
+    <const name="ISCSIHardDisk"     value="1">
       <desc>
         iSCSI Remote Disk (a disk accessed via the Internet
@@ -5351 +5391 @@
       </desc>
     </const>
-    <const name="VMDKImage" value="2">
+    <const name="VMDKImage"         value="2">
       <desc>
         VMware Virtual Machine Disk image (a regular file in the file
@@ -5357 +5397 @@
       </desc>
     </const>
-    <const name="CustomHardDisk" value="3">
+    <const name="CustomHardDisk"    value="3">
       <desc>
         Disk formats supported through plugins (see
@@ -5363 +5403 @@
       </desc>
     </const>
-    <const name="VHDImage" value="4">
+    <const name="VHDImage"          value="4">
       <desc>
         Virtual PC Virtual Machine Disk image (a regular file in the file
@@ -5372 +5412 @@
 
   <enum
-     name="HardDiskType"
-     uuid="a348fafd-a64e-4643-ba65-eb3896bd7e0a"
-     >
+    name="HardDiskType"
+    uuid="a348fafd-a64e-4643-ba65-eb3896bd7e0a"
+   >
     <desc>
       Virtual hard disk type.
       <see>IHardDisk</see>
     </desc>
-    <const name="NormalHardDisk" value="0">
+
+    <const name="Normal"            value="0">
       <desc>
         Normal hard disk (attached directly or indirectly, preserved
@@ -5385 +5426 @@
       </desc>
     </const>
-    <const name="ImmutableHardDisk" value="1">
+    <const name="Immutable"         value="1">
       <desc>
         Immutable hard disk (attached indirectly, changes are wiped out
@@ -5391 +5432 @@
       </desc>
     </const>
-    <const name="WritethroughHardDisk" value="2">
+    <const name="Writethrough"      value="2">
       <desc>
         Write through hard disk (attached directly, ignored when
@@ -5793 +5834 @@
 
         Type (behavior) of this hard disk. For a newly created or opened hard
-        disk, this value is <link to="HardDiskType::NormalHardDisk"/>.
+        disk, this value is <link to="HardDiskType::Normal"/>.
 
         <note>
@@ -6185 +6226 @@
       <note>
         In the current imlementation, the type of all iSCSI hard disks
-        is <link to="HardDiskType::WritethroughHardDisk">Writethrough</link>
+        is <link to="HardDiskType::Writethrough">Writethrough</link>
         and cannot be changed.
       </note>
@@ -6291 +6332 @@
       <note>
         In the current imlementation, the type of all VMDK hard disks
-        is <link to="HardDiskType::WritethroughHardDisk">Writethrough</link>
-        and cannot be changed.
+        is <link to="HardDiskType::Writethrough">Writethrough</link> and cannot
+        be changed.
       </note>
 
@@ -6616 +6657 @@
       <note>
         In the current imlementation, the type of all VHD hard disks
-        is <link to="HardDiskType::WritethroughHardDisk">Writethrough</link>
-        and cannot be changed.
+        is <link to="HardDiskType::Writethrough">Writethrough</link> and cannot
+        be changed.
       </note>
 
@@ -6840 +6881 @@
   /////////////////////////////////////////////////////////////////////////
   -->
-
-  <enum
-     name="DriveState"
-     uuid="cb7233b7-c519-42a5-8310-1830953cacbc"
-     >
-    <const name="InvalidDriveState"  value="0"/>
-    <const name="NotMounted"         value="1"/>
-    <const name="ImageMounted"       value="2"/>
-    <const name="HostDriveCaptured"  value="3"/>
-  </enum>
 
   <interface
@@ -7093 +7124 @@
 
   <enum
-     name="MouseButtonState"
-     uuid="03131722-2EC5-4173-9794-0DACA46673EF"
-     >
+    name="MouseButtonState"
+    uuid="03131722-2EC5-4173-9794-0DACA46673EF"
+  >
+    <desc>
+      Mouse button state.
+    </desc>
+
     <const name="LeftButton"        value="0x01"/>
     <const name="RightButton"       value="0x02"/>
@@ -7227 +7262 @@
 
   <enum
-     name="FramebufferAccelerationOperation"
-     uuid="f0e5ebbe-dc8e-4e2d-916e-53baa3844df8"
-     >
+    name="FramebufferAccelerationOperation"
+    uuid="f0e5ebbe-dc8e-4e2d-916e-53baa3844df8"
+  >
+    <desc>
+      Framebuffer acceleration operation.
+    </desc>
+
     <const name="SolidFillAcceleration"   value="1"/>
     <const name="ScreenCopyAcceleration"  value="2"/>
@@ -7235 +7274 @@
 
   <enum
-     name="FramebufferPixelFormat"
-     uuid="6b27d1fc-4f2c-4e9c-a166-01d06540305d"
-     >
+    name="FramebufferPixelFormat"
+    uuid="6b27d1fc-4f2c-4e9c-a166-01d06540305d"
+  >
     <desc>
       Format of the video memory buffer. Constants represented by this enum can
@@ -7246 +7285 @@
       See also www.fourcc.org for more informantion about FOURCC pixel formats.
     </desc>
-    <const name="PixelFormatOpaque"       value="0xFFFFFFFF">
+
+    <const name="Opaque"                  value="0xFFFFFFFF">
       <desc>
         Unknown buffer format. The user may not assume any particular
@@ -7299 +7339 @@
         <note>
           This attribute must never return <link
-          to="PixelFormat::PixelFormatOpaque"/> -- the format of the buffer
+          to="PixelFormat::Opaque"/> -- the format of the buffer
           <link to="#address"/> points to must be always known.
         </note>
@@ -7399 +7439 @@
         The @a pixelFormat parameter defines whether the direct mode is
         available or not. If @a pixelFormat is <link
-        to="PixelFormat::PixelFormatOpaque"/> then direct access to the guest
+        to="PixelFormat::Opaque"/> then direct access to the guest
         VRAM buffer is not available -- the @a VRAM, @a bitsPerPixel and @a
         bytesPerLine parameters must be ignored and the implementation must use
@@ -7440 +7480 @@
         value must always correlate with <link to="#pixelFormat"/>. Note that
         the <link to="#pixelFormat"/> attribute must never return <link
-        to="PixelFormat::PixelFormatOpaque"/> regardless of the selected mode.
+        to="PixelFormat::Opaque"/> regardless of the selected mode.
 
         <note>
@@ -7811 +7851 @@
 
   <enum
-     name="NetworkAttachmentType"
-     uuid="8730d899-d036-4925-bc63-e58f3486f4bf"
-     >
-    <const name="NoNetworkAttachment"            value="0"/>
-    <const name="NATNetworkAttachment"           value="1"/>
-    <const name="HostInterfaceNetworkAttachment" value="2"/>
-    <const name="InternalNetworkAttachment"      value="3"/>
+    name="NetworkAttachmentType"
+    uuid="8730d899-d036-4925-bc63-e58f3486f4bf"
+  >
+    <desc>
+      Network attachment type.
+    </desc>
+
+    <const name="Null"                  value="0">
+      <desc><tt>null</tt> value. Also means "not attached".</desc>
+    </const>
+    <const name="NAT"                   value="1"/>
+    <const name="HostInterface"         value="2"/>
+    <const name="Internal"              value="3"/>
   </enum>
 
   <enum
-     name="NetworkAdapterType"
-     uuid="156b17b9-5d61-4d54-be90-62e37dda848d"
-     >
-    <const name="InvalidNetworkAdapterType"      value="0"/>
-    <const name="NetworkAdapterAm79C970A"        value="1"/>
-    <const name="NetworkAdapterAm79C973"         value="2"/>
-    <const name="NetworkAdapter82540EM"          value="3"/>
+    name="NetworkAdapterType"
+    uuid="156b17b9-5d61-4d54-be90-62e37dda848d"
+  >
+    <desc>
+      Network adapter type.
+    </desc>
+
+    <const name="Null"                  value="0">
+      <desc><tt>null</tt> value. Never used by the API.</desc>
+    </const>
+    <const name="Am79C970A"             value="1"/>
+    <const name="Am79C973"              value="2"/>
+    <const name="I82540EM"              value="3"/>
   </enum>
 
@@ -7973 +8025 @@
 
   <enum
-     name="PortMode"
-     uuid="b266f43c-2e93-46b3-812b-c20e600e867b"
-     >
+    name="PortMode"
+    uuid="b266f43c-2e93-46b3-812b-c20e600e867b"
+  >
     <desc>
       The PortMode enumeration represents possible communicaton modes for
@@ -7981 +8033 @@
     </desc>
 
-    <const name="DisconnectedPort"        value="0">
+    <const name="Disconnected"        value="0">
       <desc>Virtual device is not attached to any real host device.</desc>
     </const>
-    <const name="HostPipePort"            value="1">
+    <const name="HostPipe"            value="1">
       <desc>Virtual device is attached to a host pipe.</desc>
     </const>
-    <const name="HostDevicePort"          value="2">
+    <const name="HostDevice"          value="2">
       <desc>Virtual device is attached to a host device.</desc>
     </const>
@@ -8269 +8321 @@
         They are run against a list of all currently available USB
         devices (in states
-        <link to="USBDeviceState::USBDeviceAvailable">USBDeviceAvailable</link>,
-        <link to="USBDeviceState::USBDeviceBusy">USBDeviceBusy</link>,
-        <link to="USBDeviceState::USBDeviceHeld">USBDeviceHeld</link>)
-        that were not previously ignored by global filters.
+        <link to="USBDeviceState::Available">Available</link>,
+        <link to="USBDeviceState::Busy">Busy</link>,
+        <link to="USBDeviceState::Held">Held</link>) that were not previously
+        ignored by global filters.
 
         If at least one filter matches the USB device in question, this
@@ -8690 +8742 @@
       Once a supported USB device is attached to the host, global USB
       filters (<link to="IHost::USBDeviceFilters"/>) are activated. They can
-      either ignore the device, or put ot to #USBDeviceHeld state, or do
-      nothing. Unless the device is ignored by global filters, filters of
-      all currently running guests (<link to="IUSBController::deviceFilters"/>)
-      are activated that can put it to #USBDeviceCaptured state.
+      either ignore the device, or put ot to #Held state, or do nothing. Unless
+      the device is ignored by global filters, filters of all currently running
+      guests (<link to="IUSBController::deviceFilters"/>) are activated that can
+      put it to #Captured state.
 
       If the device was ignored by global filters, or didn't match
       any filters at all (including guest ones), it is handled by the host
       in a normal way. In this case, the device state is determined by
-      the host and can be one of #USBDeviceUnavailable, #USBDeviceBusy or
-      #USBDeviceAvailable, depending on the current device usage.
+      the host and can be one of #Unavailable, #Busy or #Available, depending on
+      the current device usage.
 
       Besides auto-capturing based on filters, the device can be manually
       captured by guests (<link to="IConsole::attachUSBDevice()"/>) if its
-      state is #USBDeviceBusy, #USBDeviceAvailable or #USBDeviceHeld.
+      state is #Busy, #Available or #Held.
 
       <note>
         Due to differences in USB stack implementations in Linux and Win32,
-        states #USBDeviceBusy and #USBDeviceAvailable are applicable
-        only to the Linux version of the product. This also means that
-        (<link to="IConsole::attachUSBDevice()"/>) can only succeed
-        on Win32 if the device state is #USBDeviceHeld.
+        states #Busy and #Available are applicable only to the Linux version of
+        the product. This also means that (<link
+        to="IConsole::attachUSBDevice()"/>) can only succeed on Win32 if
+        the device state is #USBDeviceHeld.
       </note>
 
@@ -8716 +8768 @@
     </desc>
 
-    <const name="USBDeviceNotSupported" value="0">
+    <const name="NotSupported"          value="0">
       <desc>
         Not supported by the VirtualBox server, not available to guests.
       </desc>
     </const>
-    <const name="USBDeviceUnavailable"  value="1">
+    <const name="Unavailable"           value="1">
       <desc>
         Being used by the host computer exclusively,
@@ -8727 +8779 @@
       </desc>
     </const>
-    <const name="USBDeviceBusy"         value="2">
+    <const name="Busy"                  value="2">
       <desc>
         Being used by the host computer, potentially available to guests.
       </desc>
     </const>
-    <const name="USBDeviceAvailable"    value="3">
+    <const name="Available"             value="3">
       <desc>
         Not used by the host computer, available to guests.
@@ -8738 +8790 @@
       </desc>
     </const>
-    <const name="USBDeviceHeld"         value="4">
+    <const name="Held"                  value="4">
       <desc>
         Held by the VirtualBox server (ignored by the host computer),
@@ -8744 +8796 @@
       </desc>
     </const>
-    <const name="USBDeviceCaptured"     value="5">
+    <const name="Captured"              value="5">
       <desc>
         Captured by one of the guest computers, not available
@@ -8836 +8888 @@
 
   <enum
-     name="USBDeviceFilterAction"
-     uuid="cbc30a49-2f4e-43b5-9da6-121320475933"
-     >
+    name="USBDeviceFilterAction"
+    uuid="cbc30a49-2f4e-43b5-9da6-121320475933"
+  >
     <desc>
       Actions for host USB device filters.
@@ -8844 +8896 @@
     </desc>
 
-    <const name="InvalidUSBDeviceFilterAction"  value="0"/>
-    <const name="USBDeviceFilterIgnore"         value="1">
+    <const name="Null"          value="0">
+      <desc><tt>null</tt> value. Never used by the API.</desc>
+    </const>
+    <const name="Ignore"        value="1">
       <desc>Ignore the matched USB device.</desc>
     </const>
-    <const name="USBDeviceFilterHold"           value="2">
+    <const name="Hold"          value="2">
       <desc>Hold the matched USB device.</desc>
     </const>
@@ -8903 +8957 @@
 
   <enum
-     name="AudioDriverType"
-     uuid="4bcc3d73-c2fe-40db-b72f-0c2ca9d68496"
-     >
-    <const name="NullAudioDriver"   value="0"/>
-    <const name="WINMMAudioDriver"  value="1"/>
-    <const name="OSSAudioDriver"    value="2"/>
-    <const name="ALSAAudioDriver"   value="3"/>
-    <const name="DSOUNDAudioDriver" value="4"/>
-    <const name="CoreAudioDriver"   value="5"/>
-    <const name="MMPMAudioDriver"   value="6"/>
-    <const name="PulseAudioDriver"  value="7"/>
+    name="AudioDriverType"
+    uuid="4bcc3d73-c2fe-40db-b72f-0c2ca9d68496"
+  >
+    <desc>
+      Host audio driver type.
+    </desc>
+
+    <const name="Null"          value="0">
+      <desc><tt>null</tt> value. Also means "dummy audio driver".</desc>
+    </const>
+    <const name="WINMM"         value="1"/>
+    <const name="OSS"           value="2"/>
+    <const name="ALSA"          value="3"/>
+    <const name="DSOUND"        value="4"/>
+    <const name="Core"          value="5"/>
+    <const name="MMPM"          value="6"/>
+    <const name="Pulse"         value="7"/>
   </enum>
 
@@ -8919 +8979 @@
     name="AudioControllerType"
     uuid="7afd395c-42c3-444e-8788-3ce80292f36c"
-    >
+  >
+    <desc>
+      Virtual audio controller type.
+    </desc>
+
     <const name="AC97" value="0"/>
     <const name="SB16" value="1"/>
@@ -8960 +9024 @@
 
   <enum
-     name="VRDPAuthType"
-     uuid="3d91887a-b67f-4b33-85bf-2da7ab1ea83a"
-     >
-    <const name="VRDPAuthNull"            value="0"/>
-    <const name="VRDPAuthExternal"        value="1"/>
-    <const name="VRDPAuthGuest"           value="2"/>
+    name="VRDPAuthType"
+    uuid="3d91887a-b67f-4b33-85bf-2da7ab1ea83a"
+  >
+    <desc>
+      VRDP authentication type.
+    </desc>
+
+    <const name="Null"            value="0">
+      <desc><tt>null</tt> value. Also means "no authentication".</desc>
+    </const>
+    <const name="External"        value="1"/>
+    <const name="Guest"           value="2"/>
   </enum>
 

trunk/src/VBox/Main/idl/midl.xsl

@@ -379 +379 @@
     <xsl:for-each select="const">
         <xsl:text>    </xsl:text>
-        <xsl:value-of select="@name"/> = <xsl:value-of select="@value"/>
+        <xsl:value-of select="concat(../@name,'_',@name)"/> = <xsl:value-of select="@value"/>
         <xsl:choose>
             <xsl:when test="position()!=last()"><xsl:text>,&#x0A;</xsl:text></xsl:when>
@@ -392 +392 @@
     <xsl:value-of select="concat('cpp_quote(&quot;#define ', @name, '_T', ' ',
                                  @name, '&quot;)&#x0A;&#x0A;')"/>
-    <xsl:text>cpp_quote("")&#x0A;</xsl:text>
-    <!-- -->
-    <xsl:value-of select="concat('/* cross-platform constants for ', @name, ' */&#x0A;')"/>
-    <xsl:for-each select="const">
-        <xsl:value-of select="concat('cpp_quote(&quot;#define ', ../@name, '_', @name, ' ',
-                                     @name, '&quot;)&#x0A;')"/>
-        <xsl:choose>
-            <xsl:when test="position()=last()"><xsl:text>cpp_quote("")&#x0A;</xsl:text></xsl:when>
-        </xsl:choose>
-    </xsl:for-each>
     <xsl:text>&#x0A;&#x0A;</xsl:text>
 </xsl:template>

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

@@ -37 +37 @@
         Data() {
             mEnabled = false;
-            mAudioDriver = AudioDriverType_NullAudioDriver;
+            mAudioDriver = AudioDriverType_Null;
             mAudioController = AudioControllerType_AC97;
         }

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

@@ -45 +45 @@
             mPXEDebugEnabled = false;
             mTimeOffset = 0;
-            mIDEControllerType = IDEControllerType_IDEControllerPIIX4;
+            mIDEControllerType = IDEControllerType_PIIX4;
         }
 

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

@@ -102 +102 @@
     bool isDifferencing() const
     {
-        return mType == HardDiskType_NormalHardDisk &&
+        return mType == HardDiskType_Normal &&
                mStorageType == HardDiskStorageType_VirtualDiskImage &&
                !mParent.isNull();
@@ -109 +109 @@
     {
         AutoLock parentLock (mParent);
-        return !mParent.isNull() && mParent->type() == HardDiskType_ImmutableHardDisk;
+        return !mParent.isNull() && mParent->type() == HardDiskType_Immutable;
     }
 
@@ -306 +306 @@
 
     State mState;
-    
+
     RTSEMEVENTMULTI mStateCheckSem;
     ULONG mStateCheckWaiters;
@@ -521 +521 @@
 
     State mState;
-    
+
     RTSEMEVENTMULTI mStateCheckSem;
     ULONG mStateCheckWaiters;
@@ -632 +632 @@
 
     State mState;
-    
+
     RTSEMEVENTMULTI mStateCheckSem;
     ULONG mStateCheckWaiters;
@@ -653 +653 @@
 
 ////////////////////////////////////////////////////////////////////////////////
- 
+
 class ATL_NO_VTABLE HVHDImage :
     public HardDisk,
@@ -746 +746 @@
 
     State mState;
-    
+
     RTSEMEVENTMULTI mStateCheckSem;
     ULONG mStateCheckWaiters;

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

@@ -227 +227 @@
         ULONG          mVRAMSize;
         ULONG          mMonitorCount;
-        TriStateBool_T mHWVirtExEnabled;
+        TSBool_T       mHWVirtExEnabled;
 
         DeviceType_T   mBootOrder [SchemaDefs::MaxBootPosition];
@@ -300 +300 @@
         AutoStateDependency (Machine *aThat)
             : mThat (aThat), mRC (S_OK)
-            , mMachineState (MachineState_InvalidMachineState)
+            , mMachineState (MachineState_Null)
             , mRegistered (FALSE)
         {
@@ -454 +454 @@
     STDMETHOD(COMSETTER(MonitorCount))(ULONG monitorCount);
     STDMETHOD(COMGETTER(BIOSSettings))(IBIOSSettings **biosSettings);
-    STDMETHOD(COMGETTER(HWVirtExEnabled))(TriStateBool_T *enabled);
-    STDMETHOD(COMSETTER(HWVirtExEnabled))(TriStateBool_T enabled);
+    STDMETHOD(COMGETTER(HWVirtExEnabled))(TSBool_T *enabled);
+    STDMETHOD(COMSETTER(HWVirtExEnabled))(TSBool_T enabled);
     STDMETHOD(COMGETTER(SnapshotFolder))(BSTR *aSavedStateFolder);
     STDMETHOD(COMSETTER(SnapshotFolder))(INPTR BSTR aSavedStateFolder);
@@ -821 +821 @@
     struct SnapshotData
     {
-        SnapshotData() : mLastState (MachineState_InvalidMachineState) {}
+        SnapshotData() : mLastState (MachineState_Null) {}
 
         MachineState_T mLastState;

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

@@ -38 +38 @@
         Data()
             : mSlot (0), mEnabled (FALSE)
-            , mAttachmentType (NetworkAttachmentType_NoNetworkAttachment)
+            , mAttachmentType (NetworkAttachmentType_Null)
             ,  mCableConnected (TRUE), mLineSpeed (0), mTraceEnabled (FALSE)
 #ifdef RT_OS_WINDOWS

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

@@ -77 +77 @@
     uint32_t clientId (void) { return mClientId; }
 
-    bool captured (void) { return mState == USBDeviceState_USBDeviceCaptured; }
+    bool captured (void) { return mState == USBDeviceState_Captured; }
     void captured (bool aCaptured)
     {
         if (aCaptured)
         {
-            Assert(mState == USBDeviceState_USBDeviceAvailable);
-            mState = USBDeviceState_USBDeviceCaptured;
+            Assert(mState == USBDeviceState_Available);
+            mState = USBDeviceState_Captured;
         }
         else
         {
-            Assert(mState == USBDeviceState_USBDeviceCaptured);
-            mState = USBDeviceState_USBDeviceAvailable;
+            Assert(mState == USBDeviceState_Captured);
+            mState = USBDeviceState_Available;
         }
     }

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

@@ -40 +40 @@
             , mIRQ (4)
             , mIOBase (0x3f8)
-            , mHostMode (PortMode_DisconnectedPort)
+            , mHostMode (PortMode_Disconnected)
             , mServer (FALSE)
         {}

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

@@ -239 +239 @@
     {
 #ifndef VBOX_WITH_USBFILTER
-        Data() : mAction (USBDeviceFilterAction_USBDeviceFilterIgnore) {}
+        Data() : mAction (USBDeviceFilterAction_Ignore) {}
         USBDeviceFilterAction_T mAction;
 #else  /* VBOX_WITH_USBFILTER */

trunk/src/VBox/Main/testcase/tstAPI.cpp

@@ -733 +733 @@
                 Guid mid;
                 CHECK_RC_BREAK (
-                    virtualBox->GetHardDiskUsage (id, ResourceUsage_AllUsage,
+                    virtualBox->GetHardDiskUsage (id, ResourceUsage_All,
                                                   mid.asOutParam())
                 );
@@ -762 +762 @@
                 Bstr mIDs;
                 CHECK_RC_BREAK (
-                    virtualBox->GetDVDImageUsage (id, ResourceUsage_AllUsage,
+                    virtualBox->GetDVDImageUsage (id, ResourceUsage_All,
                                                   mIDs.asOutParam())
                 );

trunk/src/VBox/Main/testcase/tstVBoxAPILinux.cpp

@@ -366 +366 @@
                     hardDisk->GetId(&vdiUUID);
                     rc = machine->AttachHardDisk(*vdiUUID,
-                                                DiskControllerType::IDE0Controller, // controler identifier
-                                                0);                                 // device number on the controller
+                                                DiskControllerType::IDE0, // controler identifier
+                                                0);                       // device number on the controller
                     nsMemory::Free(vdiUUID);
                     if (NS_FAILED(rc))
@@ -424 +424 @@
                  * Last step: tell the VM to boot from the CD.
                  */
-                rc = machine->SetBootOrder (1, DeviceType::DVDDevice);
+                rc = machine->SetBootOrder (1, DeviceType::DVD);
                 if (NS_FAILED(rc))
                 {