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

Timestamp:

Sep 18, 2019 11:23:57 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7127: Cleanup old enumeration code across the project.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (4 diffs)
• src/globals/UICommon.cpp (modified) (3 diffs)
• src/globals/UICommon.h (modified) (2 diffs)
• src/medium/UIMediumEnumerator.cpp (modified) (10 diffs)
• src/medium/UIMediumEnumerator.h (modified) (6 diffs)
• src/medium/UIMediumItem.cpp (modified) (6 diffs)
• src/medium/UIMediumManager.cpp (modified) (3 diffs)
• src/medium/UIMediumSelector.cpp (modified) (1 diff)
• src/runtime/information/UIVMInformationDialog.cpp (modified) (1 diff)
• src/settings/machine/UIMachineSettingsStorage.cpp (modified) (1 diff)
• src/widgets/UIMediaComboBox.cpp (modified) (1 diff)
• src/wizards/newvm/UIWizardNewVMPageBasic3.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -85 +85 @@
 VBOX_WITH_UPDATE_REQUEST := 1
 endif
-
-
-#
-# Use newly intruduced global media related events for
-# medium enumeration purposes.
-#
-VBOX_GUI_WITH_NEW_MEDIA_EVENTS := 1
 
 
@@ -118 +111 @@
         $(if $(VBOX_WITH_ADDITIONS_AUTOUPDATE_UI),VBOX_WITH_ADDITIONS_AUTOUPDATE_UI) \
         $(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \
-        $(if $(VBOX_GUI_WITH_NEW_MEDIA_EVENTS),VBOX_GUI_WITH_NEW_MEDIA_EVENTS) \
         $(if $(VBOX_WITH_AUDIO_OSS),VBOX_WITH_AUDIO_OSS) \
         $(if $(VBOX_WITH_AUDIO_ALSA),VBOX_WITH_AUDIO_ALSA) \
@@ -187 +179 @@
         $(if $(VBOX_WITH_ADDITIONS_AUTOUPDATE_UI),VBOX_WITH_ADDITIONS_AUTOUPDATE_UI) \
         $(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \
-        $(if $(VBOX_GUI_WITH_NEW_MEDIA_EVENTS),VBOX_GUI_WITH_NEW_MEDIA_EVENTS) \
         $(if $(VBOX_WITH_AUDIO_OSS),VBOX_WITH_AUDIO_OSS) \
         $(if $(VBOX_WITH_AUDIO_ALSA),VBOX_WITH_AUDIO_ALSA) \
@@ -249 +240 @@
 UICommon_DEFS         += \
         $(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \
-        $(if $(VBOX_GUI_WITH_NEW_MEDIA_EVENTS),VBOX_GUI_WITH_NEW_MEDIA_EVENTS) \
         $(if $(VBOX_WITH_AUDIO_OSS),VBOX_WITH_AUDIO_OSS) \
         $(if $(VBOX_WITH_AUDIO_ALSA),VBOX_WITH_AUDIO_ALSA) \

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

@@ -2618 +2618 @@
 }
 
-#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
 bool UICommon::isFullMediumEnumerationRequested() const
 {
@@ -2625 +2624 @@
            && m_pMediumEnumerator->isFullMediumEnumerationRequested();
 }
-#endif
 
 UIMedium UICommon::medium(const QUuid &uMediumID) const
@@ -2665 +2663 @@
     }
 }
-
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-void UICommon::deleteMedium(const QUuid &uMediumID)
-{
-    if (m_meCleanupProtectionToken.tryLockForRead())
-    {
-        /* Delete medium from medium-enumerator: */
-        if (m_pMediumEnumerator)
-            m_pMediumEnumerator->deleteMedium(uMediumID);
-        m_meCleanupProtectionToken.unlock();
-    }
-}
-#endif
 
 QUuid UICommon::openMedium(UIMediumDeviceType enmMediumType, QString strMediumLocation, QWidget *pParent /* = 0 */)

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

@@ -490 +490 @@
         /** Returns whether medium-enumeration is in progress. */
         bool isMediumEnumerationInProgress() const;
-#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
         /** Returns whether full medium-enumeration is requested. */
         bool isFullMediumEnumerationRequested() const;
-#endif
         /** Returns enumerated medium with certain @a uMediumID. */
         UIMedium medium(const QUuid &uMediumID) const;
@@ -500 +498 @@
         /** 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

@@ -98 +98 @@
 UIMediumEnumerator::UIMediumEnumerator()
     : m_fMediumEnumerationInProgress(false)
-#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     , m_fMediumEnumerationRequested(false)
-#endif
 {
     /* Allow UIMedium to be used in inter-thread signals: */
@@ -106 +104 @@
 
     /* Prepare Main event handlers: */
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineDataChange,
-            this, &UIMediumEnumerator::sltHandleMachineUpdate);
-    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotTake,
-            this, &UIMediumEnumerator::sltHandleMachineUpdate);
-    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotDelete,
-            this, &UIMediumEnumerator::sltHandleSnapshotDeleted);
-    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotChange,
-            this, &UIMediumEnumerator::sltHandleMachineUpdate);
-    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotRestore,
-            this, &UIMediumEnumerator::sltHandleSnapshotDeleted);
-    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineRegistered,
-            this, &UIMediumEnumerator::sltHandleMachineRegistration);
-#else /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
     /* Machine related events: */
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineDataChange,
@@ -134 +118 @@
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMediumRegistered,
             this, &UIMediumEnumerator::sltHandleMediumRegistered);
-#endif /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
 
     /* Prepare global thread-pool listener: */
@@ -174 +157 @@
     emit sigMediumCreated(uMediumID);
 }
-
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-void UIMediumEnumerator::deleteMedium(const QUuid &uMediumID)
-{
-    /* Do not delete UIMedium(s) with incorrect ID: */
-    AssertReturnVoid(!uMediumID.isNull());
-    /* Make sure UIMedium still exists: */
-    AssertReturnVoid(m_media.contains(uMediumID));
-
-    /* Remove UIMedium: */
-    m_media.remove(uMediumID);
-    LogRel(("GUI: UIMediumEnumerator: Medium with key={%s} deleted\n", uMediumID.toString().toUtf8().constData()));
-
-    /* Notify listener: */
-    emit sigMediumDeleted(uMediumID);
-}
-#endif
 
 void UIMediumEnumerator::startMediumEnumeration(const CMediumVector &comMedia /* = CMediumVector() */)
@@ -209 +175 @@
     if (comMedia.isEmpty())
     {
-#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
         m_fMediumEnumerationRequested = true;
-#endif
         addMediaToMap(uiCommon().virtualBox().GetHardDisks(), media);
         addMediaToMap(uiCommon().host().GetDVDDrives(), media);
@@ -220 +184 @@
     else
     {
-#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
         m_fMediumEnumerationRequested = false;
-#endif
         addMediaToMap(uiCommon().host().GetDVDDrives(), media);
         addMediaToMap(uiCommon().virtualBox().GetDVDImages(), media);
@@ -296 +258 @@
         m_media[UIMedium::nullID()] = UIMedium();
 }
-
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-
-void UIMediumEnumerator::sltHandleMachineUpdate(const QUuid &uMachineID)
-{
-    LogRel2(("GUI: UIMediumEnumerator: Machine (or snapshot) event received, ID = %s\n",
-             uMachineID.toString().toUtf8().constData()));
-
-    /* Gather previously used UIMedium IDs: */
-    QList<QUuid> previousUIMediumIDs;
-    calculateCachedUsage(uMachineID, previousUIMediumIDs, true /* take into account current state only */);
-    LogRel2(("GUI: UIMediumEnumerator:  Old usage: %s\n",
-             previousUIMediumIDs.isEmpty() ? "<empty>" : toStringList(previousUIMediumIDs).join(", ").toUtf8().constData()));
-
-    /* Gather currently used CMediums and their IDs: */
-    CMediumMap currentCMediums;
-    QList<QUuid> currentCMediumIDs;
-    calculateActualUsage(uMachineID, currentCMediums, currentCMediumIDs, true /* take into account current state only */);
-    LogRel2(("GUI: UIMediumEnumerator:  New usage: %s\n",
-             currentCMediumIDs.isEmpty() ? "<empty>" : toStringList(currentCMediumIDs).join(", ").toUtf8().constData()));
-
-    /* Determine excluded media: */
-    const QSet<QUuid> previousSet = previousUIMediumIDs.toSet();
-    const QSet<QUuid> currentSet = currentCMediumIDs.toSet();
-    const QSet<QUuid> excludedSet = previousSet - currentSet;
-    const QList<QUuid> excludedUIMediumIDs = excludedSet.toList();
-    if (!excludedUIMediumIDs.isEmpty())
-        LogRel2(("GUI: UIMediumEnumerator:  Items excluded from usage: %s\n", toStringList(excludedUIMediumIDs).join(", ").toUtf8().constData()));
-    if (!currentCMediumIDs.isEmpty())
-        LogRel2(("GUI: UIMediumEnumerator:  Items currently in usage: %s\n", toStringList(currentCMediumIDs).join(", ").toUtf8().constData()));
-
-    /* Update cache for excluded UIMediums: */
-    recacheFromCachedUsage(excludedUIMediumIDs);
-
-    /* Update cache for current CMediums: */
-    recacheFromActualUsage(currentCMediums, currentCMediumIDs);
-
-    LogRel2(("GUI: UIMediumEnumerator: Machine (or snapshot) event processed, ID = %s\n",
-             uMachineID.toString().toUtf8().constData()));
-}
-
-void UIMediumEnumerator::sltHandleMachineRegistration(const QUuid &uMachineID, const bool fRegistered)
-{
-    LogRel2(("GUI: UIMediumEnumerator: Machine %s event received, ID = %s\n",
-             fRegistered ? "registration" : "unregistration",
-             uMachineID.toString().toUtf8().constData()));
-
-    /* Machine was registered: */
-    if (fRegistered)
-    {
-        /* Gather currently used CMediums and their IDs: */
-        CMediumMap currentCMediums;
-        QList<QUuid> currentCMediumIDs;
-        calculateActualUsage(uMachineID, currentCMediums, currentCMediumIDs, false /* take into account current state only */);
-        LogRel2(("GUI: UIMediumEnumerator:  New usage: %s\n",
-                 currentCMediumIDs.isEmpty() ? "<empty>" : toStringList(currentCMediumIDs).join(", ").toUtf8().constData()));
-        /* Update cache with currently used CMediums: */
-        recacheFromActualUsage(currentCMediums, currentCMediumIDs);
-    }
-    /* Machine was unregistered: */
-    else
-    {
-        /* Gather previously used UIMedium IDs: */
-        QList<QUuid> previousUIMediumIDs;
-        calculateCachedUsage(uMachineID, previousUIMediumIDs, false /* take into account current state only */);
-        LogRel2(("GUI: UIMediumEnumerator:  Old usage: %s\n",
-                 previousUIMediumIDs.isEmpty() ? "<empty>" : toStringList(previousUIMediumIDs).join(", ").toUtf8().constData()));
-        /* Update cache for previously used UIMediums: */
-        recacheFromCachedUsage(previousUIMediumIDs);
-    }
-
-    LogRel2(("GUI: UIMediumEnumerator: Machine %s event processed, ID = %s\n",
-             fRegistered ? "registration" : "unregistration",
-             uMachineID.toString().toUtf8().constData()));
-}
-
-void UIMediumEnumerator::sltHandleSnapshotDeleted(const QUuid &uMachineID, const QUuid &uSnapshotID)
-{
-    LogRel2(("GUI: UIMediumEnumerator: Snapshot-deleted event received, Machine ID = {%s}, Snapshot ID = {%s}\n",
-             uMachineID.toString().toUtf8().constData(), uSnapshotID.toString().toUtf8().constData()));
-
-    /* Gather previously used UIMedium IDs: */
-    QList<QUuid> previousUIMediumIDs;
-    calculateCachedUsage(uMachineID, previousUIMediumIDs, false /* take into account current state only */);
-    LogRel2(("GUI: UIMediumEnumerator:  Old usage: %s\n",
-             previousUIMediumIDs.isEmpty() ? "<empty>" : toStringList(previousUIMediumIDs).join(", ").toUtf8().constData()));
-
-    /* Gather currently used CMediums and their IDs: */
-    CMediumMap currentCMediums;
-    QList<QUuid> currentCMediumIDs;
-    calculateActualUsage(uMachineID, currentCMediums, currentCMediumIDs, true /* take into account current state only */);
-    LogRel2(("GUI: UIMediumEnumerator:  New usage: %s\n",
-             currentCMediumIDs.isEmpty() ? "<empty>" : toStringList(currentCMediumIDs).join(", ").toUtf8().constData()));
-
-    /* Update everything: */
-    recacheFromCachedUsage(previousUIMediumIDs);
-    recacheFromActualUsage(currentCMediums, currentCMediumIDs);
-
-    LogRel2(("GUI: UIMediumEnumerator: Snapshot-deleted event processed, Machine ID = {%s}, Snapshot ID = {%s}\n",
-             uMachineID.toString().toUtf8().constData(), uSnapshotID.toString().toUtf8().constData()));
-}
-
-#else /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
 
 void UIMediumEnumerator::sltHandleMachineDataChange(const QUuid &uMachineId)
@@ -535 +394 @@
 }
 
-#endif /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
-
 void UIMediumEnumerator::sltHandleMediumEnumerationTaskComplete(UITask *pTask)
 {
@@ -653 +510 @@
     }
 }
-
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-
-void UIMediumEnumerator::calculateCachedUsage(const QUuid &uMachineID,
-                                              QList<QUuid> &previousUIMediumIDs,
-                                              const bool fTakeIntoAccountCurrentStateOnly) const
-{
-    /* For each the cached UIMedium we have: */
-    foreach (const QUuid &uUIMediumID, mediumIDs())
-    {
-        /* Get corresponding UIMedium: */
-        const UIMedium &guiMedium = m_media[uUIMediumID];
-        /* Get the list of the machines this UIMedium attached to.
-         * Take into account current-state only if necessary. */
-        const QList<QUuid> &machineIDs = fTakeIntoAccountCurrentStateOnly
-                                       ? guiMedium.curStateMachineIds()
-                                       : guiMedium.machineIds();
-        /* Add this UIMedium ID to previous usage if necessary: */
-        if (machineIDs.contains(uMachineID))
-            previousUIMediumIDs.append(uUIMediumID);
-    }
-}
-
-void UIMediumEnumerator::calculateActualUsage(const QUuid &uMachineID,
-                                              CMediumMap &currentCMediums,
-                                              QList<QUuid> &currentCMediumIDs,
-                                              const bool fTakeIntoAccountCurrentStateOnly) const
-{
-    /* Search for corresponding machine: */
-    CMachine comMachine = uiCommon().virtualBox().FindMachine(uMachineID.toString());
-    if (comMachine.isNull())
-    {
-        /* Usually means the machine is already gone, not harmful. */
-        return;
-    }
-
-    /* Calculate actual usage starting from root-snapshot if necessary: */
-    if (!fTakeIntoAccountCurrentStateOnly)
-        calculateActualUsage(comMachine.FindSnapshot(QString()), currentCMediums, currentCMediumIDs);
-
-    /* Calculate actual usage for current machine state: */
-    calculateActualUsage(comMachine, currentCMediums, currentCMediumIDs);
-}
-
-void UIMediumEnumerator::calculateActualUsage(const CSnapshot &comSnapshot,
-                                              CMediumMap &currentCMediums,
-                                              QList<QUuid> &currentCMediumIDs) const
-{
-    /* Check passed snapshot: */
-    if (comSnapshot.isNull())
-        return;
-
-    /* Calculate actual usage for passed snapshot machine: */
-    calculateActualUsage(comSnapshot.GetMachine(), currentCMediums, currentCMediumIDs);
-
-    /* Iterate through passed snapshot children: */
-    foreach (const CSnapshot &comChildSnapshot, comSnapshot.GetChildren())
-        calculateActualUsage(comChildSnapshot, currentCMediums, currentCMediumIDs);
-}
-
-void UIMediumEnumerator::calculateActualUsage(const CMachine &comMachine,
-                                              CMediumMap &currentCMediums,
-                                              QList<QUuid> &currentCMediumIDs) const
-{
-    /* Check passed machine: */
-    AssertReturnVoid(!comMachine.isNull());
-
-    /* For each the attachment machine have: */
-    foreach (const CMediumAttachment &comAttachment, comMachine.GetMediumAttachments())
-    {
-        /* Get corresponding CMedium: */
-        CMedium comMedium = comAttachment.GetMedium();
-        if (!comMedium.isNull())
-        {
-            /* Make sure that CMedium was not yet closed: */
-            const QUuid &uCMediumID = comMedium.GetId();
-            if (comMedium.isOk() && !uCMediumID.isNull())
-            {
-                /* Add this CMedium to current usage: */
-                currentCMediums.insert(uCMediumID, comMedium);
-                currentCMediumIDs.append(uCMediumID);
-            }
-        }
-    }
-}
-
-void UIMediumEnumerator::recacheFromCachedUsage(const QList<QUuid> &previousUIMediumIDs)
-{
-    /* For each of previously used UIMedium ID: */
-    foreach (const QUuid &uUIMediumID, previousUIMediumIDs)
-    {
-        /* Make sure this ID still in our map: */
-        if (m_media.contains(uUIMediumID))
-        {
-            /* Get corresponding UIMedium: */
-            UIMedium &guiMedium = m_media[uUIMediumID];
-
-            /* If corresponding CMedium still exists: */
-            CMedium comMedium = guiMedium.medium();
-            if (!comMedium.GetId().isNull() && comMedium.isOk())
-            {
-                /* Refresh UIMedium parent first of all: */
-                guiMedium.updateParentID();
-                /* Enumerate corresponding UIMedium: */
-                createMediumEnumerationTask(guiMedium);
-            }
-            /* If corresponding CMedium was closed already: */
-            else
-            {
-                /* Uncache corresponding UIMedium: */
-                m_media.remove(uUIMediumID);
-                LogRel2(("GUI: UIMediumEnumerator:  Medium with key={%s} uncached\n",
-                         uUIMediumID.toString().toUtf8().constData()));
-
-                /* And notify listeners: */
-                emit sigMediumDeleted(uUIMediumID);
-            }
-        }
-    }
-}
-
-void UIMediumEnumerator::recacheFromActualUsage(const CMediumMap &currentCMediums,
-                                                const QList<QUuid> &currentCMediumIDs)
-{
-    /* For each of currently used CMedium ID: */
-    foreach (const QUuid &uCMediumID, currentCMediumIDs)
-    {
-        /* If that ID is not in our map: */
-        if (!m_media.contains(uCMediumID))
-        {
-            /* Create new UIMedium: */
-            const CMedium &comMedium = currentCMediums[uCMediumID];
-            const UIMedium guiMedium(comMedium, UIMediumDefs::mediumTypeToLocal(comMedium.GetDeviceType()));
-            const QUuid &uUIMediumKey = guiMedium.key();
-
-            /* Cache created UIMedium: */
-            m_media.insert(uUIMediumKey, guiMedium);
-            LogRel2(("GUI: UIMediumEnumerator:  Medium with key={%s} cached\n",
-                     uUIMediumKey.toString().toUtf8().constData()));
-
-            /* And notify listeners: */
-            emit sigMediumCreated(uUIMediumKey);
-        }
-
-        /* Enumerate corresponding UIMedium: */
-        createMediumEnumerationTask(m_media[uCMediumID]);
-    }
-}
-
-#else /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
 
 void UIMediumEnumerator::parseAttachment(CMediumAttachment comAttachment, QList<QUuid> &result)
@@ -948 +655 @@
 }
 
-#endif /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
-
 
 #include "UIMediumEnumerator.moc"

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

@@ -32 +32 @@
 
 /* COM includes: */
-#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
 # include "CMedium.h"
 # include "CMediumAttachment.h"
-#endif
 
 /* Forward declarations: */
@@ -77 +75 @@
     /** 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. */
     bool isMediumEnumerationInProgress() const { return m_fMediumEnumerationInProgress; }
-#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     /** Returns whether full consolidated medium-enumeration process is requested. */
     bool isFullMediumEnumerationRequested() const { return m_fMediumEnumerationRequested; }
-#endif
     /** Makes a request to enumerate specified @a comMedia.
       * @note  Previous map will be replaced with the new one, values present in both
@@ -111 +103 @@
 private slots:
 
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-    /** Handles machine-data-change and snapshot-change events for a machine with specified @a uMachineID. */
-    void sltHandleMachineUpdate(const QUuid &uMachineID);
-    /** Handles machine-[un]registration events for a machine with specified @a uMachineID.
-      * @param  fRegistered  Specifies whether the machine was registered or unregistered otherwise. */
-    void sltHandleMachineRegistration(const QUuid &uMachineID, const bool fRegistered);
-    /** Handles snapshot-deleted events for a machine with specified @a uMachineID and a snapshot with specified @a uSnapshotID. */
-    void sltHandleSnapshotDeleted(const QUuid &uMachineID, const QUuid &uSnapshotID);
-#else /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
     /** Handles machine-data-change event for a machine with specified @a uMachineId. */
     void sltHandleMachineDataChange(const QUuid &uMachineId);
@@ -141 +124 @@
       * @param  fRegistered    Brings whether medium is registered or unregistered. */
     void sltHandleMediumRegistered(const QUuid &uMediumId, KDeviceType enmMediumType, bool fRegistered);
-#endif /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
 
     /** Handles medium-enumeration @a pTask complete signal. */
@@ -155 +137 @@
     void addMediaToMap(const CMediumVector &inputMedia, UIMediumMap &outputMedia);
 
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-    /** Updates usage for machine with specified @a uMachineID on the basis of cached data.
-      * @param  previousUIMediumIDs               Brings UIMedium IDs used in cached data.
-      * @param  fTakeIntoAccountCurrentStateOnly  Brings whether we should take into accound current VM state only. */
-    void calculateCachedUsage(const QUuid &uMachineID,
-                              QList<QUuid> &previousUIMediumIDs,
-                              const bool fTakeIntoAccountCurrentStateOnly) const;
-    /** Updates usage for machine with specified @a uMachineID on the basis of actual data.
-      * @param  currentCMediums                   Brings CMedium used in actual data.
-      * @param  currentCMediumIDs                 Brings CMedium IDs used in actual data.
-      * @param  fTakeIntoAccountCurrentStateOnly  Brings whether we should take into accound current VM state only. */
-    void calculateActualUsage(const QUuid &uMachineID,
-                              CMediumMap &currentCMediums,
-                              QList<QUuid> &currentCMediumIDs,
-                              const bool fTakeIntoAccountCurrentStateOnly) const;
-    /** Updates usage for machine specified by its @a comSnapshot reference on the basis of actual data.
-      * @param  currentCMediums                   Brings CMedium used in actual data.
-      * @param  currentCMediumIDs                 Brings CMedium IDs used in actual data. */
-    void calculateActualUsage(const CSnapshot &comSnapshot,
-                              CMediumMap &currentCMediums,
-                              QList<QUuid> &currentCMediumIDs) const;
-    /** Updates usage for machine specified by own @a comMachine reference on the basis of actual data.
-      * @param  currentCMediums                   Brings CMedium used in actual data.
-      * @param  currentCMediumIDs                 Brings CMedium IDs used in actual data. */
-    void calculateActualUsage(const CMachine &comMachine,
-                              CMediumMap &currentCMediums,
-                              QList<QUuid> &currentCMediumIDs) const;
-
-    /** Updates cache using known changes in cached data.
-      * @param  previousUIMediumIDs               Brings UIMedium IDs used in cached data. */
-    void recacheFromCachedUsage(const QList<QUuid> &previousUIMediumIDs);
-    /** Updates cache using known changes in actual data.
-      * @param  currentCMediums                   Brings CMedium used in actual data.
-      * @param  currentCMediumIDs                 Brings CMedium IDs used in actual data. */
-    void recacheFromActualUsage(const CMediumMap &currentCMediums,
-                                const QList<QUuid> &currentCMediumIDs);
-#else /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
     /** Parses incoming @a comAttachment, enumerating the media it has attached.
       * @param  result  Brings the list of previously enumerated media
@@ -209 +154 @@
       *                 IDs to be appended with newly enumerated. */
     void enumerateAllMediaOfMediumWithId(const QUuid &uMediumId, QList<QUuid> &result);
-#endif /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
 
     /** Holds whether consolidated medium-enumeration process is in progress. */
     bool  m_fMediumEnumerationInProgress;
-#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     /** Holds whether full consolidated medium-enumeration process is requested. */
     bool  m_fMediumEnumerationRequested;
-#endif
 
     /** Holds a set of current medium-enumeration tasks. */

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: */
@@ -438 +435 @@
         return false;
     }
-
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-    /* Remove UIMedium finally: */
-    uiCommon().deleteMedium(uMediumID);
-#endif
 
     /* True by default: */
@@ -554 +546 @@
     /* Remember some of optical-disk attributes: */
     CMedium image = medium().medium();
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-    QUuid uMediumID = id();
-#endif
 
     /* Close optical-disk: */
@@ -566 +555 @@
     }
 
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-    /* Remove UIMedium finally: */
-    uiCommon().deleteMedium(uMediumID);
-#endif
-
     /* True by default: */
     return true;
@@ -629 +613 @@
     /* Remember some of floppy-disk attributes: */
     CMedium image = medium().medium();
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-    QUuid uMediumID = id();
-#endif
 
     /* Close floppy-disk: */
@@ -641 +622 @@
     }
 
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-    /* Remove UIMedium finally: */
-    uiCommon().deleteMedium(uMediumID);
-#endif
-
     /* True by default: */
     return true;

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

@@ -695 +695 @@
 
     /* Start medium-enumeration (if necessary): */
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-    if (!uiCommon().isMediumEnumerationInProgress())
-#else
     if (!uiCommon().isFullMediumEnumerationRequested())
-#endif
         uiCommon().startMediumEnumeration();
     /* Emulate medium-enumeration otherwise: */
@@ -1357 +1353 @@
         refetchCurrentMediumItem(type);
 
-#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     /* Update all the children recursively as well: */
     foreach(const QUuid &uMediumId, uiCommon().mediumIDs())
@@ -1366 +1361 @@
             updateMediumItem(guiMedium);
     }
-#endif
 }
 

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

@@ -81 +81 @@
 {
     /* Start medium-enumeration (if necessary): */
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-    if (uiCommon().uiType() == UICommon::UIType_RuntimeUI)
-#else
     if (!uiCommon().isFullMediumEnumerationRequested())
-#endif
         uiCommon().startMediumEnumeration();
     configure();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -169 +169 @@
 
     /* This is needed at least for some VM to show correct storage info. */
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-    if (uiCommon().uiType() == UICommon::UIType_RuntimeUI)
-#else
     if (!uiCommon().isFullMediumEnumerationRequested())
-#endif
         uiCommon().startMediumEnumeration();
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -3708 +3708 @@
     UIIconPoolStorageSettings::create();
 
-#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     /* Start medium-enumeration (only if necessary): */
     if (!uiCommon().isFullMediumEnumerationRequested())
-#endif
-    /* Enumerate Media. We need at least the MediaList filled, so this is the
-     * lasted point, where we can start. The rest of the media checking is done
-     * in a background thread. */
-    uiCommon().startMediumEnumeration();
+        uiCommon().startMediumEnumeration();
 
     /* Layout created in the .ui file. */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediaComboBox.cpp

@@ -59 +59 @@
 {
     /* Start medium-enumeration (if necessary): */
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-    if (!uiCommon().isMediumEnumerationInProgress())
-#else
     if (!uiCommon().isFullMediumEnumerationRequested())
-#endif
         uiCommon().startMediumEnumeration();
     else

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: */
@@ -127 +124 @@
     else
         msgCenter().cannotDeleteHardDiskStorage(m_virtualDisk, strLocation, thisImp());
-
-#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
-    /* Inform UICommon about it: */
-    uiCommon().deleteMedium(uMediumID);
-#endif
 
     /* Detach virtual-disk anyway: */