Changeset 7207 in vbox for trunk/src/VBox/Main/ConsoleImpl.cpp

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (27 diffs)

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;