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

Timestamp:

Jan 17, 2008 10:50:10 AM (17 years ago)

Author:

vboxsync

Message:

Main: Fixed illegal cast of HardDisk * to IVirtualDiskImage * in attempt to fix #2622.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (3 diffs)
• HardDiskImpl.cpp (modified) (2 diffs)
• HostImpl.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -1342 +1342 @@
     else
         progressDesc = tr ("Starting the virtual machine");
-    progress->init ((IConsole *) this, progressDesc, FALSE /* aCancelable */);
+    progress->init (static_cast <IConsole *> (this),
+                    progressDesc, FALSE /* aCancelable */);
 
     /* pass reference to caller if requested */
@@ -1618 +1619 @@
     ComObjPtr <Progress> progress;
     progress.createObject();
-    progress->init ((IConsole *) this,
+    progress->init (static_cast <IConsole *> (this),
                     Bstr (tr ("Saving the execution state of the virtual machine")),
                     FALSE /* aCancelable */);
@@ -2228 +2229 @@
         {
             combinedProgress.createObject();
-            rc = combinedProgress->init ((IConsole *) this,
+            rc = combinedProgress->init (static_cast <IConsole *> (this),
                                          Bstr (tr ("Taking snapshot of virtual machine")),
                                          serverProgress, saveProgress);

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -422 +422 @@
     ComObjPtr <Progress> progress;
     progress.createObject();
-    rc = progress->init (mVirtualBox, (IVirtualDiskImage *) this,
+    rc = progress->init (mVirtualBox, static_cast <IHardDisk *> (this),
                          Bstr (tr ("Creating a hard disk clone")),
                          FALSE /* aCancelable */);
@@ -2646 +2646 @@
         Bstr desc = aDynamic ? tr ("Creating a dynamically expanding hard disk")
                              : tr ("Creating a fixed-size hard disk");
-        rc = progress->init (mVirtualBox, (IVirtualDiskImage *) this, desc,
-                             FALSE /* aCancelable */);
+        rc = progress->init (mVirtualBox, static_cast <IVirtualDiskImage *> (this),
+                             desc, FALSE /* aCancelable */);
         CheckComRCReturnRC (rc);
     }

trunk/src/VBox/Main/HostImpl.cpp

@@ -840 +840 @@
     ComObjPtr <Progress> progress;
     progress.createObject();
-    rc = progress->init (mParent, (IHost *) this,
+    rc = progress->init (mParent, static_cast <IHost *> (this),
                          Bstr (tr ("Creating host network interface")),
                          FALSE /* aCancelable */);
@@ -908 +908 @@
     ComObjPtr <Progress> progress;
     progress.createObject();
-    rc = progress->init (mParent, (IHost *) this,
+    rc = progress->init (mParent, static_cast <IHost *> (this),
                         Bstr (tr ("Removing host network interface")),
                         FALSE /* aCancelable */);

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7551 +7551 @@
         ComObjPtr <Progress> progress;
         progress.createObject();
-        progress->init (mParent, (IMachine *) mPeer, Bstr (tr ("Closing session")),
-                        FALSE /* aCancelable */);
+        progress->init (mParent, static_cast <IMachine *> (mPeer),
+                        Bstr (tr ("Closing session")), FALSE /* aCancelable */);
         progress.queryInterfaceTo (aProgress);
         mData->mSession.mProgress = progress;

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1950 +1950 @@
     ComObjPtr <Progress> progress;
     progress.createObject();
-    progress->init (this, (IMachine *) machine,
+    progress->init (this, static_cast <IMachine *> (machine),
                     Bstr (tr ("Spawning session")),
                     FALSE /* aCancelable */);