Changeset 80888 in vbox for trunk

Timestamp:

Sep 18, 2019 12:51:11 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7127: A bit of cleanup for media enumeration status code.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (2 diffs)
• globals/UICommon.h (modified) (1 diff)
• medium/UIMediumEnumerator.cpp (modified) (3 diffs)
• medium/UIMediumEnumerator.h (modified) (2 diffs)

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

@@ -2611 +2611 @@
 }
 
+bool UICommon::isFullMediumEnumerationRequested() const
+{
+    /* Redirect request to medium-enumerator: */
+    return    m_pMediumEnumerator
+           && m_pMediumEnumerator->isFullMediumEnumerationRequested();
+}
+
 bool UICommon::isMediumEnumerationInProgress() const
 {
@@ -2616 +2623 @@
     return    m_pMediumEnumerator
            && m_pMediumEnumerator->isMediumEnumerationInProgress();
-}
-
-bool UICommon::isFullMediumEnumerationRequested() const
-{
-    /* Redirect request to medium-enumerator: */
-    return    m_pMediumEnumerator
-           && m_pMediumEnumerator->isFullMediumEnumerationRequested();
 }
 

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

@@ -488 +488 @@
         /** Calls refresh for each medium which has been already enumerated. */
         void refreshMedia();
-        /** Returns whether medium-enumeration is in progress. */
-        bool isMediumEnumerationInProgress() const;
         /** Returns whether full medium-enumeration is requested. */
         bool isFullMediumEnumerationRequested() const;
+        /** Returns whether any medium-enumeration is in progress. */
+        bool isMediumEnumerationInProgress() const;
         /** Returns enumerated medium with certain @a uMediumID. */
         UIMedium medium(const QUuid &uMediumID) const;

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

@@ -97 +97 @@
 
 UIMediumEnumerator::UIMediumEnumerator()
-    : m_fMediumEnumerationInProgress(false)
-    , m_fMediumEnumerationRequested(false)
+    : m_fFullMediumEnumerationRequested(false)
+    , m_fMediumEnumerationInProgress(false)
 {
     /* Allow UIMedium to be used in inter-thread signals: */
@@ -175 +175 @@
     if (comMedia.isEmpty())
     {
-        m_fMediumEnumerationRequested = true;
+        m_fFullMediumEnumerationRequested = true;
         addMediaToMap(uiCommon().virtualBox().GetHardDisks(), media);
         addMediaToMap(uiCommon().host().GetDVDDrives(), media);
@@ -184 +184 @@
     else
     {
-        m_fMediumEnumerationRequested = false;
+        m_fFullMediumEnumerationRequested = false;
         addMediaToMap(uiCommon().host().GetDVDDrives(), media);
         addMediaToMap(uiCommon().virtualBox().GetDVDImages(), media);

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

@@ -76 +76 @@
     void createMedium(const UIMedium &guiMedium);
 
-    /** Returns whether consolidated medium-enumeration process is in progress. */
+    /** Returns whether full consolidated medium-enumeration process is requested. */
+    bool isFullMediumEnumerationRequested() const { return m_fFullMediumEnumerationRequested; }
+    /** Returns whether any consolidated medium-enumeration process is in progress. */
     bool isMediumEnumerationInProgress() const { return m_fMediumEnumerationInProgress; }
-    /** Returns whether full consolidated medium-enumeration process is requested. */
-    bool isFullMediumEnumerationRequested() const { return m_fMediumEnumerationRequested; }
     /** Makes a request to enumerate specified @a comMedia.
       * @note  Previous map will be replaced with the new one, values present in both
@@ -155 +155 @@
     void enumerateAllMediaOfMediumWithId(const QUuid &uMediumId, QList<QUuid> &result);
 
-    /** Holds whether consolidated medium-enumeration process is in progress. */
+    /** Holds whether full consolidated medium-enumeration process is requested. */
+    bool  m_fFullMediumEnumerationRequested;
+    /** Holds whether any consolidated medium-enumeration process is in progress. */
     bool  m_fMediumEnumerationInProgress;
-    /** Holds whether full consolidated medium-enumeration process is requested. */
-    bool  m_fMediumEnumerationRequested;
 
     /** Holds a set of current medium-enumeration tasks. */