Changeset 90422 in vbox for trunk/src

Timestamp:

Jul 30, 2021 10:24:30 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: A fix for r145855; We can determine initial location ourselves, no need to pass it.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.cpp

r90412	r90422
81	81	/* Assign new medium location: */
82	82	UINotificationProgressMediumMove *pNotification = new UINotificationProgressMediumMove(comMedium,
83		~~location(),~~
84	83	strFileName);
85	84	connect(pNotification, &UINotificationProgressMediumMove::sigProgressFinished,

-              r90412
+              r90422
 UINotificationProgressMediumMove::UINotificationProgressMediumMove(const CMedium &comMedium,
+                                                                   const QString &strFrom,
+                                                                   const QString &strTo)
+                                                                   const QString &strLocation)
     : m_comMedium(comMedium)
+    , m_strFrom(strFrom)
+    , m_strTo(strTo)
+    , m_strTo(strLocation)
+{
+}
 …
 CProgress UINotificationProgressMediumMove::createProgress(COMResult &comResult)
+{
+    /* Acquire location: */
+    m_strFrom = m_comMedium.GetLocation();
+    if (!m_comMedium.isOk())
+    {
+        /* Store COM result: */
+        comResult = m_comMedium;
+        /* Return progress-wrapper: */
+        return CProgress();
+    }
     /* Initialize progress-wrapper: */
     CProgress comProgress = m_comMedium.MoveTo(m_strTo);

-              r90412
+              r90422
     /** Constructs medium move notification-progress.
+      * @param  comMedium  Brings the medium being moved.
+      * @param  strFrom    Brings the initial location.
+      * @param  strTo      Brings the final location. */
+      * @param  comMedium    Brings the medium being moved.
+      * @param  strLocation  Brings the desired location. */
     UINotificationProgressMediumMove(const CMedium &comMedium,
+                                     const QString &strFrom,
+                                     const QString &strTo);
+                                     const QString &strLocation);
 protected:
 …
     /** Holds the initial location. */
     QString  m_strFrom;
     /** Holds the final location. */
+    /** Holds the desired location. */
     QString  m_strTo;
 };

Note: See TracChangeset for help on using the changeset viewer.