Changeset 55687 in vbox

Timestamp:

May 6, 2015 9:08:05 AM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: A bit of care for r100071.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UISession.cpp (modified) (4 diffs)
• UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -198 +198 @@
     }
 
-    /* Apply ad-hoc reconfigurations from the command line. */
+    /* Apply ad-hoc reconfigurations from the command line: */
     if (vboxGlobal().hasFloppyImageToMount())
         mountAdHocImage(KDeviceType_Floppy, UIMediumType_Floppy, vboxGlobal().getFloppyImage());
@@ -1848 +1848 @@
 }
 
-bool UISession::mountAdHocImage(KDeviceType enmDeviceType, UIMediumType enmMediumType, QString const &strImage)
-{
-    /*
-     * The 'none' image name means ejecting what ever is in the drive, so leave
-     * the image variables null.
-     */
+bool UISession::mountAdHocImage(KDeviceType enmDeviceType, UIMediumType enmMediumType, const QString &strImage)
+{
+    /* The 'none' image name means ejecting what ever is in the drive,
+     * so leave the image variables null. */
     CVirtualBox vbox = vboxGlobal().virtualBox();
     UIMedium uiImage;
     if (strImage != "none")
     {
-        /*
-         * Open the image.
-         */
-        QString strMediumID;
+        /* Open the image: */
         CVirtualBox vbox = vboxGlobal().virtualBox();
         CMedium vboxImage = vbox.OpenMedium(strImage, enmDeviceType, KAccessMode_ReadWrite, false /* fForceNewUuid */);
         if (!vbox.isOk() || vboxImage.isNull())
         {
-            msgCenter().cannotOpenMedium(vbox, enmMediumType, strImage, mainMachineWindow());
+            msgCenter().cannotOpenMedium(vbox, enmMediumType, strImage);
             return false;
         }
 
-        /*
-         * Work the cache and use the cached image if possible.
-         */
+        /* Work the cache and use the cached image if possible: */
         uiImage = vboxGlobal().medium(vboxImage.GetId());
         if (uiImage.isNull())
@@ -1882 +1875 @@
     if (vbox.isOk())
     {
-        /*
-         * Find suitable storage controller.
-         */
+        /* Find suitable storage controller: */
         foreach (const CStorageController &controller, machine().GetStorageControllers())
         {
@@ -1891 +1882 @@
                 if (attachment.GetType() == enmDeviceType)
                 {
-                    /*
-                     * Mount the image.
-                     */
+                    /* Mount the image: */
                     machine().MountMedium(controller.GetName(), attachment.GetPort(), attachment.GetDevice(), uiImage.medium(), true /* force */);
                     if (machine().isOk())
                         return true;
-                    msgCenter().cannotRemountMedium(machine(), uiImage, !uiImage.isNull() /*mount*/, false /* retry? */, mainMachineWindow());
+                    msgCenter().cannotRemountMedium(machine(), uiImage, !uiImage.isNull() /* mount */, false /* retry */);
                     return false;
                 }
             }
         }
-        msgCenter().cannotRemountMedium(machine(), uiImage, !uiImage.isNull() /*mount*/, false /* retry? */, mainMachineWindow());
+        msgCenter().cannotRemountMedium(machine(), uiImage, !uiImage.isNull() /* mount */, false /* retry */);
     }
     else
-        msgCenter().cannotOpenMedium(vbox, enmMediumType, strImage, mainMachineWindow());
+        msgCenter().cannotOpenMedium(vbox, enmMediumType, strImage);
     return false;
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -380 +380 @@
     void setPointerShape(const uchar *pShapeData, bool fHasAlpha, uint uXHot, uint uYHot, uint uWidth, uint uHeight);
     bool preprocessInitialization();
-    bool mountAdHocImage(KDeviceType enmDeviceType, enum UIMediumDefs::UIMediumType enmMediumType, QString const &strImage);
+    bool mountAdHocImage(KDeviceType enmDeviceType, UIMediumType enmMediumType, const QString &strImage);
     bool postprocessInitialization();
     int countOfVisibleWindows();