Changeset 73953 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 29, 2018 2:36:45 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: Rename UIMediumType to UIMediumDeviceType

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (15 diffs)
• globals/UIMessageCenter.h (modified) (2 diffs)
• globals/UIPopupCenter.cpp (modified) (1 diff)
• globals/UIPopupCenter.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (21 diffs)
• globals/VBoxGlobal.h (modified) (3 diffs)
• medium/UIFDCreationDialog.cpp (modified) (1 diff)
• medium/UIMedium.cpp (modified) (9 diffs)
• medium/UIMedium.h (modified) (4 diffs)
• medium/UIMediumDefs.cpp (modified) (1 diff)
• medium/UIMediumDefs.h (modified) (4 diffs)
• medium/UIMediumDetailsWidget.cpp (modified) (9 diffs)
• medium/UIMediumDetailsWidget.h (modified) (7 diffs)
• medium/UIMediumItem.cpp (modified) (3 diffs)
• medium/UIMediumItem.h (modified) (1 diff)
• medium/UIMediumManager.cpp (modified) (27 diffs)
• medium/UIMediumManager.h (modified) (4 diffs)
• medium/UIMediumSelector.cpp (modified) (5 diffs)
• medium/UIMediumSelector.h (modified) (2 diffs)
• runtime/UIIndicatorsPool.cpp (modified) (3 diffs)
• runtime/UISession.cpp (modified) (3 diffs)
• runtime/UISession.h (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (12 diffs)
• settings/machine/UIMachineSettingsStorage.h (modified) (2 diffs)
• widgets/UIMediaComboBox.cpp (modified) (3 diffs)
• widgets/UIMediaComboBox.h (modified) (2 diffs)
• wizards/clonevd/UIWizardCloneVDPageBasic1.cpp (modified) (1 diff)
• wizards/firstrun/UIWizardFirstRunPageBasic.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVD.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVM.cpp (modified) (3 diffs)
• wizards/newvm/UIWizardNewVMPageBasic3.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

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

@@ -1149 +1149 @@
 }
 
-void UIMessageCenter::cannotAttachDevice(const CMachine &machine, UIMediumType enmType,
+void UIMessageCenter::cannotAttachDevice(const CMachine &machine, UIMediumDeviceType enmType,
                                          const QString &strLocation, const StorageSlot &storageSlot,
                                          QWidget *pParent /* = 0*/)
@@ -1156 +1156 @@
     switch (enmType)
     {
-        case UIMediumType_HardDisk:
+        case UIMediumDeviceType_HardDisk:
         {
             strMessage = tr("Failed to attach the hard disk (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.")
@@ -1162 +1162 @@
             break;
         }
-        case UIMediumType_DVD:
+        case UIMediumDeviceType_DVD:
         {
             strMessage = tr("Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.")
@@ -1168 +1168 @@
             break;
         }
-        case UIMediumType_Floppy:
+        case UIMediumDeviceType_Floppy:
         {
             strMessage = tr("Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.")
@@ -1308 +1308 @@
     switch (medium.type())
     {
-        case UIMediumType_HardDisk:
+        case UIMediumDeviceType_HardDisk:
         {
             strMessage = tr("<p>Are you sure you want to remove the virtual hard disk "
@@ -1327 +1327 @@
             break;
         }
-        case UIMediumType_DVD:
+        case UIMediumDeviceType_DVD:
         {
             strMessage = tr("<p>Are you sure you want to remove the virtual optical disk "
@@ -1335 +1335 @@
             break;
         }
-        case UIMediumType_Floppy:
+        case UIMediumDeviceType_Floppy:
         {
             strMessage = tr("<p>Are you sure you want to remove the virtual floppy disk "
@@ -1405 +1405 @@
 }
 
-void UIMessageCenter::cannotDetachDevice(const CMachine &machine, UIMediumType enmType, const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent /* = 0*/) const
+void UIMessageCenter::cannotDetachDevice(const CMachine &machine, UIMediumDeviceType enmType, const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent /* = 0*/) const
 {
     /* Prepare the message: */
@@ -1411 +1411 @@
     switch (enmType)
     {
-        case UIMediumType_HardDisk:
+        case UIMediumDeviceType_HardDisk:
         {
             strMessage = tr("Failed to detach the hard disk (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.")
@@ -1417 +1417 @@
             break;
         }
-        case UIMediumType_DVD:
+        case UIMediumDeviceType_DVD:
         {
             strMessage = tr("Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.")
@@ -1423 +1423 @@
             break;
         }
-        case UIMediumType_Floppy:
+        case UIMediumDeviceType_Floppy:
         {
             strMessage = tr("Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.")
@@ -1442 +1442 @@
     switch (medium.type())
     {
-        case UIMediumType_DVD:
+        case UIMediumDeviceType_DVD:
         {
             if (fMount)
@@ -1458 +1458 @@
             break;
         }
-        case UIMediumType_Floppy:
+        case UIMediumDeviceType_Floppy:
         {
             if (fMount)
@@ -1490 +1490 @@
 }
 
-void UIMessageCenter::cannotOpenMedium(const CVirtualBox &vbox, UIMediumType, const QString &strLocation, QWidget *pParent /* = 0*/) const
+void UIMessageCenter::cannotOpenMedium(const CVirtualBox &vbox, UIMediumDeviceType, const QString &strLocation, QWidget *pParent /* = 0*/) const
 {
     /* Show the error: */
@@ -2750 +2750 @@
     qRegisterMetaType<CConsole>();
     qRegisterMetaType<CHostNetworkInterface>();
-    qRegisterMetaType<UIMediumType>();
+    qRegisterMetaType<UIMediumDeviceType>();
     qRegisterMetaType<StorageSlot>();
 

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

@@ -319 +319 @@
     int confirmFloppyAttachmentCreation(const QString &strControllerName, QWidget *pParent = 0) const;
     int confirmRemovingOfLastDVDDevice(QWidget *pParent = 0) const;
-    void cannotAttachDevice(const CMachine &machine, UIMediumType type, const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent = 0);
+    void cannotAttachDevice(const CMachine &machine, UIMediumDeviceType type, const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent = 0);
     bool warnAboutIncorrectPort(QWidget *pParent = 0) const;
     bool warnAboutIncorrectAddress(QWidget *pParent = 0) const;
@@ -340 +340 @@
     void cannotResizeHardDiskStorage(const CMedium &comMedium, const QString &strLocation, const QString &strSizeOld, const QString &strSizeNew, QWidget *pParent = 0) const;
     void cannotResizeHardDiskStorage(const CProgress &comProgress, const QString &strLocation, const QString &strSizeOld, const QString &strSizeNew, QWidget *pParent = 0) const;
-    void cannotDetachDevice(const CMachine &machine, UIMediumType type, const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent = 0) const;
+    void cannotDetachDevice(const CMachine &machine, UIMediumDeviceType type, const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent = 0) const;
     bool cannotRemountMedium(const CMachine &machine, const UIMedium &medium, bool fMount, bool fRetry, QWidget *pParent = 0) const;
-    void cannotOpenMedium(const CVirtualBox &vbox, UIMediumType type, const QString &strLocation, QWidget *pParent = 0) const;
+    void cannotOpenMedium(const CVirtualBox &vbox, UIMediumDeviceType type, const QString &strLocation, QWidget *pParent = 0) const;
     void cannotCloseMedium(const UIMedium &medium, const COMResult &rc, QWidget *pParent = 0) const;
 

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

@@ -638 +638 @@
 }
 
-void UIPopupCenter::cannotOpenMedium(QWidget *pParent, const CVirtualBox &comVBox, UIMediumType /* enmType */, const QString &strLocation)
+void UIPopupCenter::cannotOpenMedium(QWidget *pParent, const CVirtualBox &comVBox, UIMediumDeviceType /* enmType */, const QString &strLocation)
 {
     alertWithDetails(pParent, "cannotOpenMedium",

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

@@ -173 +173 @@
                                 const QString &strMachineName, bool fEnable);
     void cannotMountImage(QWidget *pParent, const QString &strMachineName, const QString &strMediumName);
-    void cannotOpenMedium(QWidget *pParent, const CVirtualBox &comVBox, UIMediumType enmType, const QString &strLocation);
+    void cannotOpenMedium(QWidget *pParent, const CVirtualBox &comVBox, UIMediumDeviceType enmType, const QString &strLocation);
     void cannotSaveMachineSettings(QWidget *pParent, const CMachine &comMachine);
 

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

@@ -2529 +2529 @@
 }
 
-QString VBoxGlobal::openMedium(UIMediumType enmMediumType, QString strMediumLocation, QWidget *pParent /* = 0 */)
+QString VBoxGlobal::openMedium(UIMediumDeviceType enmMediumType, QString strMediumLocation, QWidget *pParent /* = 0 */)
 {
     /* Convert to native separators: */
@@ -2564 +2564 @@
 }
 
-QString VBoxGlobal::openMediumWithFileOpenDialog(UIMediumType enmMediumType, QWidget *pParent,
+QString VBoxGlobal::openMediumWithFileOpenDialog(UIMediumDeviceType enmMediumType, QWidget *pParent,
                                                  const QString &strDefaultFolder /* = QString() */,
                                                  bool fUseLastFolder /* = false */)
@@ -2578 +2578 @@
     switch (enmMediumType)
     {
-        case UIMediumType_HardDisk:
+        case UIMediumDeviceType_HardDisk:
         {
             filters = HDDBackends(virtualBox());
@@ -2590 +2590 @@
             break;
         }
-        case UIMediumType_DVD:
+        case UIMediumDeviceType_DVD:
         {
             filters = DVDBackends(virtualBox());
@@ -2602 +2602 @@
             break;
         }
-        case UIMediumType_Floppy:
+        case UIMediumDeviceType_Floppy:
         {
             filters = FloppyBackends(virtualBox());
@@ -2711 +2711 @@
     /* Done. */
     if (RT_SUCCESS(vrc))
-        return openMedium(UIMediumType_DVD, QString(szVisoPath), pParent);
+        return openMedium(UIMediumDeviceType_DVD, QString(szVisoPath), pParent);
 
     /** @todo error message. */
@@ -2744 +2744 @@
 
     /* Determine device & medium types: */
-    const UIMediumType enmMediumType = mediumTypeToLocal(comCurrentAttachment.GetType());
-    AssertMsgReturnVoid(enmMediumType != UIMediumType_Invalid, ("Incorrect storage medium type!\n"));
+    const UIMediumDeviceType enmMediumType = mediumTypeToLocal(comCurrentAttachment.GetType());
+    AssertMsgReturnVoid(enmMediumType != UIMediumDeviceType_Invalid, ("Incorrect storage medium type!\n"));
 
     /* Prepare open-existing-medium action: */
@@ -2756 +2756 @@
 
     /* Prepare create floppy disk action: */
-    if (enmMediumType == UIMediumType_Floppy)
+    if (enmMediumType == UIMediumDeviceType_Floppy)
     {
         QAction *pActionCreateFloppy = menu.addAction(UIIconPool::iconSet(":/fd_add_16px.png"),
@@ -2767 +2767 @@
     }
     /* Prepare ad-hoc-viso action for DVD-ROMs: */
-    if (enmMediumType == UIMediumType_DVD)
+    if (enmMediumType == UIMediumDeviceType_DVD)
     {
         QAction *pActionAdHocViso = menu.addAction(UIIconPool::iconSet(":/select_file_16px.png"),
@@ -2785 +2785 @@
     switch (enmMediumType)
     {
-        case UIMediumType_DVD:    comMedia = host().GetDVDDrives(); break;
-        case UIMediumType_Floppy: comMedia = host().GetFloppyDrives(); break;
+        case UIMediumDeviceType_DVD:    comMedia = host().GetDVDDrives(); break;
+        case UIMediumDeviceType_Floppy: comMedia = host().GetFloppyDrives(); break;
         default: break;
     }
@@ -2826 +2826 @@
     switch (enmMediumType)
     {
-        case UIMediumType_HardDisk: recentMediumList = gEDataManager->recentListOfHardDrives(); break;
-        case UIMediumType_DVD:      recentMediumList = gEDataManager->recentListOfOpticalDisks(); break;
-        case UIMediumType_Floppy:   recentMediumList = gEDataManager->recentListOfFloppyDisks(); break;
+        case UIMediumDeviceType_HardDisk: recentMediumList = gEDataManager->recentListOfHardDrives(); break;
+        case UIMediumDeviceType_DVD:      recentMediumList = gEDataManager->recentListOfOpticalDisks(); break;
+        case UIMediumDeviceType_Floppy:   recentMediumList = gEDataManager->recentListOfFloppyDisks(); break;
         default: break;
     }
@@ -2876 +2876 @@
 
     /* Last action for optical/floppy attachments only: */
-    if (enmMediumType == UIMediumType_DVD || enmMediumType == UIMediumType_Floppy)
+    if (enmMediumType == UIMediumDeviceType_DVD || enmMediumType == UIMediumDeviceType_Floppy)
     {
         /* Insert separator: */
@@ -2887 +2887 @@
                                                                          comCurrentAttachment.GetDevice())));
         pActionUnmountMedium->setText(QApplication::translate("UIMachineSettingsStorage", "Remove disk from virtual drive"));
-        if (enmMediumType == UIMediumType_DVD)
+        if (enmMediumType == UIMediumDeviceType_DVD)
             pActionUnmountMedium->setIcon(UIIconPool::iconSet(":/cd_unmount_16px.png", ":/cd_unmount_disabled_16px.png"));
-        else if (enmMediumType == UIMediumType_Floppy)
+        else if (enmMediumType == UIMediumDeviceType_Floppy)
             pActionUnmountMedium->setIcon(UIIconPool::iconSet(":/fd_unmount_16px.png", ":/fd_unmount_disabled_16px.png"));
     }
@@ -2923 +2923 @@
 
             /* Invoke file-open dialog to choose medium ID: */
-            if (target.mediumType != UIMediumType_Invalid && target.data.isNull())
+            if (target.mediumType != UIMediumDeviceType_Invalid && target.data.isNull())
             {
                 /* Keyboard can be captured by machine-view.
@@ -2987 +2987 @@
 
     /* Do not unmount hard-drives: */
-    if (target.mediumType == UIMediumType_HardDisk && !fMount)
+    if (target.mediumType == UIMediumDeviceType_HardDisk && !fMount)
         return;
 
@@ -3016 +3016 @@
     bool fWasMounted = false;
     /* Hard drive case: */
-    if (target.mediumType == UIMediumType_HardDisk)
+    if (target.mediumType == UIMediumDeviceType_HardDisk)
     {
         /* Detaching: */
@@ -3022 +3022 @@
         fWasMounted = comMachine.isOk();
         if (!fWasMounted)
-            msgCenter().cannotDetachDevice(comMachine, UIMediumType_HardDisk, strCurrentLocation,
+            msgCenter().cannotDetachDevice(comMachine, UIMediumDeviceType_HardDisk, strCurrentLocation,
                                            StorageSlot(enmCurrentStorageBus, target.port, target.device));
         else
@@ -3030 +3030 @@
             fWasMounted = comMachine.isOk();
             if (!fWasMounted)
-                msgCenter().cannotAttachDevice(comMachine, UIMediumType_HardDisk, strCurrentLocation,
+                msgCenter().cannotAttachDevice(comMachine, UIMediumDeviceType_HardDisk, strCurrentLocation,
                                                StorageSlot(enmCurrentStorageBus, target.port, target.device));
         }
@@ -3100 +3100 @@
 }
 
-void VBoxGlobal::updateRecentlyUsedMediumListAndFolder(UIMediumType enmMediumType, QString strMediumLocation)
+void VBoxGlobal::updateRecentlyUsedMediumListAndFolder(UIMediumDeviceType enmMediumType, QString strMediumLocation)
 {
        /* Remember the path of the last chosen medium: */
     switch (enmMediumType)
     {
-        case UIMediumType_HardDisk: gEDataManager->setRecentFolderForHardDrives(QFileInfo(strMediumLocation).absolutePath()); break;
-        case UIMediumType_DVD:      gEDataManager->setRecentFolderForOpticalDisks(QFileInfo(strMediumLocation).absolutePath()); break;
-        case UIMediumType_Floppy:   gEDataManager->setRecentFolderForFloppyDisks(QFileInfo(strMediumLocation).absolutePath()); break;
+        case UIMediumDeviceType_HardDisk: gEDataManager->setRecentFolderForHardDrives(QFileInfo(strMediumLocation).absolutePath()); break;
+        case UIMediumDeviceType_DVD:      gEDataManager->setRecentFolderForOpticalDisks(QFileInfo(strMediumLocation).absolutePath()); break;
+        case UIMediumDeviceType_Floppy:   gEDataManager->setRecentFolderForFloppyDisks(QFileInfo(strMediumLocation).absolutePath()); break;
         default: break;
     }
@@ -3115 +3115 @@
     switch (enmMediumType)
     {
-        case UIMediumType_HardDisk: recentMediumList = gEDataManager->recentListOfHardDrives(); break;
-        case UIMediumType_DVD:      recentMediumList = gEDataManager->recentListOfOpticalDisks(); break;
-        case UIMediumType_Floppy:   recentMediumList = gEDataManager->recentListOfFloppyDisks(); break;
+        case UIMediumDeviceType_HardDisk: recentMediumList = gEDataManager->recentListOfHardDrives(); break;
+        case UIMediumDeviceType_DVD:      recentMediumList = gEDataManager->recentListOfOpticalDisks(); break;
+        case UIMediumDeviceType_Floppy:   recentMediumList = gEDataManager->recentListOfFloppyDisks(); break;
         default: break;
     }
@@ -3127 +3127 @@
     switch (enmMediumType)
     {
-        case UIMediumType_HardDisk: gEDataManager->setRecentListOfHardDrives(recentMediumList); break;
-        case UIMediumType_DVD:      gEDataManager->setRecentListOfOpticalDisks(recentMediumList); break;
-        case UIMediumType_Floppy:   gEDataManager->setRecentListOfFloppyDisks(recentMediumList); break;
+        case UIMediumDeviceType_HardDisk: gEDataManager->setRecentListOfHardDrives(recentMediumList); break;
+        case UIMediumDeviceType_DVD:      gEDataManager->setRecentListOfOpticalDisks(recentMediumList); break;
+        case UIMediumDeviceType_Floppy:   gEDataManager->setRecentListOfFloppyDisks(recentMediumList); break;
         default: break;
     }

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

@@ -496 +496 @@
           * @param  strMediumLocation  Brings the file path to load medium from.
           * @param  pParent            Brings the dialog parent. */
-        QString openMedium(UIMediumType enmMediumType, QString strMediumLocation, QWidget *pParent = 0);
+        QString openMedium(UIMediumDeviceType enmMediumType, QString strMediumLocation, QWidget *pParent = 0);
 
         /** Opens external medium using file-open dialog.
@@ -503 +503 @@
           * @param  strDefaultFolder  Brings the folder to browse for medium.
           * @param  fUseLastFolder    Brings whether we should propose to use last used folder. */
-        QString openMediumWithFileOpenDialog(UIMediumType enmMediumType, QWidget *pParent = 0,
+        QString openMediumWithFileOpenDialog(UIMediumDeviceType enmMediumType, QWidget *pParent = 0,
                                              const QString &strDefaultFolder = QString(), bool fUseLastFolder = true);
 
@@ -539 +539 @@
           * @param  enmMediumType       Passes the medium type.
           * @param  strMediumLocation   Passes the medium location. */
-        void updateRecentlyUsedMediumListAndFolder(UIMediumType enmMediumType, QString strMediumLocation);
+        void updateRecentlyUsedMediumListAndFolder(UIMediumDeviceType enmMediumType, QString strMediumLocation);
     /** @} */
 

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

@@ -216 +216 @@
 
     /* Notify VBoxGlobal about the new medium: */
-    vboxGlobal().createMedium(UIMedium(newMedium, UIMediumType_Floppy, KMediumState_Created));
+    vboxGlobal().createMedium(UIMedium(newMedium, UIMediumDeviceType_Floppy, KMediumState_Created));
     /* Notify VBoxGlobal about the new medium: */
-    vboxGlobal().updateRecentlyUsedMediumListAndFolder(UIMediumType_Floppy, strMediumLocation);
+    vboxGlobal().updateRecentlyUsedMediumListAndFolder(UIMediumDeviceType_Floppy, strMediumLocation);
 
     /* After a successful creation and initilization of the floppy disk we call base class accept

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

@@ -43 +43 @@
 
 UIMedium::UIMedium()
-    : m_type(UIMediumType_Invalid)
+    : m_type(UIMediumDeviceType_Invalid)
     , m_medium(CMedium())
     , m_state(KMediumState_NotCreated)
@@ -52 +52 @@
 }
 
-UIMedium::UIMedium(const CMedium &medium, UIMediumType type)
+UIMedium::UIMedium(const CMedium &medium, UIMediumDeviceType type)
     : m_type(type)
     , m_medium(medium)
@@ -62 +62 @@
 }
 
-UIMedium::UIMedium(const CMedium &medium, UIMediumType type, KMediumState state)
+UIMedium::UIMedium(const CMedium &medium, UIMediumDeviceType type, KMediumState state)
     : m_type(type)
     , m_medium(medium)
@@ -233 +233 @@
                 m_uSize = m_medium.GetSize();
                 m_strSize = vboxGlobal().formatSize(m_uSize);
-                if (m_type == UIMediumType_HardDisk)
+                if (m_type == UIMediumDeviceType_HardDisk)
                 {
                     m_uLogicalSize = m_medium.GetLogicalSize();
@@ -254 +254 @@
 
         /* For hard drive medium: */
-        if (m_type == UIMediumType_HardDisk)
+        if (m_type == UIMediumDeviceType_HardDisk)
         {
             /* Refresh hard drive disk type: */
@@ -396 +396 @@
         /* Refresh tool-tip: */
         m_strToolTip = m_sstrRow.arg(QString("<p style=white-space:pre><b>%1</b></p>").arg(m_fHostDrive ? m_strName : m_strLocation));
-        if (m_type == UIMediumType_HardDisk)
+        if (m_type == UIMediumDeviceType_HardDisk)
         {
             m_strToolTip += m_sstrRow.arg(VBoxGlobal::tr("<p style=white-space:pre>Type (Format):  %1 (%2)</p>", "medium")
@@ -434 +434 @@
 {
     m_strParentId = nullID();
-    if (m_type == UIMediumType_HardDisk)
+    if (m_type == UIMediumDeviceType_HardDisk)
     {
         CMedium parentMedium = m_medium.GetParent();
@@ -515 +515 @@
     KMediumState eState = m_state;
 
-    if (m_type == UIMediumType_HardDisk)
+    if (m_type == UIMediumDeviceType_HardDisk)
     {
         if (fNoDiffs)
@@ -553 +553 @@
             break;
         default:
-            strDetails += m_type == UIMediumType_HardDisk ? rootMedium.m_strLogicalSize : rootMedium.m_strSize;
+            strDetails += m_type == UIMediumDeviceType_HardDisk ? rootMedium.m_strLogicalSize : rootMedium.m_strSize;
             break;
     }

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

@@ -90 +90 @@
     /** Lazy wrapping constructor.
       * Creates the UIMedium associated with the given @a medium of the given @a type. */
-    UIMedium(const CMedium &medium, UIMediumType type);
+    UIMedium(const CMedium &medium, UIMediumDeviceType type);
 
     /** Wrapping constructor with known medium state.
@@ -96 +96 @@
       * given @a medium of the given @a type but sets the UIMedium @a state to passed one.
       * Suitable when the medium state is known such as right after the medium creation. */
-    UIMedium(const CMedium &medium, UIMediumType type, KMediumState state);
+    UIMedium(const CMedium &medium, UIMediumDeviceType type, KMediumState state);
 
     /** Copy constructor.
@@ -117 +117 @@
 
     /** Returns the type of UIMedium object. */
-    UIMediumType type() const { return m_type; }
+    UIMediumDeviceType type() const { return m_type; }
 
     /** Returns the CMedium wrapped by this UIMedium object. */
@@ -338 +338 @@
 
     /** Holds the type of UIMedium object. */
-    UIMediumType m_type;
+    UIMediumDeviceType m_type;
 
     /** Holds the CMedium wrapped by this UIMedium object. */

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

@@ -36 +36 @@
 
 
-/* Convert global medium type (KDeviceType) to local (UIMediumType): */
-UIMediumType UIMediumDefs::mediumTypeToLocal(KDeviceType globalType)
+/* Convert global medium type (KDeviceType) to local (UIMediumDeviceType): */
+UIMediumDeviceType UIMediumDefs::mediumTypeToLocal(KDeviceType globalType)
 {
     switch (globalType)
     {
         case KDeviceType_HardDisk:
-            return UIMediumType_HardDisk;
+            return UIMediumDeviceType_HardDisk;
         case KDeviceType_DVD:
-            return UIMediumType_DVD;
+            return UIMediumDeviceType_DVD;
         case KDeviceType_Floppy:
-            return UIMediumType_Floppy;
+            return UIMediumDeviceType_Floppy;
         default:
             break;
     }
-    return UIMediumType_Invalid;
+    return UIMediumDeviceType_Invalid;
 }
 
-/* Convert local medium type (UIMediumType) to global (KDeviceType): */
-KDeviceType UIMediumDefs::mediumTypeToGlobal(UIMediumType localType)
+/* Convert local medium type (UIMediumDeviceType) to global (KDeviceType): */
+KDeviceType UIMediumDefs::mediumTypeToGlobal(UIMediumDeviceType localType)
 {
     switch (localType)
     {
-        case UIMediumType_HardDisk:
+        case UIMediumDeviceType_HardDisk:
             return KDeviceType_HardDisk;
-        case UIMediumType_DVD:
+        case UIMediumDeviceType_DVD:
             return KDeviceType_DVD;
-        case UIMediumType_Floppy:
+        case UIMediumDeviceType_Floppy:
             return KDeviceType_Floppy;
         default:

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

@@ -51 +51 @@
 {
     /** UIMedium types. */
-    enum UIMediumType
+    enum UIMediumDeviceType
     {
-        UIMediumType_HardDisk,
-        UIMediumType_DVD,
-        UIMediumType_Floppy,
-        UIMediumType_All,
-        UIMediumType_Invalid
+        UIMediumDeviceType_HardDisk,
+        UIMediumDeviceType_DVD,
+        UIMediumDeviceType_Floppy,
+        UIMediumDeviceType_All,
+        UIMediumDeviceType_Invalid
     };
 
-    /** Converts global medium type (KDeviceType) to local (UIMediumType). */
-    SHARED_LIBRARY_STUFF UIMediumType mediumTypeToLocal(KDeviceType globalType);
-    /** Convert local medium type (UIMediumType) to global (KDeviceType). */
-    SHARED_LIBRARY_STUFF KDeviceType mediumTypeToGlobal(UIMediumType localType);
+    /** Converts global medium type (KDeviceType) to local (UIMediumDeviceType). */
+    SHARED_LIBRARY_STUFF UIMediumDeviceType mediumTypeToLocal(KDeviceType globalType);
+    /** Convert local medium type (UIMediumDeviceType) to global (KDeviceType). */
+    SHARED_LIBRARY_STUFF KDeviceType mediumTypeToGlobal(UIMediumDeviceType localType);
 
     /** Returns medium formats which are currently supported by @a comVBox for the given @a enmDeviceType. */
@@ -95 +95 @@
     /** Medium-target constructor. */
     UIMediumTarget(const QString &strName = QString(), LONG iPort = 0, LONG iDevice = 0,
-                   UIMediumType aMediumType = UIMediumType_Invalid,
+                   UIMediumDeviceType aMediumType = UIMediumDeviceType_Invalid,
                    UIMediumTargetType aType = UIMediumTargetType_WithID, const QString &strData = QString())
         : name(strName), port(iPort), device(iDevice)
@@ -110 +110 @@
 
     /** Determines medium-target medium-type. */
-    UIMediumType mediumType;
+    UIMediumDeviceType mediumType;
 
     /** Determines medium-target type. */
@@ -119 +119 @@
 
 /* Let QMetaType know about our types: */
-Q_DECLARE_METATYPE(UIMediumType);
+Q_DECLARE_METATYPE(UIMediumDeviceType);
 Q_DECLARE_METATYPE(UIMediumTarget);
 

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

@@ -70 +70 @@
 }
 
-void UIMediumDetailsWidget::setCurrentType(UIMediumType enmType)
+void UIMediumDetailsWidget::setCurrentType(UIMediumDeviceType enmType)
 {
     /* If known type was requested => raise corresponding container: */
@@ -543 +543 @@
         {
             /* Create information-containers: */
-            for (int i = (int)UIMediumType_HardDisk; i < (int)UIMediumType_All; ++i)
-            {
-                const UIMediumType enmType = (UIMediumType)i;
-                prepareInformationContainer(enmType, enmType == UIMediumType_HardDisk ? 5 : 2); /// @todo Remove hard-coded values.
+            for (int i = (int)UIMediumDeviceType_HardDisk; i < (int)UIMediumDeviceType_All; ++i)
+            {
+                const UIMediumDeviceType enmType = (UIMediumDeviceType)i;
+                prepareInformationContainer(enmType, enmType == UIMediumDeviceType_HardDisk ? 5 : 2); /// @todo Remove hard-coded values.
             }
         }
@@ -555 +555 @@
 }
 
-void UIMediumDetailsWidget::prepareInformationContainer(UIMediumType enmType, int cFields)
+void UIMediumDetailsWidget::prepareInformationContainer(UIMediumDeviceType enmType, int cFields)
 {
     /* Create information-container: */
@@ -628 +628 @@
         switch (m_newData.m_enmType)
         {
-            case UIMediumType_HardDisk:
+            case UIMediumDeviceType_HardDisk:
             {
                 /* No type changes for differencing disks: */
@@ -646 +646 @@
                 break;
             }
-            case UIMediumType_DVD:
+            case UIMediumDeviceType_DVD:
             {
                 m_pComboBoxType->addItem(QString(), QVariant::fromValue(KMediumType_Readonly));
                 break;
             }
-            case UIMediumType_Floppy:
+            case UIMediumDeviceType_Floppy:
             {
                 m_pComboBoxType->addItem(QString(), QVariant::fromValue(KMediumType_Writethrough));
@@ -687 +687 @@
     /* Load size: */
     const bool fEnableResize =    m_newData.m_fValid
-                               && m_newData.m_enmType == UIMediumType_HardDisk
+                               && m_newData.m_enmType == UIMediumDeviceType_HardDisk
                                && !(m_newData.m_enmVariant & KMediumVariant_Fixed);
     m_pLabelSize->setEnabled(fEnableResize);
@@ -829 +829 @@
 }
 
-QWidget *UIMediumDetailsWidget::infoContainer(UIMediumType enmType) const
+QWidget *UIMediumDetailsWidget::infoContainer(UIMediumDeviceType enmType) const
 {
     /* Return information-container for known medium type: */
@@ -835 +835 @@
 }
 
-QLabel *UIMediumDetailsWidget::infoLabel(UIMediumType enmType, int iIndex) const
+QLabel *UIMediumDetailsWidget::infoLabel(UIMediumDeviceType enmType, int iIndex) const
 {
     /* Acquire list of labels: */
@@ -844 +844 @@
 }
 
-QILabel *UIMediumDetailsWidget::infoField(UIMediumType enmType, int iIndex) const
+QILabel *UIMediumDetailsWidget::infoField(UIMediumDeviceType enmType, int iIndex) const
 {
     /* Acquire list of fields: */

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

@@ -120 +120 @@
     UIDataMedium()
         : m_fValid(false)
-        , m_enmType(UIMediumType_Invalid)
+        , m_enmType(UIMediumDeviceType_Invalid)
         , m_enmVariant(KMediumVariant_Max)
         , m_fHasChildren(false)
@@ -128 +128 @@
 
     /** Constructs data with passed @enmType. */
-    UIDataMedium(UIMediumType enmType)
+    UIDataMedium(UIMediumDeviceType enmType)
         : m_fValid(false)
         , m_enmType(enmType)
@@ -158 +158 @@
     bool m_fValid;
     /** Holds the medium type. */
-    UIMediumType m_enmType;
+    UIMediumDeviceType m_enmType;
     /** Holds the medium variant. */
     KMediumVariant m_enmVariant;
@@ -195 +195 @@
 
     /** Defines the raised details @a enmType. */
-    void setCurrentType(UIMediumType enmType);
+    void setCurrentType(UIMediumDeviceType enmType);
 
     /** Returns the medium data. */
@@ -246 +246 @@
         void prepareTabDetails();
         /** Prepares information-container. */
-        void prepareInformationContainer(UIMediumType enmType, int cFields);
+        void prepareInformationContainer(UIMediumDeviceType enmType, int cFields);
     /** @} */
 
@@ -273 +273 @@
       * @{ */
         /** Returns information-container for passed medium @a enmType. */
-        QWidget *infoContainer(UIMediumType enmType) const;
+        QWidget *infoContainer(UIMediumDeviceType enmType) const;
         /** Returns information-label for passed medium @a enmType and @a iIndex. */
-        QLabel *infoLabel(UIMediumType enmType, int iIndex) const;
+        QLabel *infoLabel(UIMediumDeviceType enmType, int iIndex) const;
         /** Returns information-field for passed medium @a enmType and @a iIndex. */
-        QILabel *infoField(UIMediumType enmType, int iIndex) const;
+        QILabel *infoField(UIMediumDeviceType enmType, int iIndex) const;
     /** @} */
 
@@ -343 +343 @@
 
         /** Holds the map of information-container instances. */
-        QMap<UIMediumType, QWidget*>          m_aContainers;
+        QMap<UIMediumDeviceType, QWidget*>          m_aContainers;
         /** Holds the map of information-container label instances. */
-        QMap<UIMediumType, QList<QLabel*> >   m_aLabels;
+        QMap<UIMediumDeviceType, QList<QLabel*> >   m_aLabels;
         /** Holds the information-container field instances. */
-        QMap<UIMediumType, QList<QILabel*> >  m_aFields;
+        QMap<UIMediumDeviceType, QList<QILabel*> >  m_aFields;
     /** @} */
 };

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

@@ -215 +215 @@
     switch (m_enmType)
     {
-        case UIMediumType_HardDisk:
+        case UIMediumDeviceType_HardDisk:
         {
             m_details.m_aLabels << QApplication::translate("UIMediumManager", "Format:");
@@ -235 +235 @@
             break;
         }
-        case UIMediumType_DVD:
-        case UIMediumType_Floppy:
+        case UIMediumDeviceType_DVD:
+        case UIMediumDeviceType_Floppy:
         {
             m_details.m_aLabels << QApplication::translate("UIMediumManager", "Attached to:");
@@ -366 +366 @@
         {
             /* Return failure: */
-            msgCenter().cannotDetachDevice(comMachine, UIMediumType_HardDisk, location(),
+            msgCenter().cannotDetachDevice(comMachine, UIMediumDeviceType_HardDisk, location(),
                                            StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice()),
                                            treeWidget());

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

@@ -61 +61 @@
     void setMedium(const UIMedium &guiMedium);
 
-    /** Returns UIMediumType of the wrapped UIMedium. */
-    UIMediumType mediumType() const { return m_guiMedium.type(); }
+    /** Returns UIMediumDeviceType of the wrapped UIMedium. */
+    UIMediumDeviceType mediumType() const { return m_guiMedium.type(); }
 
     /** Returns KMediumState of the wrapped UIMedium. */

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

@@ -202 +202 @@
     if (m_pTabWidget)
     {
-        m_pTabWidget->setTabText(tabIndex(UIMediumType_HardDisk), UIMediumManager::tr("&Hard disks"));
-        m_pTabWidget->setTabText(tabIndex(UIMediumType_DVD), UIMediumManager::tr("&Optical disks"));
-        m_pTabWidget->setTabText(tabIndex(UIMediumType_Floppy), UIMediumManager::tr("&Floppy disks"));
+        m_pTabWidget->setTabText(tabIndex(UIMediumDeviceType_HardDisk), UIMediumManager::tr("&Hard disks"));
+        m_pTabWidget->setTabText(tabIndex(UIMediumDeviceType_DVD), UIMediumManager::tr("&Optical disks"));
+        m_pTabWidget->setTabText(tabIndex(UIMediumDeviceType_Floppy), UIMediumManager::tr("&Floppy disks"));
     }
 
     /* Translate HD tree-widget: */
-    QITreeWidget *pTreeWidgetHD = treeWidget(UIMediumType_HardDisk);
+    QITreeWidget *pTreeWidgetHD = treeWidget(UIMediumDeviceType_HardDisk);
     if (pTreeWidgetHD)
     {
@@ -217 +217 @@
 
     /* Translate CD tree-widget: */
-    QITreeWidget *pTreeWidgetCD = treeWidget(UIMediumType_DVD);
+    QITreeWidget *pTreeWidgetCD = treeWidget(UIMediumDeviceType_DVD);
     if (pTreeWidgetCD)
     {
@@ -225 +225 @@
 
     /* Translate FD tree-widget: */
-    QITreeWidget *pTreeWidgetFD = treeWidget(UIMediumType_Floppy);
+    QITreeWidget *pTreeWidgetFD = treeWidget(UIMediumDeviceType_Floppy);
     if (pTreeWidgetFD)
     {
@@ -446 +446 @@
     if (m_pTabWidget)
     {
-        m_pTabWidget->setTabIcon(tabIndex(UIMediumType_HardDisk), m_iconHD);
-        m_pTabWidget->setTabIcon(tabIndex(UIMediumType_DVD), m_iconCD);
-        m_pTabWidget->setTabIcon(tabIndex(UIMediumType_Floppy), m_iconFD);
+        m_pTabWidget->setTabIcon(tabIndex(UIMediumDeviceType_HardDisk), m_iconHD);
+        m_pTabWidget->setTabIcon(tabIndex(UIMediumDeviceType_DVD), m_iconCD);
+        m_pTabWidget->setTabIcon(tabIndex(UIMediumDeviceType_Floppy), m_iconFD);
     }
 
@@ -810 +810 @@
         /* Create tabs: */
         for (int i = 0; i < m_iTabCount; ++i)
-            prepareTab((UIMediumType)i);
+            prepareTab((UIMediumDeviceType)i);
         /* Configure tab-widget: */
         m_pTabWidget->setFocusPolicy(Qt::TabFocus);
-        m_pTabWidget->setTabIcon(tabIndex(UIMediumType_HardDisk), m_iconHD);
-        m_pTabWidget->setTabIcon(tabIndex(UIMediumType_DVD), m_iconCD);
-        m_pTabWidget->setTabIcon(tabIndex(UIMediumType_Floppy), m_iconFD);
+        m_pTabWidget->setTabIcon(tabIndex(UIMediumDeviceType_HardDisk), m_iconHD);
+        m_pTabWidget->setTabIcon(tabIndex(UIMediumDeviceType_DVD), m_iconCD);
+        m_pTabWidget->setTabIcon(tabIndex(UIMediumDeviceType_Floppy), m_iconFD);
         connect(m_pTabWidget, &QITabWidget::currentChanged, this, &UIMediumManagerWidget::sltHandleCurrentTabChanged);
 
@@ -826 +826 @@
 }
 
-void UIMediumManagerWidget::prepareTab(UIMediumType type)
+void UIMediumManagerWidget::prepareTab(UIMediumDeviceType type)
 {
     /* Create tab: */
@@ -843 +843 @@
 
             /* Prepare tree-widget: */
-            prepareTreeWidget(type, type == UIMediumType_HardDisk ? 3 : 2);
+            prepareTreeWidget(type, type == UIMediumDeviceType_HardDisk ? 3 : 2);
         }
     }
 }
 
-void UIMediumManagerWidget::prepareTreeWidget(UIMediumType type, int iColumns)
+void UIMediumManagerWidget::prepareTreeWidget(UIMediumDeviceType type, int iColumns)
 {
     /* Create tree-widget: */
@@ -919 +919 @@
 {
     /* Remember current medium-items: */
-    if (UIMediumItem *pMediumItem = mediumItem(UIMediumType_HardDisk))
+    if (UIMediumItem *pMediumItem = mediumItem(UIMediumDeviceType_HardDisk))
         m_strCurrentIdHD = pMediumItem->id();
-    if (UIMediumItem *pMediumItem = mediumItem(UIMediumType_DVD))
+    if (UIMediumItem *pMediumItem = mediumItem(UIMediumDeviceType_DVD))
         m_strCurrentIdCD = pMediumItem->id();
-    if (UIMediumItem *pMediumItem = mediumItem(UIMediumType_Floppy))
+    if (UIMediumItem *pMediumItem = mediumItem(UIMediumDeviceType_Floppy))
         m_strCurrentIdFD = pMediumItem->id();
 
     /* Clear tree-widgets: */
-    QITreeWidget *pTreeWidgetHD = treeWidget(UIMediumType_HardDisk);
+    QITreeWidget *pTreeWidgetHD = treeWidget(UIMediumDeviceType_HardDisk);
     if (pTreeWidgetHD)
     {
@@ -933 +933 @@
         pTreeWidgetHD->clear();
     }
-    QITreeWidget *pTreeWidgetCD = treeWidget(UIMediumType_DVD);
+    QITreeWidget *pTreeWidgetCD = treeWidget(UIMediumDeviceType_DVD);
     if (pTreeWidgetCD)
     {
@@ -939 +939 @@
         pTreeWidgetCD->clear();
     }
-    QITreeWidget *pTreeWidgetFD = treeWidget(UIMediumType_Floppy);
+    QITreeWidget *pTreeWidgetFD = treeWidget(UIMediumDeviceType_Floppy);
     if (pTreeWidgetFD)
     {
@@ -953 +953 @@
 
     /* Select first item as current one if nothing selected: */
-    if (pTreeWidgetHD && !mediumItem(UIMediumType_HardDisk))
+    if (pTreeWidgetHD && !mediumItem(UIMediumDeviceType_HardDisk))
         if (QTreeWidgetItem *pItem = pTreeWidgetHD->topLevelItem(0))
             setCurrentItem(pTreeWidgetHD, pItem);
-    if (pTreeWidgetCD && !mediumItem(UIMediumType_DVD))
+    if (pTreeWidgetCD && !mediumItem(UIMediumDeviceType_DVD))
         if (QTreeWidgetItem *pItem = pTreeWidgetCD->topLevelItem(0))
             setCurrentItem(pTreeWidgetCD, pItem);
-    if (pTreeWidgetFD && !mediumItem(UIMediumType_Floppy))
+    if (pTreeWidgetFD && !mediumItem(UIMediumDeviceType_Floppy))
         if (QTreeWidgetItem *pItem = pTreeWidgetFD->topLevelItem(0))
             setCurrentItem(pTreeWidgetFD, pItem);
 }
 
-void UIMediumManagerWidget::refetchCurrentMediumItem(UIMediumType type)
+void UIMediumManagerWidget::refetchCurrentMediumItem(UIMediumDeviceType type)
 {
     /* Get corresponding medium-item: */
@@ -994 +994 @@
 void UIMediumManagerWidget::refetchCurrentMediumItems()
 {
-    refetchCurrentMediumItem(UIMediumType_HardDisk);
-    refetchCurrentMediumItem(UIMediumType_DVD);
-    refetchCurrentMediumItem(UIMediumType_Floppy);
+    refetchCurrentMediumItem(UIMediumDeviceType_HardDisk);
+    refetchCurrentMediumItem(UIMediumDeviceType_DVD);
+    refetchCurrentMediumItem(UIMediumDeviceType_Floppy);
 }
 
@@ -1022 +1022 @@
 void UIMediumManagerWidget::updateActionIcons()
 {
-    const UIMediumType enmCurrentMediumType = currentMediumType();
-    if (enmCurrentMediumType != UIMediumType_Invalid)
+    const UIMediumDeviceType enmCurrentMediumType = currentMediumType();
+    if (enmCurrentMediumType != UIMediumDeviceType_Invalid)
     {
         m_pActionPool->action(UIActionIndexST_M_Medium_S_Add)->setState((int)enmCurrentMediumType);
@@ -1042 +1042 @@
     const QIcon *pIcon = 0;
     bool *pfInaccessible = 0;
-    const UIMediumType mediumType = pMediumItem->mediumType();
+    const UIMediumDeviceType mediumType = pMediumItem->mediumType();
     switch (mediumType)
     {
-        case UIMediumType_HardDisk:
+        case UIMediumDeviceType_HardDisk:
             pIcon = &m_iconHD;
             pfInaccessible = &m_fInaccessibleHD;
             break;
-        case UIMediumType_DVD:
+        case UIMediumDeviceType_DVD:
             pIcon = &m_iconCD;
             pfInaccessible = &m_fInaccessibleCD;
             break;
-        case UIMediumType_Floppy:
+        case UIMediumDeviceType_Floppy:
             pIcon = &m_iconFD;
             pfInaccessible = &m_fInaccessibleFD;
@@ -1126 +1126 @@
 {
     /* Get medium type: */
-    UIMediumType type = medium.type();
+    UIMediumDeviceType type = medium.type();
 
     /* Create medium-item: */
@@ -1133 +1133 @@
     {
         /* Of hard-drive type: */
-        case UIMediumType_HardDisk:
+        case UIMediumDeviceType_HardDisk:
         {
             /* Make sure corresponding tree-widget exists: */
-            QITreeWidget *pTreeWidget = treeWidget(UIMediumType_HardDisk);
+            QITreeWidget *pTreeWidget = treeWidget(UIMediumDeviceType_HardDisk);
             if (pTreeWidget)
             {
@@ -1153 +1153 @@
         }
         /* Of optical-image type: */
-        case UIMediumType_DVD:
+        case UIMediumDeviceType_DVD:
         {
             /* Make sure corresponding tree-widget exists: */
-            QITreeWidget *pTreeWidget = treeWidget(UIMediumType_DVD);
+            QITreeWidget *pTreeWidget = treeWidget(UIMediumDeviceType_DVD);
             if (pTreeWidget)
             {
@@ -1174 +1174 @@
         }
         /* Of floppy-image type: */
-        case UIMediumType_Floppy:
+        case UIMediumDeviceType_Floppy:
         {
             /* Make sure corresponding tree-widget exists: */
-            QITreeWidget *pTreeWidget = treeWidget(UIMediumType_Floppy);
+            QITreeWidget *pTreeWidget = treeWidget(UIMediumDeviceType_Floppy);
             if (pTreeWidget)
             {
@@ -1218 +1218 @@
 
     /* Make sure corresponding tree-widget exists: */
-    QITreeWidget *pTreeWidget = treeWidget(UIMediumType_HardDisk);
+    QITreeWidget *pTreeWidget = treeWidget(UIMediumDeviceType_HardDisk);
     if (pTreeWidget)
     {
@@ -1269 +1269 @@
 {
     /* Get medium type: */
-    UIMediumType type = medium.type();
+    UIMediumDeviceType type = medium.type();
 
     /* Search for existing medium-item: */
@@ -1297 +1297 @@
 {
     /* Search for corresponding tree-widget: */
-    QList<UIMediumType> types;
-    types << UIMediumType_HardDisk << UIMediumType_DVD << UIMediumType_Floppy;
+    QList<UIMediumDeviceType> types;
+    types << UIMediumDeviceType_HardDisk << UIMediumDeviceType_DVD << UIMediumDeviceType_Floppy;
     QITreeWidget *pTreeWidget = 0;
     UIMediumItem *pMediumItem = 0;
-    foreach (UIMediumType type, types)
+    foreach (UIMediumDeviceType type, types)
     {
         /* Get iterated tree-widget: */
@@ -1328 +1328 @@
 }
 
-QWidget* UIMediumManagerWidget::tab(UIMediumType type) const
+QWidget* UIMediumManagerWidget::tab(UIMediumDeviceType type) const
 {
     /* Determine tab index for passed medium type: */
@@ -1341 +1341 @@
 }
 
-QITreeWidget* UIMediumManagerWidget::treeWidget(UIMediumType type) const
+QITreeWidget* UIMediumManagerWidget::treeWidget(UIMediumDeviceType type) const
 {
     /* Determine tab index for passed medium type: */
@@ -1354 +1354 @@
 }
 
-UIMediumItem* UIMediumManagerWidget::mediumItem(UIMediumType type) const
+UIMediumItem* UIMediumManagerWidget::mediumItem(UIMediumDeviceType type) const
 {
     /* Get corresponding tree-widget: */
@@ -1362 +1362 @@
 }
 
-UIMediumType UIMediumManagerWidget::mediumType(QITreeWidget *pTreeWidget) const
+UIMediumDeviceType UIMediumManagerWidget::mediumType(QITreeWidget *pTreeWidget) const
 {
     /* Determine tab index of passed tree-widget: */
@@ -1369 +1369 @@
     /* Return medium type for known tab index: */
     if (iIndex >= 0 && iIndex < m_iTabCount)
-        return (UIMediumType)iIndex;
+        return (UIMediumDeviceType)iIndex;
 
     /* Invalid by default: */
-    AssertFailedReturn(UIMediumType_Invalid);
-}
-
-UIMediumType UIMediumManagerWidget::currentMediumType() const
+    AssertFailedReturn(UIMediumDeviceType_Invalid);
+}
+
+UIMediumDeviceType UIMediumManagerWidget::currentMediumType() const
 {
     /* Invalid if tab-widget doesn't exists: */
     if (!m_pTabWidget)
-        return UIMediumType_Invalid;
+        return UIMediumDeviceType_Invalid;
 
     /* Return current medium type: */
-    return (UIMediumType)m_pTabWidget->currentIndex();
+    return (UIMediumDeviceType)m_pTabWidget->currentIndex();
 }
 
@@ -1418 +1418 @@
 
 /* static */
-int UIMediumManagerWidget::tabIndex(UIMediumType type)
+int UIMediumManagerWidget::tabIndex(UIMediumDeviceType type)
 {
     /* Return tab index corresponding to known medium type: */
     switch (type)
     {
-        case UIMediumType_HardDisk: return 0;
-        case UIMediumType_DVD:      return 1;
-        case UIMediumType_Floppy:   return 2;
+        case UIMediumDeviceType_HardDisk: return 0;
+        case UIMediumDeviceType_DVD:      return 1;
+        case UIMediumDeviceType_Floppy:   return 2;
         default: break;
     }

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

@@ -214 +214 @@
         void prepareTabWidget();
         /** Prepares tab-widget's tab. */
-        void prepareTab(UIMediumType type);
+        void prepareTab(UIMediumDeviceType type);
         /** Prepares tab-widget's tree-widget. */
-        void prepareTreeWidget(UIMediumType type, int iColumns);
+        void prepareTreeWidget(UIMediumDeviceType type, int iColumns);
         /** Prepares details-widget. */
         void prepareDetailsWidget();
@@ -226 +226 @@
 
         /** Updates details according latest changes in current item of passed @a type. */
-        void refetchCurrentMediumItem(UIMediumType type);
+        void refetchCurrentMediumItem(UIMediumDeviceType type);
         /** Updates details according latest changes in current item of chosen type. */
         void refetchCurrentChosenMediumItem();
@@ -252 +252 @@
 
         /** Returns tab for passed medium @a type. */
-        QWidget *tab(UIMediumType type) const;
+        QWidget *tab(UIMediumDeviceType type) const;
         /** Returns tree-widget for passed medium @a type. */
-        QITreeWidget *treeWidget(UIMediumType type) const;
+        QITreeWidget *treeWidget(UIMediumDeviceType type) const;
         /** Returns item for passed medium @a type. */
-        UIMediumItem *mediumItem(UIMediumType type) const;
+        UIMediumItem *mediumItem(UIMediumDeviceType type) const;
 
         /** Returns medium type for passed @a pTreeWidget. */
-        UIMediumType mediumType(QITreeWidget *pTreeWidget) const;
+        UIMediumDeviceType mediumType(QITreeWidget *pTreeWidget) const;
 
         /** Returns current medium type. */
-        UIMediumType currentMediumType() const;
+        UIMediumDeviceType currentMediumType() const;
         /** Returns current tree-widget. */
         QITreeWidget *currentTreeWidget() const;
@@ -274 +274 @@
     /** @name Helper stuff.
       * @{ */
-        /** Returns tab index for passed UIMediumType. */
-        static int tabIndex(UIMediumType type);
+        /** Returns tab index for passed UIMediumDeviceType. */
+        static int tabIndex(UIMediumDeviceType type);
 
         /** Performs search for the @a pTree child which corresponds to the @a condition but not @a pException. */

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

@@ -149 +149 @@
 
 
-UIMediumSelector::UIMediumSelector(UIMediumType enmMediumType, const QString &machineName /* = QString() */,
+UIMediumSelector::UIMediumSelector(UIMediumDeviceType enmMediumType, const QString &machineName /* = QString() */,
                                    const QString &machineSettigFilePath /* = QString() */, QWidget *pParent /* = 0 */)
     :QIWithRetranslateUI<QIDialog>(pParent)
@@ -235 +235 @@
     switch (m_enmMediumType)
     {
-        case UIMediumType_DVD:
+        case UIMediumDeviceType_DVD:
             strPrefix = "cd";
             break;
-        case UIMediumType_Floppy:
+        case UIMediumDeviceType_Floppy:
             strPrefix = "fd";
             break;
-        case UIMediumType_HardDisk:
-        case UIMediumType_All:
-        case UIMediumType_Invalid:
+        case UIMediumDeviceType_HardDisk:
+        case UIMediumDeviceType_All:
+        case UIMediumDeviceType_Invalid:
         default:
             strPrefix = "hd";
@@ -262 +262 @@
 
     /* Currently create is supported only for Floppy: */
-    if (m_enmMediumType == UIMediumType_Floppy)
+    if (m_enmMediumType == UIMediumDeviceType_Floppy)
     {
         m_pActionCreate = new QAction(this);
@@ -330 +330 @@
     switch (m_enmMediumType)
     {
-        case UIMediumType_DVD:
+        case UIMediumDeviceType_DVD:
             return new UIMediumItemCD(medium, pParent);
             break;
-        case UIMediumType_Floppy:
+        case UIMediumDeviceType_Floppy:
             return new UIMediumItemFD(medium, pParent);
             break;
-        case UIMediumType_HardDisk:
-        case UIMediumType_All:
-        case UIMediumType_Invalid:
+        case UIMediumDeviceType_HardDisk:
+        case UIMediumDeviceType_All:
+        case UIMediumDeviceType_Invalid:
         default:
             return createHardDiskItem(medium, pParent);
@@ -446 +446 @@
         m_pMainLayout->addWidget(m_pTreeWidget);
         m_pTreeWidget->setAlternatingRowColors(true);
-        int iColumnCount = (m_enmMediumType == UIMediumType_HardDisk) ? 3 : 2;
+        int iColumnCount = (m_enmMediumType == UIMediumDeviceType_HardDisk) ? 3 : 2;
         m_pTreeWidget->setColumnCount(iColumnCount);
         m_pTreeWidget->setSortingEnabled(true);

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

@@ -48 +48 @@
 public:
 
-    UIMediumSelector(UIMediumType enmMediumType, const QString &machineName = QString(),
+    UIMediumSelector(UIMediumDeviceType enmMediumType, const QString &machineName = QString(),
                      const QString &machineSettigFilePath = QString(), QWidget *pParent = 0);
     QStringList selectedMediumIds() const;
@@ -104 +104 @@
     QVBoxLayout          *m_pMainLayout;
     QITreeWidget         *m_pTreeWidget;
-    UIMediumType          m_enmMediumType;
+    UIMediumDeviceType          m_enmMediumType;
     QIDialogButtonBox    *m_pButtonBox;
     UIToolBar            *m_pToolBar;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

@@ -223 +223 @@
                 strAttData += s_strTableRow4
                     .arg(gpConverter->toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
-                    .arg(UIMedium(attachment.GetMedium(), UIMediumType_HardDisk).location());
+                    .arg(UIMedium(attachment.GetMedium(), UIMediumDeviceType_HardDisk).location());
                 fAttachmentsPresent = true;
             }
@@ -287 +287 @@
                     continue;
                 /* Append attachment data: */
-                UIMedium vboxMedium(attachment.GetMedium(), UIMediumType_DVD);
+                UIMedium vboxMedium(attachment.GetMedium(), UIMediumDeviceType_DVD);
                 strAttData += s_strTableRow4
                     .arg(gpConverter->toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
@@ -356 +356 @@
                     continue;
                 /* Append attachment data: */
-                UIMedium vboxMedium(attachment.GetMedium(), UIMediumType_Floppy);
+                UIMedium vboxMedium(attachment.GetMedium(), UIMediumDeviceType_Floppy);
                 strAttData += s_strTableRow4
                     .arg(gpConverter->toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -204 +204 @@
     /* Apply ad-hoc reconfigurations from the command line: */
     if (vboxGlobal().hasFloppyImageToMount())
-        mountAdHocImage(KDeviceType_Floppy, UIMediumType_Floppy, vboxGlobal().getFloppyImage());
+        mountAdHocImage(KDeviceType_Floppy, UIMediumDeviceType_Floppy, vboxGlobal().getFloppyImage());
     if (vboxGlobal().hasDvdImageToMount())
-        mountAdHocImage(KDeviceType_DVD, UIMediumType_DVD, vboxGlobal().getDvdImage());
+        mountAdHocImage(KDeviceType_DVD, UIMediumDeviceType_DVD, vboxGlobal().getDvdImage());
 
     /* Power UP if this is NOT separate process: */
@@ -588 +588 @@
 
     /* Mount medium add-hoc: */
-    mountAdHocImage(KDeviceType_DVD, UIMediumType_DVD, strSource);
+    mountAdHocImage(KDeviceType_DVD, UIMediumDeviceType_DVD, strSource);
 }
 
@@ -1905 +1905 @@
 }
 
-bool UISession::mountAdHocImage(KDeviceType enmDeviceType, UIMediumType enmMediumType, const QString &strMediumName)
+bool UISession::mountAdHocImage(KDeviceType enmDeviceType, UIMediumDeviceType enmMediumType, const QString &strMediumName)
 {
     /* Get VBox: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -415 +415 @@
     void setPointerShape(const uchar *pShapeData, bool fHasAlpha, uint uXHot, uint uYHot, uint uWidth, uint uHeight);
     bool preprocessInitialization();
-    bool mountAdHocImage(KDeviceType enmDeviceType, UIMediumType enmMediumType, const QString &strMediumName);
+    bool mountAdHocImage(KDeviceType enmDeviceType, UIMediumDeviceType enmMediumType, const QString &strMediumName);
     bool postprocessInitialization();
     int countOfVisibleWindows();

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

@@ -2123 +2123 @@
     void setId(const QString &strId) { m_strId = strId; emit sigChanged(); }
 
-    UIMediumType type() const { return m_type; }
-    void setType(UIMediumType type) { m_type = type; }
+    UIMediumDeviceType type() const { return m_type; }
+    void setType(UIMediumDeviceType type) { m_type = type; }
 
     bool isNull() const { return m_strId == UIMedium().id(); }
@@ -2135 +2135 @@
 
     QString m_strId;
-    UIMediumType m_type;
+    UIMediumDeviceType m_type;
 };
 
@@ -3036 +3036 @@
         switch (m_pMediumIdHolder->type())
         {
-            case UIMediumType_HardDisk:
+            case UIMediumDeviceType_HardDisk:
             {
                 /* Add "Create a new virtual hard disk" action: */
@@ -3048 +3048 @@
                 break;
             }
-            case UIMediumType_DVD:
+            case UIMediumDeviceType_DVD:
             {
                 /* Add "Choose a virtual optical disk file" action: */
@@ -3064 +3064 @@
                 break;
             }
-            case UIMediumType_Floppy:
+            case UIMediumDeviceType_Floppy:
             {
                 /* Add "Choose a virtual floppy disk file" action: */
@@ -3124 +3124 @@
         /* Get recent medium type & name: */
         const QStringList mediumInfoList = pChooseRecentMediumAction->data().toString().split(',');
-        const UIMediumType enmMediumType = (UIMediumType)mediumInfoList[0].toUInt();
+        const UIMediumDeviceType enmMediumType = (UIMediumDeviceType)mediumInfoList[0].toUInt();
         const QString strMediumLocation = mediumInfoList[1];
         const QString strMediumId = vboxGlobal().openMedium(enmMediumType, strMediumLocation, this);
@@ -3795 +3795 @@
 }
 
-QString UIMachineSettingsStorage::openMediumSelectorDialog(UIMediumType  enmMediumType)
+QString UIMachineSettingsStorage::openMediumSelectorDialog(UIMediumDeviceType  enmMediumType)
 {
     QWidget *pParent = windowManager().realParentWindow(this);
@@ -3836 +3836 @@
                 strMediumId = getWithNewHDWizard();
             else if (iAnswer == AlertButton_Choice2)
-                strMediumId = openMediumSelectorDialog(UIMediumType_HardDisk);
+                strMediumId = openMediumSelectorDialog(UIMediumDeviceType_HardDisk);
             break;
         }
@@ -3845 +3845 @@
                 strMediumId = vboxGlobal().medium(strMediumId).id();
             else if (iAnswer == AlertButton_Choice2)
-                strMediumId = openMediumSelectorDialog(UIMediumType_DVD);
+                strMediumId = openMediumSelectorDialog(UIMediumDeviceType_DVD);
             break;
         }
@@ -3854 +3854 @@
                 strMediumId = vboxGlobal().medium(strMediumId).id();
             else if (iAnswer == AlertButton_Choice2)
-                strMediumId = openMediumSelectorDialog(UIMediumType_Floppy);
+                strMediumId = openMediumSelectorDialog(UIMediumDeviceType_Floppy);
             break;
         }
@@ -3968 +3968 @@
 }
 
-void UIMachineSettingsStorage::addRecentMediumActions(QMenu *pOpenMediumMenu, UIMediumType enmRecentMediumType)
+void UIMachineSettingsStorage::addRecentMediumActions(QMenu *pOpenMediumMenu, UIMediumDeviceType enmRecentMediumType)
 {
     /* Get recent-medium list: */
@@ -3974 +3974 @@
     switch (enmRecentMediumType)
     {
-        case UIMediumType_HardDisk: recentMediumList = gEDataManager->recentListOfHardDrives(); break;
-        case UIMediumType_DVD:      recentMediumList = gEDataManager->recentListOfOpticalDisks(); break;
-        case UIMediumType_Floppy:   recentMediumList = gEDataManager->recentListOfFloppyDisks(); break;
+        case UIMediumDeviceType_HardDisk: recentMediumList = gEDataManager->recentListOfHardDrives(); break;
+        case UIMediumDeviceType_DVD:      recentMediumList = gEDataManager->recentListOfOpticalDisks(); break;
+        case UIMediumDeviceType_Floppy:   recentMediumList = gEDataManager->recentListOfFloppyDisks(); break;
         default: break;
     }

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

@@ -742 +742 @@
     void prepareConnections();
     /** Opens medium selector dialog and retrieves uuid of a selected medium (if any). */
-    QString openMediumSelectorDialog(UIMediumType  enmMediumType);
+    QString openMediumSelectorDialog(UIMediumDeviceType  enmMediumType);
     /** Cleanups all. */
     void cleanup();
@@ -768 +768 @@
     void addChooseHostDriveActions(QMenu *pOpenMediumMenu);
     /** Adds 'Choose Recent Medium' actions of passed @a enmRecentMediumType into passed @a pOpenMediumMenu. */
-    void addRecentMediumActions(QMenu *pOpenMediumMenu, UIMediumType enmRecentMediumType);
+    void addRecentMediumActions(QMenu *pOpenMediumMenu, UIMediumDeviceType enmRecentMediumType);
 
     /** Saves existing storage data from the cache. */

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

@@ -34 +34 @@
 UIMediaComboBox::UIMediaComboBox(QWidget *pParent)
     : QComboBox(pParent)
-    , m_enmMediaType(UIMediumType_Invalid)
+    , m_enmMediaType(UIMediumDeviceType_Invalid)
     , m_strMachineId(QString())
     , m_strLastItemId(QString())
@@ -52 +52 @@
 
     /* If at least one real medium present, remove null medium: */
-    if (count() > 1 && m_enmMediaType == UIMediumType_HardDisk)
+    if (count() > 1 && m_enmMediaType == UIMediumDeviceType_HardDisk)
     {
         removeItem(0);
@@ -122 +122 @@
 
     /* Ignore all diffs: */
-    if (guiMedium.type() == UIMediumType_HardDisk && guiMedium.parentID() != UIMedium::nullID())
+    if (guiMedium.type() == UIMediumDeviceType_HardDisk && guiMedium.parentID() != UIMedium::nullID())
         return;
 

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

@@ -46 +46 @@
 
     /** Defines @a enmMediaType. */
-    void setType(UIMediumType enmMediaType) { m_enmMediaType = enmMediaType; }
+    void setType(UIMediumDeviceType enmMediaType) { m_enmMediaType = enmMediaType; }
     /** Returns media type. */
-    UIMediumType type() const { return m_enmMediaType; }
+    UIMediumDeviceType type() const { return m_enmMediaType; }
 
     /** Defines @a strMachineId. */
@@ -96 +96 @@
 
     /** Holds the media type. */
-    UIMediumType  m_enmMediaType;
+    UIMediumDeviceType  m_enmMediaType;
 
     /** Holds the machine ID. */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic1.cpp

@@ -43 +43 @@
 {
     /* Get current virtual-disk medium type: */
-    const UIMediumType enmMediumType = UIMediumDefs::mediumTypeToLocal(sourceVirtualDisk().GetDeviceType());
+    const UIMediumDeviceType enmMediumType = UIMediumDefs::mediumTypeToLocal(sourceVirtualDisk().GetDeviceType());
     /* Get source virtual-disk using file-open dialog: */
     QString strMediumId = vboxGlobal().openMediumWithFileOpenDialog(enmMediumType, thisImp());

trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp

@@ -74 +74 @@
             {
                 m_pMediaSelector->setMachineId(strMachineId);
-                m_pMediaSelector->setType(UIMediumType_DVD);
+                m_pMediaSelector->setType(UIMediumDeviceType_DVD);
                 m_pMediaSelector->repopulate();
             }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp

@@ -110 +110 @@
 
     /* Inform VBoxGlobal about it: */
-    vboxGlobal().createMedium(UIMedium(m_virtualDisk, UIMediumType_HardDisk, KMediumState_Created));
+    vboxGlobal().createMedium(UIMedium(m_virtualDisk, UIMediumDeviceType_HardDisk, KMediumState_Created));
 
     return true;

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

@@ -280 +280 @@
                 machine.AttachDevice(strHDName, 0, 0, KDeviceType_HardDisk, medium);
                 if (!machine.isOk())
-                    msgCenter().cannotAttachDevice(machine, UIMediumType_HardDisk, field("virtualDiskLocation").toString(),
+                    msgCenter().cannotAttachDevice(machine, UIMediumDeviceType_HardDisk, field("virtualDiskLocation").toString(),
                                                    StorageSlot(ctrHDBus, 0, 0), this);
             }
@@ -287 +287 @@
             machine.AttachDevice(strDVDName, 1, 0, KDeviceType_DVD, CMedium());
             if (!machine.isOk())
-                msgCenter().cannotAttachDevice(machine, UIMediumType_DVD, QString(), StorageSlot(strDVDBus, 1, 0), this);
+                msgCenter().cannotAttachDevice(machine, UIMediumDeviceType_DVD, QString(), StorageSlot(strDVDBus, 1, 0), this);
 
 
@@ -294 +294 @@
                 machine.AttachDevice(strFloppyName, 0, 0, KDeviceType_Floppy, CMedium());
                 if (!machine.isOk())
-                    msgCenter().cannotAttachDevice(machine, UIMediumType_Floppy, QString(),
+                    msgCenter().cannotAttachDevice(machine, UIMediumDeviceType_Floppy, QString(),
                                                    StorageSlot(KStorageBus_Floppy, 0, 0), this);
             }

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

@@ -68 +68 @@
 {
     /* Get opened medium id: */
-    QString strMediumId = vboxGlobal().openMediumWithFileOpenDialog(UIMediumType_HardDisk, thisImp());
+    QString strMediumId = vboxGlobal().openMediumWithFileOpenDialog(UIMediumDeviceType_HardDisk, thisImp());
     if (!strMediumId.isNull())
     {
@@ -147 +147 @@
             m_pDiskSelector = new UIMediaComboBox(this);
             {
-                m_pDiskSelector->setType(UIMediumType_HardDisk);
+                m_pDiskSelector->setType(UIMediumDeviceType_HardDisk);
                 m_pDiskSelector->repopulate();
             }

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

@@ -112 +112 @@
                 m_pDiskSelector = new UIMediaComboBox(m_pDiskCnt);
                 {
-                    m_pDiskSelector->setType(UIMediumType_HardDisk);
+                    m_pDiskSelector->setType(UIMediumDeviceType_HardDisk);
                     m_pDiskSelector->repopulate();
                 }