Changeset 48259 in vbox

Timestamp:

Sep 4, 2013 10:22:19 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Global: Rename findMedium => medium.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UIMediumTypeChangeDialog.cpp (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (6 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (6 diffs)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (9 diffs)
• wizards/clonevd/UIWizardCloneVDPageBasic1.cpp (modified) (1 diff)
• wizards/firstrun/UIWizardFirstRun.cpp (modified) (1 diff)
• wizards/firstrun/UIWizardFirstRunPageBasic.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVM.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageBasic3.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

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

@@ -44 +44 @@
 
     /* Search for corresponding medium: */
-    m_medium = vboxGlobal().findMedium(strMediumId).medium();
+    m_medium = vboxGlobal().medium(strMediumId).medium();
     m_oldMediumType = m_medium.GetType();
     m_newMediumType = m_oldMediumType;

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

@@ -961 +961 @@
 }
 
-QString VBoxGlobal::details(const CMedium &medium, bool fPredictDiff, bool fUseHtml /*= true*/)
+QString VBoxGlobal::details(const CMedium &cmedium, bool fPredictDiff, bool fUseHtml /*= true*/)
 {
     /* Search for corresponding UI medium: */
     UIMedium uimedium;
-    if (!findMedium(medium, uimedium))
+    if (!medium(cmedium, uimedium))
     {
         /* UI medium may be new and not in medium list, request enumeration: */
@@ -971 +971 @@
 
         /* Search for corresponding UI medium again: */
-        if (!findMedium(medium, uimedium))
+        if (!medium(cmedium, uimedium))
         {
             /* Medium might be deleted already, return null string: */
@@ -1975 +1975 @@
 }
 
-/**
- *  Searches for a VBoxMedum object representing the given COM medium object.
- *
- *  @return true if found and false otherwise.
- */
-bool VBoxGlobal::findMedium (const CMedium &aObj, UIMedium &aMedium) const
-{
-    for (VBoxMediaList::ConstIterator it = m_mediums.begin(); it != m_mediums.end(); ++ it)
-    {
-        if (((*it).medium().isNull() && aObj.isNull()) ||
-            (!(*it).medium().isNull() && !aObj.isNull() && (*it).medium().GetId() == aObj.GetId()))
-        {
-            aMedium = (*it);
+bool VBoxGlobal::medium(const CMedium &cmedium, UIMedium &uimedium) const
+{
+    for (VBoxMediaList::ConstIterator it = m_mediums.begin(); it != m_mediums.end(); ++it)
+    {
+        if (((*it).medium().isNull() && cmedium.isNull()) ||
+            (!(*it).medium().isNull() && !cmedium.isNull() && (*it).medium().GetId() == cmedium.GetId()))
+        {
+            uimedium = (*it);
             return true;
         }
@@ -1994 +1989 @@
 }
 
-/**
- *  Searches for a VBoxMedum object with the given medium id attribute.
- *
- *  @return VBoxMedum if found which is invalid otherwise.
- */
-UIMedium VBoxGlobal::findMedium (const QString &aMediumId) const
-{
-    for (VBoxMediaList::ConstIterator it = m_mediums.begin(); it != m_mediums.end(); ++ it)
-        if ((*it).id() == aMediumId)
+UIMedium VBoxGlobal::medium(const QString &strMediumID) const
+{
+    for (VBoxMediaList::ConstIterator it = m_mediums.begin(); it != m_mediums.end(); ++it)
+        if ((*it).id() == strMediumID)
             return *it;
     return UIMedium();
@@ -2118 +2108 @@
 
     /* Open corresponding medium: */
-    CMedium comMedium = vbox.OpenMedium(strMediumLocation, mediumTypeToGlobal(mediumType), KAccessMode_ReadWrite, false);
+    CMedium cmedium = vbox.OpenMedium(strMediumLocation, mediumTypeToGlobal(mediumType), KAccessMode_ReadWrite, false);
 
     if (vbox.isOk())
     {
         /* Prepare vbox medium wrapper: */
-        UIMedium vboxMedium;
+        UIMedium uimedium;
 
         /* First of all we should test if that medium already opened: */
-        if (!vboxGlobal().findMedium(comMedium, vboxMedium))
+        if (!vboxGlobal().medium(cmedium, uimedium))
         {
             /* And create new otherwise: */
-            vboxMedium = UIMedium(CMedium(comMedium), mediumType, KMediumState_Created);
-            vboxGlobal().addMedium(vboxMedium);
-        }
-
-        /* Return vboxMedium id: */
-        return vboxMedium.id();
+            uimedium = UIMedium(cmedium, mediumType, KMediumState_Created);
+            vboxGlobal().addMedium(uimedium);
+        }
+
+        /* Return uimedium id: */
+        return uimedium.id();
     }
     else
@@ -4977 +4967 @@
     return true;
 }
+

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

@@ -252 +252 @@
     void removeMedium (UIMediumType, const QString &);
 
-    bool findMedium (const CMedium &, UIMedium &) const;
-    UIMedium findMedium (const QString &aMediumId) const;
+    bool medium(const CMedium &cmedium, UIMedium &uimedium) const;
+    UIMedium medium(const QString &strMediumID) const;
 
     QString openMediumWithFileOpenDialog(UIMediumType mediumType, QWidget *pParent = 0,

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

@@ -1599 +1599 @@
     bool fMount = !newId.isEmpty();
 
-    UIMedium vmedium = vboxGlobal().findMedium(newId);
+    UIMedium vmedium = vboxGlobal().medium(newId);
     CMedium medium = vmedium.medium();              // @todo r=dj can this be cached somewhere?
 
@@ -1610 +1610 @@
     {
         /* Ask for force remounting: */
-        if (msgCenter().cannotRemountMedium(machine, vboxGlobal().findMedium(fMount ? newId : currentId),
+        if (msgCenter().cannotRemountMedium(machine, vboxGlobal().medium(fMount ? newId : currentId),
                                             fMount, true /* retry? */, activeMachineWindow()))
         {
@@ -1618 +1618 @@
                 fWasMounted = true;
             else
-                msgCenter().cannotRemountMedium(machine, vboxGlobal().findMedium(fMount ? newId : currentId),
+                msgCenter().cannotRemountMedium(machine, vboxGlobal().medium(fMount ? newId : currentId),
                                                 fMount, false /* retry? */, activeMachineWindow());
         }
@@ -1658 +1658 @@
 
         /* Prepare target medium: */
-        const UIMedium &vboxMedium = fMount ? vboxGlobal().findMedium(strNewId) : UIMedium();
+        const UIMedium &vboxMedium = fMount ? vboxGlobal().medium(strNewId) : UIMedium();
         const CMedium &comMedium = fMount ? vboxMedium.medium() : CMedium();
 
@@ -1671 +1671 @@
         {
             /* Ask for force remounting: */
-            if (msgCenter().cannotRemountMedium(machine, vboxGlobal().findMedium(fMount ? strNewId : strCurrentId),
+            if (msgCenter().cannotRemountMedium(machine, vboxGlobal().medium(fMount ? strNewId : strCurrentId),
                                                 fMount, true /* retry? */, activeMachineWindow()))
             {
@@ -1679 +1679 @@
                     fWasMounted = true;
                 else
-                    msgCenter().cannotRemountMedium(machine, vboxGlobal().findMedium(fMount ? strNewId : strCurrentId),
+                    msgCenter().cannotRemountMedium(machine, vboxGlobal().medium(fMount ? strNewId : strCurrentId),
                                                     fMount, false /* retry? */, activeMachineWindow());
             }

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

@@ -653 +653 @@
 {
     AssertMsg(!aAttMediumId.isEmpty(), ("Medium ID value can't be null/empty!\n"));
-    mAttMediumId = vboxGlobal().findMedium(aAttMediumId).id();
+    mAttMediumId = vboxGlobal().medium(aAttMediumId).id();
     cache();
 }
@@ -704 +704 @@
 void AttachmentItem::cache()
 {
-    UIMedium medium = vboxGlobal().findMedium (mAttMediumId);
+    UIMedium medium = vboxGlobal().medium(mAttMediumId);
 
     /* Cache medium information */
@@ -1961 +1961 @@
                     storageAttachmentData.m_fAttachmentTempEject = attachment.GetTemporaryEject();
                     storageAttachmentData.m_fAttachmentNonRotational = attachment.GetNonRotational();
-                    CMedium comMedium(attachment.GetMedium());
-                    UIMedium vboxMedium;
-                    vboxGlobal().findMedium(comMedium, vboxMedium);
-                    storageAttachmentData.m_strAttachmentMediumId = vboxMedium.id();
+                    CMedium cmedium = attachment.GetMedium();
+                    UIMedium uimedium;
+                    vboxGlobal().medium(cmedium, uimedium);
+                    storageAttachmentData.m_strAttachmentMediumId = uimedium.id();
                 }
 
@@ -2148 +2148 @@
             QString value (QString ("%1 (%2)").arg (ctrName, gpConverter->toString (attSlot)));
             /* Check for emptiness: */
-            if (vboxGlobal().findMedium (key).isNull() && attDevice == KDeviceType_HardDisk)
+            if (vboxGlobal().medium(key).isNull() && attDevice == KDeviceType_HardDisk)
             {
                 message.second << tr("No hard disk is selected for <i>%1</i>.").arg (value);
@@ -2154 +2154 @@
             }
             /* Check for coincidence: */
-            if (!vboxGlobal().findMedium (key).isNull() && config.contains (key))
+            if (!vboxGlobal().medium(key).isNull() && config.contains (key))
             {
                 message.second << tr("<i>%1</i> is using a disk that is already attached to <i>%2</i>.")
@@ -3080 +3080 @@
             int iAnswer = msgCenter().confirmOpticalAttachmentCreation(strControllerName, this);
             if (iAnswer == AlertButton_Choice1)
-                strMediumId = vboxGlobal().findMedium(strMediumId).id();
+                strMediumId = vboxGlobal().medium(strMediumId).id();
             else if (iAnswer == AlertButton_Choice2)
                 strMediumId = vboxGlobal().openMediumWithFileOpenDialog(UIMediumType_DVD, this, strMachineFolder);
@@ -3089 +3089 @@
             int iAnswer = msgCenter().confirmFloppyAttachmentCreation(strControllerName, this);
             if (iAnswer == AlertButton_Choice1)
-                strMediumId = vboxGlobal().findMedium(strMediumId).id();
+                strMediumId = vboxGlobal().medium(strMediumId).id();
             else if (iAnswer == AlertButton_Choice2)
                 strMediumId = vboxGlobal().openMediumWithFileOpenDialog(UIMediumType_Floppy, this, strMachineFolder);
@@ -3495 +3495 @@
         bool fAttachmentNonRotational = attachmentData.m_fAttachmentNonRotational;
         /* Get GUI medium object: */
-        UIMedium vboxMedium = vboxGlobal().findMedium(strAttachmentMediumId);
+        UIMedium vboxMedium = vboxGlobal().medium(strAttachmentMediumId);
         /* Get COM medium object: */
         CMedium comMedium = vboxMedium.medium();
@@ -3579 +3579 @@
         {
             /* Get GUI medium object: */
-            UIMedium vboxMedium = vboxGlobal().findMedium(strAttachmentMediumId);
+            UIMedium vboxMedium = vboxGlobal().medium(strAttachmentMediumId);
             /* Get COM medium object: */
             CMedium comMedium = vboxMedium.medium();

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

@@ -49 +49 @@
 CMedium UIWizardCloneVDPage1::sourceVirtualDisk() const
 {
-    return vboxGlobal().findMedium(m_pSourceDiskSelector->id()).medium();
+    return vboxGlobal().medium(m_pSourceDiskSelector->id()).medium();
 }
 

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

@@ -74 +74 @@
     /* Get chosen 'dvd' medium to mount: */
     QString mediumId = field("id").toString();
-    UIMedium vmedium = vboxGlobal().findMedium(mediumId);
+    UIMedium vmedium = vboxGlobal().medium(mediumId);
     CMedium medium = vmedium.medium(); // @todo r=dj can this be cached somewhere?
     /* Mount medium to the predefined port/device: */

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

@@ -133 +133 @@
 {
     /* Make sure valid medium chosen: */
-    return !vboxGlobal().findMedium(id()).isNull();
+    return !vboxGlobal().medium(id()).isNull();
 }
 

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

@@ -210 +210 @@
             if (!strId.isNull())
             {
-                UIMedium vmedium = vboxGlobal().findMedium(strId);
+                UIMedium vmedium = vboxGlobal().medium(strId);
                 CMedium medium = vmedium.medium();              // @todo r=dj can this be cached somewhere?
                 machine.AttachDevice(strHDName, 0, 0, KDeviceType_HardDisk, medium);

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

@@ -236 +236 @@
     return m_pDiskSkip->isChecked() ||
            !m_pDiskPresent->isChecked() ||
-           !vboxGlobal().findMedium(m_pDiskSelector->id()).isNull();
+           !vboxGlobal().medium(m_pDiskSelector->id()).isNull();
 }
 

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

@@ -251 +251 @@
     return UIWizardPage::isComplete() &&
            (m_pRamSlider->value() >= qMax(1, (int)m_pRamSlider->minRAM()) && m_pRamSlider->value() <= (int)m_pRamSlider->maxRAM()) &&
-           (m_pDiskSkip->isChecked() || !m_pDiskPresent->isChecked() || !vboxGlobal().findMedium(m_pDiskSelector->id()).isNull());
+           (m_pDiskSkip->isChecked() || !m_pDiskPresent->isChecked() || !vboxGlobal().medium(m_pDiskSelector->id()).isNull());
 }