Changeset 79337 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 25, 2019 5:49:15 PM (6 years ago)

Author:

vboxsync

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

131565

Message:

FE/Qt: bugref:7127: Delete medium stuff is superfluous VBOX_GUI_WITH_NEW_MEDIA_EVENTS defined, corresponding event goes through GUI anyway.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• medium/UIMediumEnumerator.cpp (modified) (2 diffs)
• medium/UIMediumEnumerator.h (modified) (1 diff)
• medium/UIMediumItem.cpp (modified) (6 diffs)
• wizards/newvm/UIWizardNewVMPageBasic3.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -2622 +2622 @@
 }
 
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
 void VBoxGlobal::deleteMedium(const QUuid &uMediumID)
 {
@@ -2632 +2633 @@
     }
 }
+#endif
 
 QUuid VBoxGlobal::openMedium(UIMediumDeviceType enmMediumType, QString strMediumLocation, QWidget *pParent /* = 0 */)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -494 +494 @@
         /** Creates medium on the basis of passed @a guiMedium description. */
         void createMedium(const UIMedium &guiMedium);
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
         /** Deletes medium with certain @a uMediumID. */
         void deleteMedium(const QUuid &uMediumID);
+#endif
 
         /** Opens external medium by passed @a strMediumLocation.

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

@@ -166 +166 @@
 }
 
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
 void UIMediumEnumerator::deleteMedium(const QUuid &uMediumID)
 {
@@ -180 +181 @@
     emit sigMediumDeleted(uMediumID);
 }
+#endif
 
 void UIMediumEnumerator::startMediumEnumeration(const CMediumVector &comMedia /* = CMediumVector() */)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.h

@@ -77 +77 @@
     /** Creates UIMedium thus caching it internally on the basis of passed @a guiMedium information. */
     void createMedium(const UIMedium &guiMedium);
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     /** Deletes UIMedium with specified @a uMediumID thus removing it from internal cache. */
     void deleteMedium(const QUuid &uMediumID);
+#endif
 
     /** Returns whether consolidated medium-enumeration process is in progress. */

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

@@ -423 +423 @@
     /* Remember some of hard-disk attributes: */
     CMedium hardDisk = medium().medium();
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     QUuid uMediumID = id();
+#endif
 
     /* Propose to remove medium storage: */
@@ -437 +439 @@
     }
 
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     /* Remove UIMedium finally: */
     vboxGlobal().deleteMedium(uMediumID);
+#endif
 
     /* True by default: */
@@ -550 +554 @@
     /* Remember some of optical-disk attributes: */
     CMedium image = medium().medium();
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     QUuid uMediumID = id();
+#endif
 
     /* Close optical-disk: */
@@ -560 +566 @@
     }
 
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     /* Remove UIMedium finally: */
     vboxGlobal().deleteMedium(uMediumID);
+#endif
 
     /* True by default: */
@@ -621 +629 @@
     /* Remember some of floppy-disk attributes: */
     CMedium image = medium().medium();
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     QUuid uMediumID = id();
+#endif
 
     /* Close floppy-disk: */
@@ -631 +641 @@
     }
 
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     /* Remove UIMedium finally: */
     vboxGlobal().deleteMedium(uMediumID);
+#endif
 
     /* True by default: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp

@@ -112 +112 @@
 
     /* Remember virtual-disk attributes: */
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     QUuid uMediumID = m_virtualDisk.GetId();
+#endif
     QString strLocation = m_virtualDisk.GetLocation();
     /* Prepare delete storage progress: */
@@ -126 +128 @@
         msgCenter().cannotDeleteHardDiskStorage(m_virtualDisk, strLocation, thisImp());
 
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     /* Inform VBoxGlobal about it: */
     vboxGlobal().deleteMedium(uMediumID);
+#endif
 
     /* Detach virtual-disk anyway: */