Changeset 16867 in vbox for trunk/src/VBox/Main/testcase

Timestamp:

Feb 17, 2009 5:00:56 PM (16 years ago)

Author:

vboxsync

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

42975

Message:

Main: rename IHardDiskImage2 to IHardDiskImage; rename IFloppyImage2 to IFloppyImage; rename all media-related methods with a '2' suffix

Location:

trunk/src/VBox/Main/testcase

Files:

• tstAPI.cpp (modified) (3 diffs)
• tstVBoxAPILinux.cpp (modified) (2 diffs)

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

@@ -631 +631 @@
     do
     {
-        ComPtr <IHardDisk2> hd;
+        ComPtr <IHardDisk> hd;
         static const wchar_t *Names[] =
         {
@@ -651 +651 @@
             Bstr src = Names [i];
             printf ("Searching for hard disk '%ls'...\n", src.raw());
-            rc = virtualBox->FindHardDisk2 (src, hd.asOutParam());
+            rc = virtualBox->FindHardDisk (src, hd.asOutParam());
             if (SUCCEEDED (rc))
             {
@@ -901 +901 @@
     {
         {
-            com::SafeIfaceArray <IHardDisk2> disks;
+            com::SafeIfaceArray <IHardDisk> disks;
             CHECK_ERROR_BREAK (virtualBox,
-                               COMGETTER(HardDisks2) (ComSafeArrayAsOutParam (disks)));
+                               COMGETTER(HardDisks)(ComSafeArrayAsOutParam (disks)));
 
             printf ("%u base hard disks registered (disks.isNull()=%d).\n",

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

@@ -298 +298 @@
      * Create a virtual harddisk
      */
-    nsCOMPtr<IHardDisk2> hardDisk = 0;
-    rc = virtualBox->CreateHardDisk2(NS_LITERAL_STRING("VDI").get(),
-                                     NS_LITERAL_STRING("TestHardDisk.vdi").get(),
-                                     getter_AddRefs(hardDisk));
+    nsCOMPtr<IHardDisk> hardDisk = 0;
+    rc = virtualBox->CreateHardDisk(NS_LITERAL_STRING("VDI").get(),
+                                    NS_LITERAL_STRING("TestHardDisk.vdi").get(),
+                                    getter_AddRefs(hardDisk));
     if (NS_FAILED(rc))
     {
@@ -344 +344 @@
                 nsID *vdiUUID = nsnull;
                 hardDisk->GetId(&vdiUUID);
-                rc = machine->AttachHardDisk2(*vdiUUID,
-                                              StorageBus::IDE, // controler identifier
-                                              0,               // channel number on the controller
-                                              0);              // device number on the controller
+                rc = machine->AttachHardDisk(*vdiUUID,
+                                             StorageBus::IDE, // controler identifier
+                                             0,               // channel number on the controller
+                                             0);              // device number on the controller
                 nsMemory::Free(vdiUUID);
                 if (NS_FAILED(rc))