Changeset 41615 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

Timestamp:

Jun 7, 2012 4:55:08 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: Moving VBoxMedium stuff into separate folder, renaming it into UIMedium. Remove VBoxMedium stuff from VBoxGlobal/VBoxDefs.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (13 diffs)

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

@@ -81 +81 @@
 struct MediumTarget
 {
-    MediumTarget() : name(QString("")), port(0), device(0), id(QString()), type(VBoxDefs::MediumType_Invalid) {}
+    MediumTarget() : name(QString("")), port(0), device(0), id(QString()), type(UIMediumType_Invalid) {}
     MediumTarget(const QString &strName, LONG iPort, LONG iDevice)
-        : name(strName), port(iPort), device(iDevice), id(QString()), type(VBoxDefs::MediumType_Invalid) {}
+        : name(strName), port(iPort), device(iDevice), id(QString()), type(UIMediumType_Invalid) {}
     MediumTarget(const QString &strName, LONG iPort, LONG iDevice, const QString &strId)
-        : name(strName), port(iPort), device(iDevice), id(strId), type(VBoxDefs::MediumType_Invalid) {}
-    MediumTarget(const QString &strName, LONG iPort, LONG iDevice, VBoxDefs::MediumType eType)
+        : name(strName), port(iPort), device(iDevice), id(strId), type(UIMediumType_Invalid) {}
+    MediumTarget(const QString &strName, LONG iPort, LONG iDevice, UIMediumType eType)
         : name(strName), port(iPort), device(iDevice), id(QString()), type(eType) {}
     QString name;
@@ -92 +92 @@
     LONG device;
     QString id;
-    VBoxDefs::MediumType type;
+    UIMediumType type;
 };
 Q_DECLARE_METATYPE(MediumTarget);
@@ -98 +98 @@
 struct RecentMediumTarget
 {
-    RecentMediumTarget() : name(QString("")), port(0), device(0), location(QString()), type(VBoxDefs::MediumType_Invalid) {}
-    RecentMediumTarget(const QString &strName, LONG iPort, LONG iDevice, const QString &strLocation, VBoxDefs::MediumType eType)
+    RecentMediumTarget() : name(QString("")), port(0), device(0), location(QString()), type(UIMediumType_Invalid) {}
+    RecentMediumTarget(const QString &strName, LONG iPort, LONG iDevice, const QString &strLocation, UIMediumType eType)
         : name(strName), port(iPort), device(iDevice), location(strLocation), type(eType) {}
     QString name;
@@ -105 +105 @@
     LONG device;
     QString location;
-    VBoxDefs::MediumType type;
+    UIMediumType type;
 };
 Q_DECLARE_METATYPE(RecentMediumTarget);
@@ -1123 +1123 @@
 
     /* 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"));
+    UIMediumType mediumType = pMenu == pOpticalDevicesMenu ? UIMediumType_DVD :
+                                      pMenu == pFloppyDevicesMenu  ? UIMediumType_Floppy :
+                                                                     UIMediumType_Invalid;
+    KDeviceType deviceType = mediumTypeToGlobal(mediumType);
+    AssertMsg(mediumType != UIMediumType_Invalid, ("Incorrect storage medium type!\n"));
     AssertMsg(deviceType != KDeviceType_Null, ("Incorrect storage device type!\n"));
 
@@ -1184 +1184 @@
             switch (mediumType)
             {
-                case VBoxDefs::MediumType_DVD:
+                case UIMediumType_DVD:
                     mediums = vboxGlobal().host().GetDVDDrives();
                     strRecentMediumAddress = VBoxDefs::GUI_RecentListCD;
                     break;
-                case VBoxDefs::MediumType_Floppy:
+                case UIMediumType_Floppy:
                     mediums = vboxGlobal().host().GetFloppyDrives();
                     strRecentMediumAddress = VBoxDefs::GUI_RecentListFD;
@@ -1216 +1216 @@
                 if (!fIsHostDriveUsed)
                 {
-                    QAction *pChooseHostDriveAction = pAttachmentMenu->addAction(VBoxMedium(medium, mediumType).name(),
+                    QAction *pChooseHostDriveAction = pAttachmentMenu->addAction(UIMedium(medium, mediumType).name(),
                                                                                  this, SLOT(sltMountStorageMedium()));
                     pChooseHostDriveAction->setCheckable(true);
@@ -1276 +1276 @@
             switch (mediumType)
             {
-                case VBoxDefs::MediumType_DVD:
+                case UIMediumType_DVD:
                     pChooseExistingMediumAction->setText(QApplication::translate("UIMachineSettingsStorage", "Choose a virtual CD/DVD disk file..."));
                     unmountMediumAction->setText(QApplication::translate("UIMachineSettingsStorage", "Remove disk from virtual drive"));
@@ -1282 +1282 @@
                                                                      ":/cd_unmount_dis_16px.png"));
                     break;
-                case VBoxDefs::MediumType_Floppy:
+                case UIMediumType_Floppy:
                     pChooseExistingMediumAction->setText(QApplication::translate("UIMachineSettingsStorage", "Choose a virtual floppy disk file..."));
                     unmountMediumAction->setText(QApplication::translate("UIMachineSettingsStorage", "Remove disk from virtual drive"));
@@ -1302 +1302 @@
         switch (mediumType)
         {
-            case VBoxDefs::MediumType_DVD:
+            case UIMediumType_DVD:
                 pEmptyMenuAction->setText(QApplication::translate("UIMachineLogic", "No CD/DVD Devices Attached"));
                 pEmptyMenuAction->setToolTip(QApplication::translate("UIMachineLogic", "No CD/DVD devices attached to that VM"));
                 break;
-            case VBoxDefs::MediumType_Floppy:
+            case UIMediumType_Floppy:
                 pEmptyMenuAction->setText(QApplication::translate("UIMachineLogic", "No Floppy Devices Attached"));
                 pEmptyMenuAction->setToolTip(QApplication::translate("UIMachineLogic", "No floppy devices attached to that VM"));
@@ -1337 +1337 @@
     /* New mount-target attributes: */
     QString newId = QString("");
-    bool fSelectWithMediaManager = target.type != VBoxDefs::MediumType_Invalid;
+    bool fSelectWithMediaManager = target.type != UIMediumType_Invalid;
 
     /* Open Virtual Media Manager to select image id: */
@@ -1371 +1371 @@
     bool fMount = !newId.isEmpty();
 
-    VBoxMedium vmedium = vboxGlobal().findMedium(newId);
+    UIMedium vmedium = vboxGlobal().findMedium(newId);
     CMedium medium = vmedium.medium();              // @todo r=dj can this be cached somewhere?
 
@@ -1428 +1428 @@
 
         /* Prepare target medium: */
-        const VBoxMedium &vboxMedium = fMount ? vboxGlobal().findMedium(strNewId) : VBoxMedium();
+        const UIMedium &vboxMedium = fMount ? vboxGlobal().findMedium(strNewId) : UIMedium();
         const CMedium &comMedium = fMount ? vboxMedium.medium() : CMedium();