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

Timestamp:

Jun 18, 2012 5:59:30 PM (13 years ago)

Author:

vboxsync

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

78640

Message:

FE/Qt: UIConverter template interface supporting various required conversions between different GUI and COM types.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (4 diffs)
• src/UIMediumTypeChangeDialog.cpp (modified) (2 diffs)
• src/VBoxVMInformationDlg.cpp (modified) (2 diffs)
• src/globals/COMEnumsWrapper.cpp (deleted)
• src/globals/COMEnumsWrapper.h (deleted)
• src/globals/UIDefs.h (modified) (2 diffs)
• src/globals/UIMessageCenter.cpp (modified) (8 diffs)
• src/globals/VBoxGlobal.cpp (modified) (14 diffs)
• src/globals/VBoxGlobal.h (modified) (5 diffs)
• src/medium/UIMedium.cpp (modified) (2 diffs)
• src/runtime/UIIndicatorsPool.cpp (modified) (5 diffs)
• src/runtime/UIMachineLogic.cpp (modified) (2 diffs)
• src/runtime/UIMachineWindow.cpp (modified) (2 diffs)
• src/selector/UIVMDesktop.cpp (modified) (7 diffs)
• src/selector/UIVMItem.cpp (modified) (5 diffs)
• src/selector/VBoxSnapshotsWgt.cpp (modified) (3 diffs)
• src/settings/machine/UIMachineSettingsAudio.cpp (modified) (5 diffs)
• src/settings/machine/UIMachineSettingsDisplay.cpp (modified) (4 diffs)
• src/settings/machine/UIMachineSettingsGeneral.cpp (modified) (2 diffs)
• src/settings/machine/UIMachineSettingsNetwork.cpp (modified) (5 diffs)
• src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp (modified) (3 diffs)
• src/settings/machine/UIMachineSettingsSerial.cpp (modified) (7 diffs)
• src/settings/machine/UIMachineSettingsStorage.cpp (modified) (9 diffs)
• src/settings/machine/UIMachineSettingsSystem.cpp (modified) (2 diffs)
• src/settings/machine/UIMachineSettingsUSB.cpp (modified) (3 diffs)
• src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp (modified) (2 diffs)
• src/widgets/UIApplianceEditorWidget.cpp (modified) (5 diffs)
• src/widgets/UIBootTable.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -145 +145 @@
 VBOX_GUI_INC_DIRS = \
         ./src \
+        ./src/converter \
         ./src/extensions \
         ./src/globals \
@@ -275 +276 @@
         src/globals/VBoxGlobal.h \
         src/globals/VBoxUtils.h \
-        src/globals/COMEnumsWrapper.h \
         src/net/UINetworkManager.h \
         src/net/UINetworkManagerDialog.h \
@@ -446 +446 @@
         src/VBoxVMInformationDlg.cpp \
         src/UIVMLogViewer.cpp \
+        src/converter/UIConverter.cpp \
+        src/converter/UIConverterBackendCOM.cpp \
+        src/converter/UIConverterBackendGlobal.cpp \
         src/extensions/QIAdvancedSlider.cpp \
         src/extensions/QIArrowButtonPress.cpp \
@@ -479 +482 @@
         src/globals/UIMessageCenter.cpp \
         src/globals/VBoxGlobal.cpp \
-        src/globals/COMEnumsWrapper.cpp \
         src/medium/UIMediumDefs.cpp \
         src/medium/UIMedium.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp

@@ -30 +30 @@
 #include "QILabel.h"
 #include "QIDialogButtonBox.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 /* Constructor: */
@@ -126 +126 @@
     QList<QRadioButton*> buttons = findChildren<QRadioButton*>();
     for (int i = 0; i < buttons.size(); ++i)
-        buttons[i]->setText(gCOMenum->toString(buttons[i]->property("mediumType").value<KMediumType>()));
+        buttons[i]->setText(gpConverter->toString(buttons[i]->property("mediumType").value<KMediumType>()));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp

@@ -34 +34 @@
 #include "VBoxGlobal.h"
 #include "VBoxVMInformationDlg.h"
+#include "UIConverter.h"
 
 /* COM includes: */
@@ -664 +665 @@
     QString header = "<tr><td></td><td colspan=2><nobr>&nbsp;&nbsp;%1:</nobr></td></tr>";
     CStorageController ctr = mSession.GetMachine().GetStorageControllerByName (aCtrName);
-    QString name = vboxGlobal().toString (StorageSlot (ctr.GetBus(), aPort, aDevice));
+    QString name = gpConverter->toString (StorageSlot (ctr.GetBus(), aPort, aDevice));
     return header.arg (name) + composeArticle (aBelongsTo, 2);
 }

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

@@ -23 +23 @@
 #include <QEvent>
 #include <QStringList>
+
+/* COM includes: */
+#include "COMEnums.h"
 
 /* Other VBox defines: */
@@ -207 +210 @@
 using namespace UIDefs /* globally */;
 
+struct StorageSlot
+{
+    StorageSlot() : bus(KStorageBus_Null), port(0), device(0) {}
+    StorageSlot(const StorageSlot &other) : bus(other.bus), port(other.port), device(other.device) {}
+    StorageSlot(KStorageBus otherBus, LONG iPort, LONG iDevice) : bus(otherBus), port(iPort), device(iDevice) {}
+    StorageSlot& operator=(const StorageSlot &other) { bus = other.bus; port = other.port; device = other.device; return *this; }
+    bool operator==(const StorageSlot &other) const { return bus == other.bus && port == other.port && device == other.device; }
+    bool operator!=(const StorageSlot &other) const { return bus != other.bus || port != other.port || device != other.device; }
+    bool operator<(const StorageSlot &other) const { return (bus <  other.bus) ||
+                                                            (bus == other.bus && port <  other.port) ||
+                                                            (bus == other.bus && port == other.port && device < other.device); }
+    bool operator>(const StorageSlot &other) const { return (bus >  other.bus) ||
+                                                            (bus == other.bus && port >  other.port) ||
+                                                            (bus == other.bus && port == other.port && device > other.device); }
+    bool isNull() const { return bus == KStorageBus_Null; }
+    KStorageBus bus; LONG port; LONG device;
+};
+Q_DECLARE_METATYPE(StorageSlot);
+
 #endif // __UIDefs_h__
 

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

@@ -36 +36 @@
 #include "UINetworkManager.h"
 #include "UINetworkManagerDialog.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 #ifdef VBOX_OSE
 # include "UIDownloaderUserManual.h"
@@ -1353 +1353 @@
     message(pParent ? pParent : mainWindowShown(), Error,
             tr("<p>Error changing medium type from <b>%1</b> to <b>%2</b>.</p>")
-                .arg(gCOMenum->toString(oldMediumType)).arg(gCOMenum->toString(newMediumType)),
+                .arg(gpConverter->toString(oldMediumType)).arg(gpConverter->toString(newMediumType)),
             formatErrorInfo(medium));
 }
@@ -1541 +1541 @@
         {
             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>.")
-                           .arg(strLocation).arg(vboxGlobal().toString(storageSlot)).arg(CMachine(machine).GetName());
+                           .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
             break;
         }
@@ -1547 +1547 @@
         {
             strMessage = tr("Failed to detach the CD/DVD device (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.")
-                           .arg(strLocation).arg(vboxGlobal().toString(storageSlot)).arg(CMachine(machine).GetName());
+                           .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
             break;
         }
@@ -1553 +1553 @@
         {
             strMessage = tr("Failed to detach the floppy device (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.")
-                           .arg(strLocation).arg(vboxGlobal().toString(storageSlot)).arg(CMachine(machine).GetName());
+                           .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
             break;
         }
@@ -3082 +3082 @@
         {
             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>.")
-                           .arg(strLocation).arg(vboxGlobal().toString(storageSlot)).arg(CMachine(machine).GetName());
+                           .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
             break;
         }
@@ -3088 +3088 @@
         {
             strMessage = tr("Failed to attach the CD/DVD device (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.")
-                           .arg(strLocation).arg(vboxGlobal().toString(storageSlot)).arg(CMachine(machine).GetName());
+                           .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
             break;
         }
@@ -3094 +3094 @@
         {
             strMessage = tr("Failed to attach the floppy device (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.")
-                           .arg(strLocation).arg(vboxGlobal().toString(storageSlot)).arg(CMachine(machine).GetName());
+                           .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
             break;
         }

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

@@ -65 +65 @@
 #include "UIMachine.h"
 #include "UISession.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 #ifdef Q_WS_X11
@@ -959 +959 @@
 }
 
-/**
- * Returns a full string representation of the given device of the given channel on the given storage bus.
- * This method does not uses any separate string tags related to bus, channel, device, it has own
- * separately translated string tags allowing to translate a full slot name into human readable format
- * to be consistent with i18n.
- * Complementary to #toStorageSlot (const QString &) const.
- */
-QString VBoxGlobal::toString (StorageSlot aSlot) const
-{
-    switch (aSlot.bus)
-    {
-        case KStorageBus_IDE:
-        case KStorageBus_SATA:
-        case KStorageBus_SCSI:
-        case KStorageBus_SAS:
-        case KStorageBus_Floppy:
-            break;
-
-        default:
-        {
-            AssertMsgFailed (("Invalid bus type %d\n", aSlot.bus));
-            break;
-        }
-    }
-
-    int maxPort = virtualBox().GetSystemProperties().GetMaxPortCountForStorageBus (aSlot.bus);
-    int maxDevice = virtualBox().GetSystemProperties().GetMaxDevicesPerPortForStorageBus (aSlot.bus);
-    if (aSlot.port < 0 || aSlot.port > maxPort)
-        AssertMsgFailed (("Invalid port %d\n", aSlot.port));
-    if (aSlot.device < 0 || aSlot.device > maxDevice)
-        AssertMsgFailed (("Invalid device %d\n", aSlot.device));
-
-    QString result;
-    switch (aSlot.bus)
-    {
-        case KStorageBus_IDE:
-        {
-            result = mSlotTemplates [aSlot.port * maxDevice + aSlot.device];
-            break;
-        }
-        case KStorageBus_SATA:
-        {
-            result = mSlotTemplates [4].arg (aSlot.port);
-            break;
-        }
-        case KStorageBus_SCSI:
-        {
-            result = mSlotTemplates [5].arg (aSlot.port);
-            break;
-        }
-        case KStorageBus_SAS:
-        {
-            result = mSlotTemplates [6].arg (aSlot.port);
-            break;
-        }
-        case KStorageBus_Floppy:
-        {
-            result = mSlotTemplates [7].arg (aSlot.device);
-            break;
-        }
-        default:
-        {
-            AssertMsgFailed (("Invalid bus type %d\n", aSlot.bus));
-            break;
-        }
-    }
-    return result;
-}
-
-/**
- * Returns a StorageSlot based on the given device of the given channel on the given storage bus.
- * Complementary to #toFullString (StorageSlot) const.
- */
-StorageSlot VBoxGlobal::toStorageSlot (const QString &aSlot) const
-{
-    int index = -1;
-    QRegExp regExp;
-    for (int i = 0; i < mSlotTemplates.size(); ++ i)
-    {
-        regExp = QRegExp (i >= 0 && i <= 3 ? mSlotTemplates [i] : mSlotTemplates [i].arg ("(\\d+)"));
-        if (regExp.indexIn (aSlot) != -1)
-        {
-            index = i;
-            break;
-        }
-    }
-
-    StorageSlot result;
-    switch (index)
-    {
-        case 0:
-        case 1:
-        case 2:
-        case 3:
-        {
-            result.bus = KStorageBus_IDE;
-            int maxPort = virtualBox().GetSystemProperties().GetMaxPortCountForStorageBus (result.bus);
-            result.port = index / maxPort;
-            result.device = index % maxPort;
-            break;
-        }
-        case 4:
-        {
-            result.bus = KStorageBus_SATA;
-            int maxPort = virtualBox().GetSystemProperties().GetMaxPortCountForStorageBus (result.bus);
-            result.port = regExp.cap (1).toInt();
-            if (result.port < 0 || result.port > maxPort)
-                AssertMsgFailed (("Invalid port %d\n", result.port));
-            break;
-        }
-        case 5:
-        {
-            result.bus = KStorageBus_SCSI;
-            int maxPort = virtualBox().GetSystemProperties().GetMaxPortCountForStorageBus (result.bus);
-            result.port = regExp.cap (1).toInt();
-            if (result.port < 0 || result.port > maxPort)
-                AssertMsgFailed (("Invalid port %d\n", result.port));
-            break;
-        }
-        case 6:
-        {
-            result.bus = KStorageBus_SAS;
-            int maxPort = virtualBox().GetSystemProperties().GetMaxPortCountForStorageBus (result.bus);
-            result.port = regExp.cap (1).toInt();
-            if (result.port < 0 || result.port > maxPort)
-                AssertMsgFailed (("Invalid port %d\n", result.port));
-            break;
-        }
-        case 7:
-        {
-            result.bus = KStorageBus_Floppy;
-            int maxDevice = virtualBox().GetSystemProperties().GetMaxDevicesPerPortForStorageBus (result.bus);
-            result.device = regExp.cap (1).toInt();
-            if (result.device < 0 || result.device > maxDevice)
-                AssertMsgFailed (("Invalid device %d\n", result.device));
-            break;
-        }
-        default:
-            break;
-    }
-    return result;
-}
-
 struct PortConfig
 {
@@ -1139 +996 @@
         return mDiskTypes_Differencing;
     }
-    return gCOMenum->toString(medium.GetType());
+    return gpConverter->toString(medium.GetType());
 }
 
@@ -1324 +1181 @@
     {
         tip += QString (tr ("<br><nobr>State: %1</nobr>", "USB device tooltip"))
-                        .arg (gCOMenum->toString (hostDev.GetState()));
+                        .arg (gpConverter->toString (hostDev.GetState()));
     }
 
@@ -1377 +1234 @@
     {
         tip += tip.isEmpty() ? "":"<br/>" + tr ("<nobr>State: %1</nobr>", "USB filter tooltip")
-                                                .arg (gCOMenum->toString (hostDev.GetState()));
+                                                .arg (gpConverter->toString (hostDev.GetState()));
     }
 
@@ -1448 +1305 @@
             if (!bootOrder.isEmpty())
                 bootOrder += ", ";
-            bootOrder += gCOMenum->toString (device);
+            bootOrder += gpConverter->toString (device);
         }
         if (bootOrder.isEmpty())
-            bootOrder = gCOMenum->toString (KDeviceType_Null);
+            bootOrder = gpConverter->toString (KDeviceType_Null);
 
         iRowCount += 1; /* Boot-order row. */
@@ -1617 +1474 @@
                                             QString(sSectionItemTpl2)
                                             .arg(QString("&nbsp;&nbsp;") +
-                                                 toString(StorageSlot(controller.GetBus(),
-                                                                      attachment.GetPort(),
-                                                                      attachment.GetDevice())) + strDeviceType)
+                                                 gpConverter->toString(StorageSlot(controller.GetBus(),
+                                                                                   attachment.GetPort(),
+                                                                                   attachment.GetDevice())) + strDeviceType)
                                             .arg(details(medium, false));
                 /* Insert that attachment into map: */
@@ -1661 +1518 @@
             item = QString (sSectionItemTpl2)
                    .arg (tr ("Host Driver", "details report (audio)"),
-                         gCOMenum->toString (audio.GetAudioDriver())) +
+                         gpConverter->toString (audio.GetAudioDriver())) +
                    QString (sSectionItemTpl2)
                    .arg (tr ("Controller", "details report (audio)"),
-                         gCOMenum->toString (audio.GetAudioController()));
+                         gpConverter->toString (audio.GetAudioController()));
         else
             item = QString (sSectionItemTpl1)
@@ -1689 +1546 @@
             {
                 KNetworkAttachmentType type = adapter.GetAttachmentType();
-                QString attType = gCOMenum->toString (adapter.GetAdapterType())
+                QString attType = gpConverter->toString (adapter.GetAdapterType())
                                   .replace (QRegExp ("\\s\\(.+\\)"), " (%1)");
                 /* don't use the adapter type string for types that have
@@ -1707 +1564 @@
                         "details report (network)").arg (adapter.GetGenericDriver()));
                 else
-                    attType = attType.arg (gCOMenum->toString (type));
+                    attType = attType.arg (gpConverter->toString (type));
 
                 item += QString (sSectionItemTpl2)
@@ -1749 +1606 @@
                     mode == KPortMode_RawFile)
                     data += QString ("%1 (<nobr>%2</nobr>)")
-                            .arg (gCOMenum->toString (mode))
+                            .arg (gpConverter->toString (mode))
                             .arg (QDir::toNativeSeparators (port.GetPath()));
                 else
-                    data += gCOMenum->toString (mode);
+                    data += gpConverter->toString (mode);
 
                 item += QString (sSectionItemTpl2)
@@ -2577 +2434 @@
 void VBoxGlobal::retranslateUi()
 {
-    mSlotTemplates [0] = tr ("IDE Primary Master", "New Storage UI : Slot Name");
-    mSlotTemplates [1] = tr ("IDE Primary Slave", "New Storage UI : Slot Name");
-    mSlotTemplates [2] = tr ("IDE Secondary Master", "New Storage UI : Slot Name");
-    mSlotTemplates [3] = tr ("IDE Secondary Slave", "New Storage UI : Slot Name");
-    mSlotTemplates [4] = tr ("SATA Port %1", "New Storage UI : Slot Name");
-    mSlotTemplates [5] = tr ("SCSI Port %1", "New Storage UI : Slot Name");
-    mSlotTemplates [6] = tr ("SAS Port %1", "New Storage UI : Slot Name");
-    mSlotTemplates [7] = tr ("Floppy Device %1", "New Storage UI : Slot Name");
-
-    mDiskTypes_Differencing =                   tr ("Differencing", "DiskType");
+    mDiskTypes_Differencing = tr ("Differencing", "DiskType");
 
     mUserDefinedPortName = tr ("User-defined", "serial port");
@@ -4661 +4509 @@
     mValid = true;
 
-    /* Prepare COM enum extensions: */
-    COMEnumsWrapper::prepare();
+    UIConverter::prepare();
 
     /* Cache IMedium data.
@@ -4762 +4609 @@
         delete m_pVirtualMachine;
 
-    /* Cleanup COM enum extensions: */
-    COMEnumsWrapper::cleanup();
+    UIConverter::cleanup();
 
     /* ensure CGuestOSType objects are no longer used */

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

@@ -35 +35 @@
 /* COM includes: */
 #include "VBox/com/Guid.h"
-#include "COMEnums.h"
 #include "CHost.h"
 #include "CVirtualBox.h"
@@ -50 +49 @@
 class CUSBDevice;
 
-struct StorageSlot
-{
-    StorageSlot() : bus (KStorageBus_Null), port (0), device (0) {}
-    StorageSlot (const StorageSlot &aOther) : bus (aOther.bus), port (aOther.port), device (aOther.device) {}
-    StorageSlot (KStorageBus aBus, LONG aPort, LONG aDevice) : bus (aBus), port (aPort), device (aDevice) {}
-    StorageSlot& operator= (const StorageSlot &aOther) { bus = aOther.bus; port = aOther.port; device = aOther.device; return *this; }
-    bool operator== (const StorageSlot &aOther) const { return bus == aOther.bus && port == aOther.port && device == aOther.device; }
-    bool operator!= (const StorageSlot &aOther) const { return bus != aOther.bus || port != aOther.port || device != aOther.device; }
-    bool operator< (const StorageSlot &aOther) const { return (bus < aOther.bus) ||
-                                                              (bus == aOther.bus && port < aOther.port) ||
-                                                              (bus == aOther.bus && port == aOther.port && device < aOther.device); }
-    bool operator> (const StorageSlot &aOther) const { return (bus > aOther.bus) ||
-                                                              (bus == aOther.bus && port > aOther.port) ||
-                                                              (bus == aOther.bus && port == aOther.port && device > aOther.device); }
-    bool isNull() { return bus == KStorageBus_Null; }
-    KStorageBus bus; LONG port; LONG device;
-};
-Q_DECLARE_METATYPE (StorageSlot);
-
 // VBoxGlobal class
 ////////////////////////////////////////////////////////////////////////////////
@@ -81 +61 @@
 
 public:
-
-    typedef QHash <ulong, QString> QULongStringHash;
 
     static VBoxGlobal &instance();
@@ -208 +186 @@
         return tr("%n second(s)", "", cVal);
     }
-
-    QString toString (StorageSlot aSlot) const;
-    StorageSlot toStorageSlot (const QString &aSlot) const;
 
     QString differencingMediumTypeName() const { return mDiskTypes_Differencing; }
@@ -548 +523 @@
     QPixmap mOfflineSnapshotIcon, mOnlineSnapshotIcon;
 
-    QULongStringHash mSlotTemplates;
-
     QString mDiskTypes_Differencing;
 

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

@@ -29 +29 @@
 #include "VBoxGlobal.h"
 #include "UIMessageCenter.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 /* COM includes: */
@@ -142 +142 @@
         mHardDiskFormat = mMedium.GetFormat();
         mHardDiskType = vboxGlobal().mediumTypeString (mMedium);
-        mStorageDetails = gCOMenum->toString((KMediumVariant)mMedium.GetVariant());
+        mStorageDetails = gpConverter->toString((KMediumVariant)mMedium.GetVariant());
         mIsReadOnly = mMedium.GetReadOnly();
 

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

@@ -26 +26 @@
 #include "UIMachineDefs.h"
 #include "QIWithRetranslateUI.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 /* COM includes: */
@@ -88 +88 @@
                     continue;
                 strAttData += QString("<br>&nbsp;<nobr>%1:&nbsp;%2</nobr>")
-                    .arg(vboxGlobal().toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
+                    .arg(gpConverter->toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
                     .arg(UIMedium(attachment.GetMedium(), UIMediumType_HardDisk).location());
                 fAttachmentsPresent = true;
@@ -157 +157 @@
                 UIMedium vboxMedium(attachment.GetMedium(), UIMediumType_DVD);
                 strAttData += QString("<br>&nbsp;<nobr>%1:&nbsp;%2</nobr>")
-                    .arg(vboxGlobal().toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
+                    .arg(gpConverter->toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
                     .arg(vboxMedium.isNull() || vboxMedium.isHostDrive() ? vboxMedium.name() : vboxMedium.location());
                 fAttachmentsPresent = true;
@@ -228 +228 @@
                 UIMedium vboxMedium(attachment.GetMedium(), UIMediumType_Floppy);
                 strAttData += QString("<br>&nbsp;<nobr>%1:&nbsp;%2</nobr>")
-                    .arg(vboxGlobal().toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
+                    .arg(gpConverter->toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
                     .arg(vboxMedium.isNull() || vboxMedium.isHostDrive() ? vboxMedium.name() : vboxMedium.location());
                 fAttachmentsPresent = true;
@@ -328 +328 @@
                                "<br><nobr><b>Adapter %1 (%2)</b>: %3 cable %4</nobr>", "Network adapters tooltip")
                     .arg(uSlot + 1)
-                    .arg(gCOMenum->toString(adapter.GetAttachmentType()))
+                    .arg(gpConverter->toString(adapter.GetAttachmentType()))
                     .arg(strGuestIp.isEmpty() ? "" : "IP " + strGuestIp + ", ")
                     .arg(adapter.GetCableConnected() ?

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

@@ -48 +48 @@
 #include "UISettingsDialogSpecific.h"
 #include "UIVMLogViewer.h"
+#include "UIConverter.h"
 #ifdef Q_WS_MAC
 # include "DockIconPreview.h"
@@ -1153 +1154 @@
                 pAttachmentMenu = new QMenu(pMenu);
                 pAttachmentMenu->setTitle(QString("%1 (%2)").arg(controller.GetName())
-                                          .arg(vboxGlobal().toString(StorageSlot(controller.GetBus(),
+                                          .arg(gpConverter->toString(StorageSlot(controller.GetBus(),
                                                                                  attachment.GetPort(),
                                                                                  attachment.GetDevice()))));

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

@@ -37 +37 @@
 #include "UISession.h"
 #include "UIVMCloseDialog.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 /* COM includes: */
@@ -609 +609 @@
         QString strMachineName = m.GetName() + strSnapshotName;
         if (state != KMachineState_Null)
-            strMachineName += " [" + gCOMenum->toString(state) + "]";
+            strMachineName += " [" + gpConverter->toString(state) + "]";
         /* Unusual on the Mac. */
 #ifndef Q_WS_MAC

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp

@@ -42 +42 @@
 #include "UIToolBar.h"
 #include "VBoxUtils.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 /* COM includes: */
@@ -755 +755 @@
                     if (device == KDeviceType_Null)
                         continue;
-                    bootOrder << gCOMenum->toString(device);
+                    bootOrder << gpConverter->toString(device);
                 }
                 if (bootOrder.isEmpty())
-                    bootOrder << gCOMenum->toString(KDeviceType_Null);
+                    bootOrder << gpConverter->toString(KDeviceType_Null);
 
                 item += sSectionItemTpl2.arg(tr("Boot Order", "details report"), bootOrder.join(", "));
@@ -929 +929 @@
                                                 QString(sSectionItemTpl2)
                                                 .arg(QString("&nbsp;&nbsp;") +
-                                                     vboxGlobal().toString(StorageSlot(controller.GetBus(),
+                                                     gpConverter->toString(StorageSlot(controller.GetBus(),
                                                                                        attachment.GetPort(),
                                                                                        attachment.GetDevice())) +
@@ -981 +981 @@
             if (audio.GetEnabled())
                 item = QString(sSectionItemTpl2).arg(tr("Host Driver", "details report (audio)"),
-                                                     gCOMenum->toString(audio.GetAudioDriver())) +
+                                                     gpConverter->toString(audio.GetAudioDriver())) +
                        QString(sSectionItemTpl2).arg(tr("Controller", "details report (audio)"),
-                                                     gCOMenum->toString(audio.GetAudioController()));
+                                                     gpConverter->toString(audio.GetAudioController()));
             else
                 item = QString(sSectionItemTpl1).arg(tr("Disabled", "details report (audio)"));
@@ -1020 +1020 @@
                 {
                     KNetworkAttachmentType type = adapter.GetAttachmentType();
-                    QString attType = gCOMenum->toString(adapter.GetAdapterType())
+                    QString attType = gpConverter->toString(adapter.GetAdapterType())
                                       .replace(QRegExp("\\s\\(.+\\)"), " (%1)");
                     /* Don't use the adapter type string for types that have
@@ -1040 +1040 @@
                     }
                     else
-                        attType = attType.arg(gCOMenum->toString(type));
+                        attType = attType.arg(gpConverter->toString(type));
 
                     item += QString(sSectionItemTpl2).arg(tr("Adapter %1", "details report (network)").arg(adapter.GetSlot() + 1))
@@ -1084 +1084 @@
                     QString data = vboxGlobal().toCOMPortName(port.GetIRQ(), port.GetIOBase()) + ", ";
                     if (mode == KPortMode_HostPipe || mode == KPortMode_HostDevice || mode == KPortMode_RawFile)
-                        data += QString("%1 (<nobr>%2</nobr>)").arg(gCOMenum->toString(mode)).arg(QDir::toNativeSeparators(port.GetPath()));
+                        data += QString("%1 (<nobr>%2</nobr>)").arg(gpConverter->toString(mode)).arg(QDir::toNativeSeparators(port.GetPath()));
                     else
-                        data += gCOMenum->toString(mode);
+                        data += gpConverter->toString(mode);
 
                     item += QString(sSectionItemTpl2).arg(tr("Port %1", "details report (serial ports)").arg(port.GetSlot() + 1))

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp

@@ -29 +29 @@
 #include "UIVMItem.h"
 #include "VBoxGlobal.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 #ifdef Q_WS_MAC
 # include <ApplicationServices/ApplicationServices.h>
@@ -161 +161 @@
 QString UIVMItem::machineStateName() const
 {
-    return m_fAccessible ? gCOMenum->toString(m_machineState) :
+    return m_fAccessible ? gpConverter->toString(m_machineState) :
            QApplication::translate("UIVMListView", "Inaccessible");
 }
@@ -167 +167 @@
 QIcon UIVMItem::machineStateIcon() const
 {
-    return m_fAccessible ? gCOMenum->toIcon(m_machineState) :
+    return m_fAccessible ? gpConverter->toPixmap(m_machineState) :
                            QPixmap(":/state_aborted_16px.png");
 }
@@ -173 +173 @@
 QString UIVMItem::sessionStateName() const
 {
-    return m_fAccessible ? gCOMenum->toString(m_sessionState) :
+    return m_fAccessible ? gpConverter->toString(m_sessionState) :
            QApplication::translate("UIVMListView", "Inaccessible");
 }
@@ -196 +196 @@
             "VM tooltip (name, last state change, session state)")
             .arg(toolTip)
-            .arg(gCOMenum->toString(m_machineState))
+            .arg(gpConverter->toString(m_machineState))
             .arg(dateTime)
-            .arg(gCOMenum->toString(m_sessionState));
+            .arg(gpConverter->toString(m_sessionState));
     }
     else

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp

@@ -39 +39 @@
 #include "UIVirtualBoxEventHandler.h"
 #include "UISelectorShortcuts.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 /* COM includes: */
@@ -190 +190 @@
             return;
 
-        setIcon (0, gCOMenum->toIcon (aState));
+        setIcon (0, gpConverter->toPixmap (aState));
         mMachineState = aState;
         mTimestamp.setTime_t (mMachine.GetLastStateChange() / 1000);
@@ -277 +277 @@
         {
             dateTime = VBoxSnapshotsWgt::tr ("%1 since %2", "Current State (time or date + time)")
-                .arg (gCOMenum->toString (mMachineState)).arg (dateTime);
+                .arg (gpConverter->toString (mMachineState)).arg (dateTime);
         }
 

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

@@ -20 +20 @@
 /* GUI includes: */
 #include "UIMachineSettingsAudio.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 /* COM includes: */
@@ -72 +72 @@
     /* Load audio data to page: */
     mGbAudio->setChecked(audioData.m_fAudioEnabled);
-    mCbAudioDriver->setCurrentIndex(mCbAudioDriver->findText(gCOMenum->toString(audioData.m_audioDriverType)));
-    mCbAudioController->setCurrentIndex(mCbAudioController->findText(gCOMenum->toString(audioData.m_audioControllerType)));
+    mCbAudioDriver->setCurrentIndex(mCbAudioDriver->findText(gpConverter->toString(audioData.m_audioDriverType)));
+    mCbAudioController->setCurrentIndex(mCbAudioController->findText(gpConverter->toString(audioData.m_audioControllerType)));
 
     /* Polish page finally: */
@@ -88 +88 @@
     /* Gather audio data: */
     audioData.m_fAudioEnabled = mGbAudio->isChecked();
-    audioData.m_audioDriverType = gCOMenum->toAudioDriverType(mCbAudioDriver->currentText());
-    audioData.m_audioControllerType = gCOMenum->toAudioControllerType(mCbAudioController->currentText());
+    audioData.m_audioDriverType = gpConverter->fromString<KAudioDriverType>(mCbAudioDriver->currentText());
+    audioData.m_audioControllerType = gpConverter->fromString<KAudioControllerType>(mCbAudioController->currentText());
 
     /* Cache audio data: */
@@ -148 +148 @@
     mCbAudioDriver->clear();
     /* Refill them */
-    mCbAudioDriver->addItem (gCOMenum->toString (KAudioDriverType_Null));
+    mCbAudioDriver->addItem (gpConverter->toString (KAudioDriverType_Null));
 #if defined Q_WS_WIN32
-    mCbAudioDriver->addItem (gCOMenum->toString (KAudioDriverType_DirectSound));
+    mCbAudioDriver->addItem (gpConverter->toString (KAudioDriverType_DirectSound));
 # ifdef VBOX_WITH_WINMM
-    mCbAudioDriver->addItem (gCOMenum->toString (KAudioDriverType_WinMM));
+    mCbAudioDriver->addItem (gpConverter->toString (KAudioDriverType_WinMM));
 # endif
 #endif
 #if defined Q_OS_SOLARIS
-    mCbAudioDriver->addItem (gCOMenum->toString (KAudioDriverType_SolAudio));
+    mCbAudioDriver->addItem (gpConverter->toString (KAudioDriverType_SolAudio));
 # if defined VBOX_WITH_SOLARIS_OSS
-    mCbAudioDriver->addItem (gCOMenum->toString (KAudioDriverType_OSS));
+    mCbAudioDriver->addItem (gpConverter->toString (KAudioDriverType_OSS));
 #endif
 #endif
 #if defined Q_OS_LINUX || defined Q_OS_FREEBSD
-    mCbAudioDriver->addItem (gCOMenum->toString (KAudioDriverType_OSS));
+    mCbAudioDriver->addItem (gpConverter->toString (KAudioDriverType_OSS));
 # ifdef VBOX_WITH_PULSE
-    mCbAudioDriver->addItem (gCOMenum->toString (KAudioDriverType_Pulse));
+    mCbAudioDriver->addItem (gpConverter->toString (KAudioDriverType_Pulse));
 # endif
 #endif
 #if defined Q_OS_LINUX
 # ifdef VBOX_WITH_ALSA
-    mCbAudioDriver->addItem (gCOMenum->toString (KAudioDriverType_ALSA));
+    mCbAudioDriver->addItem (gpConverter->toString (KAudioDriverType_ALSA));
 # endif
 #endif
 #if defined Q_OS_MACX
-    mCbAudioDriver->addItem (gCOMenum->toString (KAudioDriverType_CoreAudio));
+    mCbAudioDriver->addItem (gpConverter->toString (KAudioDriverType_CoreAudio));
 #endif
     /* Set the old value */
@@ -184 +184 @@
     /* Refill them */
     mCbAudioController->insertItem (mCbAudioController->count(),
-        gCOMenum->toString (KAudioControllerType_HDA));
+        gpConverter->toString (KAudioControllerType_HDA));
     mCbAudioController->insertItem (mCbAudioController->count(),
-        gCOMenum->toString (KAudioControllerType_AC97));
+        gpConverter->toString (KAudioControllerType_AC97));
     mCbAudioController->insertItem (mCbAudioController->count(),
-        gCOMenum->toString (KAudioControllerType_SB16));
+        gpConverter->toString (KAudioControllerType_SB16));
     /* Set the old value */
     mCbAudioController->setCurrentIndex (currentController);

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

@@ -26 +26 @@
 #include "VBoxGlobal.h"
 #include "UIMessageCenter.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 /* COM includes: */
@@ -222 +222 @@
         mCbVRDE->setChecked(displayData.m_fVRDEServerEnabled);
         mLeVRDEPort->setText(displayData.m_strVRDEPort);
-        mCbVRDEMethod->setCurrentIndex(mCbVRDEMethod->findText(gCOMenum->toString(displayData.m_VRDEAuthType)));
+        mCbVRDEMethod->setCurrentIndex(mCbVRDEMethod->findText(gpConverter->toString(displayData.m_VRDEAuthType)));
         mLeVRDETimeout->setText(QString::number(displayData.m_uVRDETimeout));
         mCbMultipleConn->setChecked(displayData.m_fMultipleConnectionsAllowed);
@@ -253 +253 @@
         displayData.m_fVRDEServerEnabled = mCbVRDE->isChecked();
         displayData.m_strVRDEPort = mLeVRDEPort->text();
-        displayData.m_VRDEAuthType = gCOMenum->toAuthType(mCbVRDEMethod->currentText());
+        displayData.m_VRDEAuthType = gpConverter->fromString<KAuthType>(mCbVRDEMethod->currentText());
         displayData.m_uVRDETimeout = mLeVRDETimeout->text().toULong();
         displayData.m_fMultipleConnectionsAllowed = mCbMultipleConn->isChecked();
@@ -436 +436 @@
 
     mCbVRDEMethod->setItemText (0,
-        gCOMenum->toString (KAuthType_Null));
+        gpConverter->toString (KAuthType_Null));
     mCbVRDEMethod->setItemText (1,
-        gCOMenum->toString (KAuthType_External));
+        gpConverter->toString (KAuthType_External));
     mCbVRDEMethod->setItemText (2,
-        gCOMenum->toString (KAuthType_Guest));
+        gpConverter->toString (KAuthType_Guest));
 }
 

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

@@ -26 +26 @@
 #include "UIMessageCenter.h"
 #include "QIWidgetValidator.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 UIMachineSettingsGeneral::UIMachineSettingsGeneral()
@@ -241 +241 @@
 
     /* Shared Clipboard mode */
-    mCbClipboard->setItemText (0, gCOMenum->toString (KClipboardMode_Disabled));
-    mCbClipboard->setItemText (1, gCOMenum->toString (KClipboardMode_HostToGuest));
-    mCbClipboard->setItemText (2, gCOMenum->toString (KClipboardMode_GuestToHost));
-    mCbClipboard->setItemText (3, gCOMenum->toString (KClipboardMode_Bidirectional));
+    mCbClipboard->setItemText (0, gpConverter->toString (KClipboardMode_Disabled));
+    mCbClipboard->setItemText (1, gpConverter->toString (KClipboardMode_HostToGuest));
+    mCbClipboard->setItemText (2, gpConverter->toString (KClipboardMode_GuestToHost));
+    mCbClipboard->setItemText (3, gpConverter->toString (KClipboardMode_Bidirectional));
 }
 

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

@@ -24 +24 @@
 #include "QITabWidget.h"
 #include "VBoxGlobal.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 /* COM includes: */
@@ -509 +509 @@
         /* Populate attachments: */
         int iAttachmentTypeIndex = 0;
-        m_pAttachmentTypeComboBox->insertItem(iAttachmentTypeIndex, gCOMenum->toString(KNetworkAttachmentType_Null));
+        m_pAttachmentTypeComboBox->insertItem(iAttachmentTypeIndex, gpConverter->toString(KNetworkAttachmentType_Null));
         m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, KNetworkAttachmentType_Null);
         m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, m_pAttachmentTypeComboBox->itemText(iAttachmentTypeIndex), Qt::ToolTipRole);
         ++iAttachmentTypeIndex;
-        m_pAttachmentTypeComboBox->insertItem(iAttachmentTypeIndex, gCOMenum->toString(KNetworkAttachmentType_NAT));
+        m_pAttachmentTypeComboBox->insertItem(iAttachmentTypeIndex, gpConverter->toString(KNetworkAttachmentType_NAT));
         m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, KNetworkAttachmentType_NAT);
         m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, m_pAttachmentTypeComboBox->itemText(iAttachmentTypeIndex), Qt::ToolTipRole);
         ++iAttachmentTypeIndex;
-        m_pAttachmentTypeComboBox->insertItem(iAttachmentTypeIndex, gCOMenum->toString(KNetworkAttachmentType_Bridged));
+        m_pAttachmentTypeComboBox->insertItem(iAttachmentTypeIndex, gpConverter->toString(KNetworkAttachmentType_Bridged));
         m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, KNetworkAttachmentType_Bridged);
         m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, m_pAttachmentTypeComboBox->itemText(iAttachmentTypeIndex), Qt::ToolTipRole);
         ++iAttachmentTypeIndex;
-        m_pAttachmentTypeComboBox->insertItem(iAttachmentTypeIndex, gCOMenum->toString(KNetworkAttachmentType_Internal));
+        m_pAttachmentTypeComboBox->insertItem(iAttachmentTypeIndex, gpConverter->toString(KNetworkAttachmentType_Internal));
         m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, KNetworkAttachmentType_Internal);
         m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, m_pAttachmentTypeComboBox->itemText(iAttachmentTypeIndex), Qt::ToolTipRole);
         ++iAttachmentTypeIndex;
-        m_pAttachmentTypeComboBox->insertItem(iAttachmentTypeIndex, gCOMenum->toString(KNetworkAttachmentType_HostOnly));
+        m_pAttachmentTypeComboBox->insertItem(iAttachmentTypeIndex, gpConverter->toString(KNetworkAttachmentType_HostOnly));
         m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, KNetworkAttachmentType_HostOnly);
         m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, m_pAttachmentTypeComboBox->itemText(iAttachmentTypeIndex), Qt::ToolTipRole);
         ++iAttachmentTypeIndex;
-        m_pAttachmentTypeComboBox->insertItem(iAttachmentTypeIndex, gCOMenum->toString(KNetworkAttachmentType_Generic));
+        m_pAttachmentTypeComboBox->insertItem(iAttachmentTypeIndex, gpConverter->toString(KNetworkAttachmentType_Generic));
         m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, KNetworkAttachmentType_Generic);
         m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, m_pAttachmentTypeComboBox->itemText(iAttachmentTypeIndex), Qt::ToolTipRole);
@@ -548 +548 @@
         /* Populate adapter types: */
         int iAdapterTypeIndex = 0;
-        m_pAdapterTypeCombo->insertItem(iAdapterTypeIndex, gCOMenum->toString(KNetworkAdapterType_Am79C970A));
+        m_pAdapterTypeCombo->insertItem(iAdapterTypeIndex, gpConverter->toString(KNetworkAdapterType_Am79C970A));
         m_pAdapterTypeCombo->setItemData(iAdapterTypeIndex, KNetworkAdapterType_Am79C970A);
         m_pAdapterTypeCombo->setItemData(iAdapterTypeIndex, m_pAdapterTypeCombo->itemText(iAdapterTypeIndex), Qt::ToolTipRole);
         ++iAdapterTypeIndex;
-        m_pAdapterTypeCombo->insertItem(iAdapterTypeIndex, gCOMenum->toString(KNetworkAdapterType_Am79C973));
+        m_pAdapterTypeCombo->insertItem(iAdapterTypeIndex, gpConverter->toString(KNetworkAdapterType_Am79C973));
         m_pAdapterTypeCombo->setItemData(iAdapterTypeIndex, KNetworkAdapterType_Am79C973);
         m_pAdapterTypeCombo->setItemData(iAdapterTypeIndex, m_pAdapterTypeCombo->itemText(iAdapterTypeIndex), Qt::ToolTipRole);
         ++iAdapterTypeIndex;
 #ifdef VBOX_WITH_E1000
-        m_pAdapterTypeCombo->insertItem(iAdapterTypeIndex, gCOMenum->toString(KNetworkAdapterType_I82540EM));
+        m_pAdapterTypeCombo->insertItem(iAdapterTypeIndex, gpConverter->toString(KNetworkAdapterType_I82540EM));
         m_pAdapterTypeCombo->setItemData(iAdapterTypeIndex, KNetworkAdapterType_I82540EM);
         m_pAdapterTypeCombo->setItemData(iAdapterTypeIndex, m_pAdapterTypeCombo->itemText(iAdapterTypeIndex), Qt::ToolTipRole);
         ++iAdapterTypeIndex;
-        m_pAdapterTypeCombo->insertItem(iAdapterTypeIndex, gCOMenum->toString(KNetworkAdapterType_I82543GC));
+        m_pAdapterTypeCombo->insertItem(iAdapterTypeIndex, gpConverter->toString(KNetworkAdapterType_I82543GC));
         m_pAdapterTypeCombo->setItemData(iAdapterTypeIndex, KNetworkAdapterType_I82543GC);
         m_pAdapterTypeCombo->setItemData(iAdapterTypeIndex, m_pAdapterTypeCombo->itemText(iAdapterTypeIndex), Qt::ToolTipRole);
         ++iAdapterTypeIndex;
-        m_pAdapterTypeCombo->insertItem(iAdapterTypeIndex, gCOMenum->toString(KNetworkAdapterType_I82545EM));
+        m_pAdapterTypeCombo->insertItem(iAdapterTypeIndex, gpConverter->toString(KNetworkAdapterType_I82545EM));
         m_pAdapterTypeCombo->setItemData(iAdapterTypeIndex, KNetworkAdapterType_I82545EM);
         m_pAdapterTypeCombo->setItemData(iAdapterTypeIndex, m_pAdapterTypeCombo->itemText(iAdapterTypeIndex), Qt::ToolTipRole);
@@ -571 +571 @@
 #endif /* VBOX_WITH_E1000 */
 #ifdef VBOX_WITH_VIRTIO
-        m_pAdapterTypeCombo->insertItem(iAdapterTypeIndex, gCOMenum->toString(KNetworkAdapterType_Virtio));
+        m_pAdapterTypeCombo->insertItem(iAdapterTypeIndex, gpConverter->toString(KNetworkAdapterType_Virtio));
         m_pAdapterTypeCombo->setItemData(iAdapterTypeIndex, KNetworkAdapterType_Virtio);
         m_pAdapterTypeCombo->setItemData(iAdapterTypeIndex, m_pAdapterTypeCombo->itemText(iAdapterTypeIndex), Qt::ToolTipRole);
@@ -591 +591 @@
         /* Populate promiscuous modes: */
         int iPromiscuousModeIndex = 0;
-        m_pPromiscuousModeCombo->insertItem(iPromiscuousModeIndex, gCOMenum->toString(KNetworkAdapterPromiscModePolicy_Deny));
+        m_pPromiscuousModeCombo->insertItem(iPromiscuousModeIndex, gpConverter->toString(KNetworkAdapterPromiscModePolicy_Deny));
         m_pPromiscuousModeCombo->setItemData(iPromiscuousModeIndex, KNetworkAdapterPromiscModePolicy_Deny);
         m_pPromiscuousModeCombo->setItemData(iPromiscuousModeIndex, m_pPromiscuousModeCombo->itemText(iPromiscuousModeIndex), Qt::ToolTipRole);
         ++iPromiscuousModeIndex;
-        m_pPromiscuousModeCombo->insertItem(iPromiscuousModeIndex, gCOMenum->toString(KNetworkAdapterPromiscModePolicy_AllowNetwork));
+        m_pPromiscuousModeCombo->insertItem(iPromiscuousModeIndex, gpConverter->toString(KNetworkAdapterPromiscModePolicy_AllowNetwork));
         m_pPromiscuousModeCombo->setItemData(iPromiscuousModeIndex, KNetworkAdapterPromiscModePolicy_AllowNetwork);
         m_pPromiscuousModeCombo->setItemData(iPromiscuousModeIndex, m_pPromiscuousModeCombo->itemText(iPromiscuousModeIndex), Qt::ToolTipRole);
         ++iPromiscuousModeIndex;
-        m_pPromiscuousModeCombo->insertItem(iPromiscuousModeIndex, gCOMenum->toString(KNetworkAdapterPromiscModePolicy_AllowAll));
+        m_pPromiscuousModeCombo->insertItem(iPromiscuousModeIndex, gpConverter->toString(KNetworkAdapterPromiscModePolicy_AllowAll));
         m_pPromiscuousModeCombo->setItemData(iPromiscuousModeIndex, KNetworkAdapterPromiscModePolicy_AllowAll);
         m_pPromiscuousModeCombo->setItemData(iPromiscuousModeIndex, m_pPromiscuousModeCombo->itemText(iPromiscuousModeIndex), Qt::ToolTipRole);

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

@@ -38 +38 @@
 #include "QIDialogButtonBox.h"
 #include "UIIconPool.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 /* Other VBox includes: */
@@ -111 +111 @@
     ProtocolEditor(QWidget *pParent = 0) : QComboBox(pParent)
     {
-        addItem(gCOMenum->toString(KNATProtocol_UDP), QVariant::fromValue(KNATProtocol_UDP));
-        addItem(gCOMenum->toString(KNATProtocol_TCP), QVariant::fromValue(KNATProtocol_TCP));
+        addItem(gpConverter->toString(KNATProtocol_UDP), QVariant::fromValue(KNATProtocol_UDP));
+        addItem(gpConverter->toString(KNATProtocol_TCP), QVariant::fromValue(KNATProtocol_TCP));
     }
 
@@ -284 +284 @@
                 {
                     case UIPortForwardingDataType_Name: return m_dataList[index.row()].name;
-                    case UIPortForwardingDataType_Protocol: return gCOMenum->toString(m_dataList[index.row()].protocol);
+                    case UIPortForwardingDataType_Protocol: return gpConverter->toString(m_dataList[index.row()].protocol);
                     case UIPortForwardingDataType_HostIp: return m_dataList[index.row()].hostIp;
                     case UIPortForwardingDataType_HostPort: return m_dataList[index.row()].hostPort.value();

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

@@ -26 +26 @@
 #include "VBoxGlobal.h"
 #include "QITabWidget.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 /* COM includes: */
@@ -76 +76 @@
     ulong uIRQ, uIOBase;
     bool fStd = vboxGlobal().toCOMPortNumbers(mCbNumber->currentText(), uIRQ, uIOBase);
-    KPortMode mode = gCOMenum->toPortMode(mCbMode->currentText());
+    KPortMode mode = gpConverter->fromString<KPortMode>(mCbMode->currentText());
 
     mGbSerial->setEnabled(m_pParent->isMachineOffline());
@@ -105 +105 @@
     mLeIRQ->setText(QString::number(portData.m_uIRQ));
     mLeIOPort->setText("0x" + QString::number(portData.m_uIOBase, 16).toUpper());
-    mCbMode->setCurrentIndex(mCbMode->findText(gCOMenum->toString(portData.m_hostMode)));
+    mCbMode->setCurrentIndex(mCbMode->findText(gpConverter->toString(portData.m_hostMode)));
     mCbPipe->setChecked(portData.m_fServer);
     mLePath->setText(portData.m_strPath);
@@ -123 +123 @@
     portData.m_uIOBase = mLeIOPort->text().toULong (NULL, 0);
     portData.m_fServer = mCbPipe->isChecked();
-    portData.m_hostMode = gCOMenum->toPortMode(mCbMode->currentText());
+    portData.m_hostMode = gpConverter->fromString<KPortMode>(mCbMode->currentText());
     portData.m_strPath = QDir::toNativeSeparators(mLePath->text());
 
@@ -173 +173 @@
     mCbNumber->setItemText (mCbNumber->count() - 1, vboxGlobal().toCOMPortName (0, 0));
 
-    mCbMode->setItemText (3, gCOMenum->toString (KPortMode_RawFile));
-    mCbMode->setItemText (2, gCOMenum->toString (KPortMode_HostDevice));
-    mCbMode->setItemText (1, gCOMenum->toString (KPortMode_HostPipe));
-    mCbMode->setItemText (0, gCOMenum->toString (KPortMode_Disconnected));
+    mCbMode->setItemText (3, gpConverter->toString (KPortMode_RawFile));
+    mCbMode->setItemText (2, gpConverter->toString (KPortMode_HostDevice));
+    mCbMode->setItemText (1, gpConverter->toString (KPortMode_HostPipe));
+    mCbMode->setItemText (0, gpConverter->toString (KPortMode_Disconnected));
 }
 
@@ -206 +206 @@
 void UIMachineSettingsSerial::mCbModeActivated (const QString &aText)
 {
-    KPortMode mode = gCOMenum->toPortMode (aText);
+    KPortMode mode = gpConverter->fromString<KPortMode> (aText);
     mCbPipe->setEnabled (mode == KPortMode_HostPipe);
     mLePath->setEnabled (mode != KPortMode_Disconnected);
@@ -409 +409 @@
         /* Check the port path emptiness & unicity */
         KPortMode mode =
-            gCOMenum->toPortMode (page->mCbMode->currentText());
+            gpConverter->fromString<KPortMode> (page->mCbMode->currentText());
         if (mode != KPortMode_Disconnected)
         {

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

@@ -36 +36 @@
 #include "UIMessageCenter.h"
 #include "UIMachineSettingsStorage.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 /* COM includes: */
@@ -550 +550 @@
                                  "<nobr>Type:&nbsp;&nbsp;%3</nobr>")
                                  .arg (mCtrName)
-                                 .arg (gCOMenum->toString (mCtrType->busType()))
-                                 .arg (gCOMenum->toString (mCtrType->ctrType()));
+                                 .arg (gpConverter->toString (mCtrType->busType()))
+                                 .arg (gpConverter->toString (mCtrType->ctrType()));
 }
 
@@ -2126 +2126 @@
             KDeviceType attDevice = mStorageModel->data (attIndex, StorageModel::R_AttDevice).value <KDeviceType>();
             QString key (mStorageModel->data (attIndex, StorageModel::R_AttMediumId).toString());
-            QString value (QString ("%1 (%2)").arg (ctrName, vboxGlobal().toString (attSlot)));
+            QString value (QString ("%1 (%2)").arg (ctrName, gpConverter->toString (attSlot)));
             /* Check for emptiness */
             if (vboxGlobal().findMedium (key).isNull() && attDevice == KDeviceType_HardDisk)
@@ -2153 +2153 @@
         {
             QString strExcessiveRecord = QString("%1 (%2)");
-            strExcessiveRecord = strExcessiveRecord.arg(QString("<b>%1</b>").arg(gCOMenum->toString((KStorageBus)iStorageBusType)));
+            strExcessiveRecord = strExcessiveRecord.arg(QString("<b>%1</b>").arg(gpConverter->toString((KStorageBus)iStorageBusType)));
             strExcessiveRecord = strExcessiveRecord.arg(maximumType[(KStorageBus)iStorageBusType] == 1 ?
                                                         tr("at most one supported", "controller") :
@@ -2165 +2165 @@
                         "Please change the chipset type on the System settings page or reduce the number "
                         "of the following storage controllers on the Storage settings page: %2.")
-                        .arg(gCOMenum->toString(mStorageModel->chipsetType()))
+                        .arg(gpConverter->toString(mStorageModel->chipsetType()))
                         .arg(excessiveList.join(", "));
         return false;
@@ -2431 +2431 @@
                 ControllerTypeList controllerTypeList (mStorageModel->data (index, StorageModel::R_CtrTypes).value <ControllerTypeList>());
                 for (int i = 0; i < controllerTypeList.size(); ++ i)
-                    mCbType->insertItem (mCbType->count(), gCOMenum->toString (controllerTypeList [i]));
+                    mCbType->insertItem (mCbType->count(), gpConverter->toString (controllerTypeList [i]));
                 KStorageControllerType type = mStorageModel->data (index, StorageModel::R_CtrType).value <KStorageControllerType>();
-                int ctrPos = mCbType->findText (gCOMenum->toString (type));
+                int ctrPos = mCbType->findText (gpConverter->toString (type));
                 mCbType->setCurrentIndex (ctrPos == -1 ? 0 : ctrPos);
 
@@ -2455 +2455 @@
                 SlotsList slotsList (mStorageModel->data (index, StorageModel::R_AttSlots).value <SlotsList>());
                 for (int i = 0; i < slotsList.size(); ++ i)
-                    mCbSlot->insertItem (mCbSlot->count(), vboxGlobal().toString (slotsList [i]));
+                    mCbSlot->insertItem (mCbSlot->count(), gpConverter->toString (slotsList [i]));
                 StorageSlot slt = mStorageModel->data (index, StorageModel::R_AttSlot).value <StorageSlot>();
-                int attSlotPos = mCbSlot->findText (vboxGlobal().toString (slt));
+                int attSlotPos = mCbSlot->findText (gpConverter->toString (slt));
                 mCbSlot->setCurrentIndex (attSlotPos == -1 ? 0 : attSlotPos);
                 mCbSlot->setToolTip (mCbSlot->itemText (mCbSlot->currentIndex()));
@@ -2551 +2551 @@
             /* Setting Controller Sub-Type */
             else if (sdr == mCbType)
-                mStorageModel->setData (index, QVariant::fromValue (gCOMenum->toControllerType (mCbType->currentText())),
+                mStorageModel->setData (index, QVariant::fromValue (gpConverter->fromString<KStorageControllerType> (mCbType->currentText())),
                                         StorageModel::R_CtrType);
             else if (sdr == mSbPortCount)
@@ -2565 +2565 @@
             {
                 QModelIndex controllerIndex = mStorageModel->parent(index);
-                StorageSlot attachmentStorageSlot = vboxGlobal().toStorageSlot(mCbSlot->currentText());
+                StorageSlot attachmentStorageSlot = gpConverter->fromString<StorageSlot>(mCbSlot->currentText());
                 mStorageModel->setData(index, QVariant::fromValue(attachmentStorageSlot), StorageModel::R_AttSlot);
                 QModelIndex theSameIndexAtNewPosition = mStorageModel->attachmentBySlot(controllerIndex, attachmentStorageSlot);

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

@@ -26 +26 @@
 #include "VBoxGlobal.h"
 #include "UIMachineSettingsSystem.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 /* COM includes: */
@@ -163 +163 @@
 
     /* Populate chipset combo: */
-    mCbChipset->insertItem(0, gCOMenum->toString(KChipsetType_PIIX3), QVariant(KChipsetType_PIIX3));
-    mCbChipset->insertItem(1, gCOMenum->toString(KChipsetType_ICH9), QVariant(KChipsetType_ICH9));
+    mCbChipset->insertItem(0, gpConverter->toString(KChipsetType_PIIX3), QVariant(KChipsetType_PIIX3));
+    mCbChipset->insertItem(1, gpConverter->toString(KChipsetType_ICH9), QVariant(KChipsetType_ICH9));
 
     /* Install global event filter */

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

@@ -31 +31 @@
 #include "UIMachineSettingsUSB.h"
 #include "UIMachineSettingsUSBFilterDetails.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 /* COM includes: */
@@ -821 +821 @@
             case UISettingsPageType_Global:
             {
-                usbFilterData.m_action = gCOMenum->toUSBDevFilterAction(dlgFilterDetails.mCbAction->currentText());
+                usbFilterData.m_action = gpConverter->fromString<KUSBDeviceFilterAction>(dlgFilterDetails.mCbAction->currentText());
                 break;
             }
@@ -1020 +1020 @@
     {
         strToolTip += strToolTip.isEmpty() ? "":"<br/>" + tr("<nobr>State: %1</nobr>", "USB filter tooltip")
-                                                          .arg(gCOMenum->toString(usbFilterData.m_hostUSBDeviceState));
+                                                          .arg(gpConverter->toString(usbFilterData.m_hostUSBDeviceState));
     }
 

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

@@ -20 +20 @@
 /* GUI includes: */
 #include "UIMachineSettingsUSBFilterDetails.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 UIMachineSettingsUSBFilterDetails::UIMachineSettingsUSBFilterDetails(UISettingsPageType type, QWidget *pParent /* = 0 */)
@@ -63 +63 @@
 
     mCbAction->setItemText (0,
-        gCOMenum->toString (KUSBDeviceFilterAction_Ignore));
+        gpConverter->toString (KUSBDeviceFilterAction_Ignore));
     mCbAction->setItemText (1,
-        gCOMenum->toString (KUSBDeviceFilterAction_Hold));
+        gpConverter->toString (KUSBDeviceFilterAction_Hold));
 }
 

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

@@ -33 +33 @@
 #include "VBoxOSTypeSelectorButton.h"
 #include "UILineTextEdit.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 /* COM includes: */
@@ -239 +239 @@
                     case KVirtualSystemDescriptionType_OS:             v = vboxGlobal().vmGuestOSTypeDescription(m_strConfigValue); break;
                     case KVirtualSystemDescriptionType_Memory:         v = m_strConfigValue + " " + VBoxGlobal::tr("MB", "size suffix MBytes=1024 KBytes"); break;
-                    case KVirtualSystemDescriptionType_SoundCard:      v = gCOMenum->toString(static_cast<KAudioControllerType>(m_strConfigValue.toInt())); break;
-                    case KVirtualSystemDescriptionType_NetworkAdapter: v = gCOMenum->toString(static_cast<KNetworkAdapterType>(m_strConfigValue.toInt())); break;
+                    case KVirtualSystemDescriptionType_SoundCard:      v = gpConverter->toString(static_cast<KAudioControllerType>(m_strConfigValue.toInt())); break;
+                    case KVirtualSystemDescriptionType_NetworkAdapter: v = gpConverter->toString(static_cast<KNetworkAdapterType>(m_strConfigValue.toInt())); break;
                     default:                                           v = m_strConfigValue; break;
                 }
@@ -436 +436 @@
             {
                 QComboBox *e = new QComboBox(pParent);
-                e->addItem(gCOMenum->toString(KAudioControllerType_AC97), KAudioControllerType_AC97);
-                e->addItem(gCOMenum->toString(KAudioControllerType_SB16), KAudioControllerType_SB16);
-                e->addItem(gCOMenum->toString(KAudioControllerType_HDA),  KAudioControllerType_HDA);
+                e->addItem(gpConverter->toString(KAudioControllerType_AC97), KAudioControllerType_AC97);
+                e->addItem(gpConverter->toString(KAudioControllerType_SB16), KAudioControllerType_SB16);
+                e->addItem(gpConverter->toString(KAudioControllerType_HDA),  KAudioControllerType_HDA);
                 editor = e;
                 break;
@@ -445 +445 @@
             {
                 QComboBox *e = new QComboBox(pParent);
-                e->addItem(gCOMenum->toString(KNetworkAdapterType_Am79C970A), KNetworkAdapterType_Am79C970A);
-                e->addItem(gCOMenum->toString(KNetworkAdapterType_Am79C973), KNetworkAdapterType_Am79C973);
+                e->addItem(gpConverter->toString(KNetworkAdapterType_Am79C970A), KNetworkAdapterType_Am79C970A);
+                e->addItem(gpConverter->toString(KNetworkAdapterType_Am79C973), KNetworkAdapterType_Am79C973);
 #ifdef VBOX_WITH_E1000
-                e->addItem(gCOMenum->toString(KNetworkAdapterType_I82540EM), KNetworkAdapterType_I82540EM);
-                e->addItem(gCOMenum->toString(KNetworkAdapterType_I82543GC), KNetworkAdapterType_I82543GC);
-                e->addItem(gCOMenum->toString(KNetworkAdapterType_I82545EM), KNetworkAdapterType_I82545EM);
+                e->addItem(gpConverter->toString(KNetworkAdapterType_I82540EM), KNetworkAdapterType_I82540EM);
+                e->addItem(gpConverter->toString(KNetworkAdapterType_I82543GC), KNetworkAdapterType_I82543GC);
+                e->addItem(gpConverter->toString(KNetworkAdapterType_I82545EM), KNetworkAdapterType_I82545EM);
 #endif /* VBOX_WITH_E1000 */
 #ifdef VBOX_WITH_VIRTIO
-                e->addItem(gCOMenum->toString(KNetworkAdapterType_Virtio), KNetworkAdapterType_Virtio);
+                e->addItem(gpConverter->toString(KNetworkAdapterType_Virtio), KNetworkAdapterType_Virtio);
 #endif /* VBOX_WITH_VIRTIO */
                 editor = e;
@@ -461 +461 @@
             {
                 QComboBox *e = new QComboBox(pParent);
-                e->addItem(gCOMenum->toString(KStorageControllerType_PIIX3), "PIIX3");
-                e->addItem(gCOMenum->toString(KStorageControllerType_PIIX4), "PIIX4");
-                e->addItem(gCOMenum->toString(KStorageControllerType_ICH6),  "ICH6");
+                e->addItem(gpConverter->toString(KStorageControllerType_PIIX3), "PIIX3");
+                e->addItem(gpConverter->toString(KStorageControllerType_PIIX4), "PIIX4");
+                e->addItem(gpConverter->toString(KStorageControllerType_ICH6),  "ICH6");
                 editor = e;
                 break;

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

@@ -23 +23 @@
 /* Local includes */
 #include "UIBootTable.h"
-#include "COMEnumsWrapper.h"
+#include "UIConverter.h"
 
 UIBootTableItem::UIBootTableItem(KDeviceType type)
@@ -62 +62 @@
 void UIBootTableItem::retranslateUi()
 {
-    setText(gCOMenum->toString(m_type));
+    setText(gpConverter->toString(m_type));
 }