Changeset 7207 in vbox for trunk/src/VBox/Main/testcase/tstVBoxAPILinux.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/testcase/tstVBoxAPILinux.cpp (modified) (2 diffs)

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))
                 {