Changeset 34947 in vbox

Timestamp:

Dec 10, 2010 1:14:00 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: VBoxGlobal extended with few medium-type conversion methods commonly used.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (2 diffs)

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

@@ -2392 +2392 @@
 
     mMediaEnumThread->start();
+}
+
+VBoxDefs::MediumType VBoxGlobal::mediumTypeToLocal(KDeviceType globalType)
+{
+    switch (globalType)
+    {
+        case KDeviceType_HardDisk:
+            return VBoxDefs::MediumType_HardDisk;
+        case KDeviceType_DVD:
+            return VBoxDefs::MediumType_DVD;
+        case KDeviceType_Floppy:
+            return VBoxDefs::MediumType_Floppy;
+        default:
+            break;
+    }
+    return VBoxDefs::MediumType_Invalid;
+}
+
+KDeviceType VBoxGlobal::mediumTypeToGlobal(VBoxDefs::MediumType localType)
+{
+    switch (localType)
+    {
+        case VBoxDefs::MediumType_HardDisk:
+            return KDeviceType_HardDisk;
+        case VBoxDefs::MediumType_DVD:
+            return KDeviceType_DVD;
+        case VBoxDefs::MediumType_Floppy:
+            return KDeviceType_Floppy;
+        default:
+            break;
+    }
+    return KDeviceType_Null;
 }
 

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

@@ -574 +574 @@
     bool isMediaEnumerationStarted() const { return mMediaEnumThread != NULL; }
 
+    VBoxDefs::MediumType mediumTypeToLocal(KDeviceType globalType);
+    KDeviceType mediumTypeToGlobal(VBoxDefs::MediumType localType);
+
     void addMedium (const VBoxMedium &);
     void updateMedium (const VBoxMedium &);

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

@@ -1088 +1088 @@
     QMenu *pFloppyDevicesMenu = actionsPool()->action(UIActionIndex_Menu_FloppyDevices)->menu();
 
-    /* Determine device type: */
-    KDeviceType deviceType = pMenu == pOpticalDevicesMenu ? KDeviceType_DVD :
-                             pMenu == pFloppyDevicesMenu  ? KDeviceType_Floppy :
-                                                            KDeviceType_Null;
-    AssertMsg(deviceType != KDeviceType_Null, ("Incorrect storage device type!\n"));
-
-    /* Determine medium type: */
+    /* Determine medium & device types: */
     VBoxDefs::MediumType mediumType = pMenu == pOpticalDevicesMenu ? VBoxDefs::MediumType_DVD :
                                       pMenu == pFloppyDevicesMenu  ? VBoxDefs::MediumType_Floppy :
                                                                      VBoxDefs::MediumType_Invalid;
+    KDeviceType deviceType = vboxGlobal().mediumTypeToGlobal(mediumType);
     AssertMsg(mediumType != VBoxDefs::MediumType_Invalid, ("Incorrect storage medium type!\n"));
+    AssertMsg(deviceType != KDeviceType_Null, ("Incorrect storage device type!\n"));
 
     /* Fill attachments menu: */

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

@@ -36 +36 @@
 #include <QTimer>
 #include <QCommonStyle>
-
-/* Type converters */
-VBoxDefs::MediumType typeToLocal (KDeviceType aType)
-{
-    VBoxDefs::MediumType result = VBoxDefs::MediumType_Invalid;
-    switch (aType)
-    {
-        case KDeviceType_HardDisk:
-            result = VBoxDefs::MediumType_HardDisk;
-            break;
-        case KDeviceType_DVD:
-            result = VBoxDefs::MediumType_DVD;
-            break;
-        case KDeviceType_Floppy:
-            result = VBoxDefs::MediumType_Floppy;
-            break;
-        default:
-            AssertMsgFailed (("Incorrect medium type!\n"));
-            break;
-    }
-    return result;
-}
-
 
 QString compressText (const QString &aText)
@@ -2321 +2298 @@
                         break;
                 }
-                m_pMediumIdHolder->setType(typeToLocal(device));
+                m_pMediumIdHolder->setType(vboxGlobal().mediumTypeToLocal(device));
                 m_pMediumIdHolder->setId(mStorageModel->data(index, StorageModel::R_AttMediumId).toString());