Changeset 67737 in vbox

Timestamp:

Jun 30, 2017 2:26:07 PM (8 years ago)

Author:

vboxsync

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

116601

Message:

FE/Qt: bugref:8400: Virtual Media Manager: Small cleanup related to UIMediumType enum handling.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumDefs.h (modified) (1 diff)
• UIMediumManager.cpp (modified) (4 diffs)
• UIMediumManager.h (modified) (1 diff)

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

@@ -35 +35 @@
     enum UIMediumType
     {
-        UIMediumType_Invalid,
         UIMediumType_HardDisk,
         UIMediumType_DVD,
         UIMediumType_Floppy,
-        UIMediumType_All
+        UIMediumType_All,
+        UIMediumType_Invalid
     };
 

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

@@ -1383 +1383 @@
         /* Create tabs: */
         for (int i = 0; i < m_iTabCount; ++i)
-            prepareTab(mediumType(i));
+            prepareTab((UIMediumType)i);
         /* Configure tab-widget: */
         m_pTabWidget->setFocusPolicy(Qt::TabFocus);
@@ -2195 +2195 @@
     /* Return medium type for known tab index: */
     if (iIndex >= 0 && iIndex < m_iTabCount)
-        return mediumType(iIndex);
+        return (UIMediumType)iIndex;
 
     /* Invalid by default: */
@@ -2208 +2208 @@
 
     /* Return current medium type: */
-    return mediumType(m_pTabWidget->currentIndex());
+    return (UIMediumType)m_pTabWidget->currentIndex();
 }
 
@@ -2257 +2257 @@
     /* -1 by default: */
     return -1;
-}
-
-/* static */
-UIMediumType UIMediumManagerWidget::mediumType(int iIndex)
-{
-    /* Return medium type corresponding to known tab index: */
-    switch (iIndex)
-    {
-        case 0: return UIMediumType_HardDisk;
-        case 1: return UIMediumType_DVD;
-        case 2: return UIMediumType_Floppy;
-        default: break;
-    }
-
-    /* Invalid by default: */
-    return UIMediumType_Invalid;
 }
 

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

@@ -234 +234 @@
         /** Returns tab index for passed UIMediumType. */
         static int tabIndex(UIMediumType type);
-        /** Returns UIMediumType for passed tab index. */
-        static UIMediumType mediumType(int iIndex);
 
         /** Performs search for the @a pTree child which corresponds to the @a condition but not @a pException. */