VirtualBox

Changeset 49553 in vbox for trunk


Ignore:
Timestamp:
Nov 19, 2013 3:15:13 PM (11 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
90743
Message:

FE/Qt: Medium enumeration mechanism: Cleanup.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
10 edited

Legend:

Unmodified
Added
Removed

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

    r49465 r49553  
    17201720    if (m_pMediumEnumerator)
    17211721        m_pMediumEnumerator->createMedium(medium);
    1722 }
    1723 
    1724 void VBoxGlobal::updateMedium(const UIMedium &medium)
    1725 {
    1726     /* Update medium of medium-enumerator: */
    1727     QReadLocker cleanupRacePreventor(&m_mediumEnumeratorDtorRwLock);
    1728     if (m_pMediumEnumerator)
    1729         m_pMediumEnumerator->updateMedium(medium);
    17301722}
    17311723
    … …  
    43594351        connect(m_pMediumEnumerator, SIGNAL(sigMediumCreated(const QString&)),
    43604352                this, SIGNAL(sigMediumCreated(const QString&)));
    4361         connect(m_pMediumEnumerator, SIGNAL(sigMediumUpdated(const QString&)),
    4362                 this, SIGNAL(sigMediumUpdated(const QString&)));
    43634353        connect(m_pMediumEnumerator, SIGNAL(sigMediumDeleted(const QString&)),
    43644354                this, SIGNAL(sigMediumDeleted(const QString&)));

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

    r49465 r49553  
    252252    /* API: Medium-processing stuff: */
    253253    void createMedium(const UIMedium &medium);
    254     void updateMedium(const UIMedium &medium);
    255254    void deleteMedium(const QString &strMediumID);
    256255    QString openMediumWithFileOpenDialog(UIMediumType mediumType, QWidget *pParent = 0,
    … …  
    381380    /* Notifiers: Medium-processing stuff: */
    382381    void sigMediumCreated(const QString &strMediumID);
    383     void sigMediumUpdated(const QString &strMediumID);
    384382    void sigMediumDeleted(const QString &strMediumID);
    385383

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

    r48906 r49553  
    118118    /* Notify listener: */
    119119    emit sigMediumCreated(strMediumID);
    120 }
    121 
    122 void UIMediumEnumerator::updateMedium(const UIMedium &medium)
    123 {
    124     /* Get medium ID: */
    125     QString strMediumID = medium.id();
    126     LogRelFlow(("UIMediumEnumerator: Medium with ID={%s} updated.\n", strMediumID.toAscii().constData()));
    127 
    128     /* Make sure medium still exists: */
    129     AssertReturnVoid(m_mediums.contains(strMediumID));
    130 
    131     /* Update medium: */
    132     m_mediums[strMediumID] = medium;
    133 
    134     /* Notify listener: */
    135     emit sigMediumUpdated(strMediumID);
    136120}
    137121

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.h

    r48906 r49553  
    3838    /* Notifiers: Medium-operations stuff: */
    3939    void sigMediumCreated(const QString &strMediumID);
    40     void sigMediumUpdated(const QString &strMediumID);
    4140    void sigMediumDeleted(const QString &strMediumID);
    4241
    … …  
    5655    UIMedium medium(const QString &strMediumID);
    5756    void createMedium(const UIMedium &medium);
    58     void updateMedium(const UIMedium &medium);
    5957    void deleteMedium(const QString &strMediumID);
    6058

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

    r48603 r49553  
    340340}
    341341
    342 void UIMediumManager::sltHandleMediumUpdated(const QString &strMediumID)
    343 {
    344     /* Search for corresponding medium: */
    345     UIMedium medium = vboxGlobal().medium(strMediumID);
    346 
    347     /* Ignore non-interesting mediums: */
    348     if ((medium.isNull()) || (medium.isHostDrive()))
    349         return;
    350 
    351     /* Ignore mediums (and their children) which are
    352      * marked as hidden or attached to hidden machines only: */
    353     if (isMediumAttachedToHiddenMachinesOnly(medium))
    354         return;
    355 
    356     /* Prepare medium-item: */
    357     UIMediumItem *pMediumItem = 0;
    358     switch (medium.type())
    359     {
    360         case UIMediumType_HardDisk: pMediumItem = searchItem(mTwHD, medium.id()); break;
    361         case UIMediumType_DVD:      pMediumItem = searchItem(mTwCD, medium.id()); break;
    362         case UIMediumType_Floppy:   pMediumItem = searchItem(mTwFD, medium.id()); break;
    363         default: AssertFailed();
    364     }
    365     AssertPtrReturnVoid(pMediumItem);
    366 
    367     /* Update medium-item: */
    368     pMediumItem->setMedium(medium);
    369 
    370     /* Update tab-icons: */
    371     updateTabIcons(pMediumItem, ItemAction_Updated);
    372 
    373     /* Update stuff if that was current-item updated: */
    374     if (pMediumItem == currentTreeWidget()->currentItem())
    375         sltHandleCurrentItemChanged(pMediumItem);
    376 }
    377 
    378342void UIMediumManager::sltHandleMediumDeleted(const QString &strMediumID)
    379343{
    … …  
    462426void UIMediumManager::sltHandleMediumEnumerated(const QString &strMediumID)
    463427{
    464     /* Handle medium-update: */
    465     sltHandleMediumUpdated(strMediumID);
     428    /* Search for corresponding medium: */
     429    UIMedium medium = vboxGlobal().medium(strMediumID);
     430
     431    /* Ignore non-interesting mediums: */
     432    if ((medium.isNull()) || (medium.isHostDrive()))
     433        return;
     434
     435    /* Ignore mediums (and their children) which are
     436     * marked as hidden or attached to hidden machines only: */
     437    if (isMediumAttachedToHiddenMachinesOnly(medium))
     438        return;
     439
     440    /* Prepare medium-item: */
     441    UIMediumItem *pMediumItem = 0;
     442    switch (medium.type())
     443    {
     444        case UIMediumType_HardDisk: pMediumItem = searchItem(mTwHD, medium.id()); break;
     445        case UIMediumType_DVD:      pMediumItem = searchItem(mTwCD, medium.id()); break;
     446        case UIMediumType_Floppy:   pMediumItem = searchItem(mTwFD, medium.id()); break;
     447        default: AssertFailed();
     448    }
     449    AssertPtrReturnVoid(pMediumItem);
     450
     451    /* Update medium-item: */
     452    pMediumItem->setMedium(medium);
     453
     454    /* Update tab-icons: */
     455    updateTabIcons(pMediumItem, ItemAction_Updated);
     456
     457    /* Update stuff if that was current-item updated: */
     458    if (pMediumItem == currentTreeWidget()->currentItem())
     459        sltHandleCurrentItemChanged(pMediumItem);
    466460
    467461    /* Advance progress-bar: */
    … …  
    655649        if (!releaseMediumFrom(pMediumItem->medium(), strMachineId))
    656650            break;
    657 
    658     /* Inform others about medium changes: */
    659     vboxGlobal().updateMedium(pMediumItem->medium());
    660651}
    661652
    … …  
    882873    connect(&vboxGlobal(), SIGNAL(sigMediumCreated(const QString&)),
    883874            this, SLOT(sltHandleMediumCreated(const QString&)));
    884     connect(&vboxGlobal(), SIGNAL(sigMediumUpdated(const QString&)),
    885             this, SLOT(sltHandleMediumUpdated(const QString&)));
    886875    connect(&vboxGlobal(), SIGNAL(sigMediumDeleted(const QString&)),
    887876            this, SLOT(sltHandleMediumDeleted(const QString&)));

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

    r48316 r49553  
    6666    /* Handlers: Medium-processing stuff: */
    6767    void sltHandleMediumCreated(const QString &strMediumID);
    68     void sltHandleMediumUpdated(const QString &strMediumID);
    6968    void sltHandleMediumDeleted(const QString &strMediumID);
    7069

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

    r48985 r49553  
    18791879    /* Setup connections: */
    18801880    connect(&vboxGlobal(), SIGNAL(sigMediumEnumerated(const QString&)),
    1881             this, SLOT(sltHandleMediumUpdated(const QString&)));
    1882     connect(&vboxGlobal(), SIGNAL(sigMediumUpdated(const QString&)),
    1883             this, SLOT(sltHandleMediumUpdated(const QString&)));
     1881            this, SLOT(sltHandleMediumEnumerated(const QString&)));
    18841882    connect(&vboxGlobal(), SIGNAL(sigMediumDeleted(const QString&)),
    18851883            this, SLOT(sltHandleMediumDeleted(const QString&)));
    … …  
    23182316}
    23192317
    2320 void UIMachineSettingsStorage::sltHandleMediumUpdated(const QString &strMediumID)
     2318void UIMachineSettingsStorage::sltHandleMediumEnumerated(const QString &strMediumID)
    23212319{
    23222320    /* Search for corresponding medium: */

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

    r48985 r49553  
    699699
    700700    /* Handlers: Medium-processing stuff: */
    701     void sltHandleMediumUpdated(const QString &strMediumID);
     701    void sltHandleMediumEnumerated(const QString &strMediumID);
    702702    void sltHandleMediumDeleted(const QString &strMediumID);
    703703

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.cpp

    r48534 r49553  
    4444    connect(&vboxGlobal(), SIGNAL(sigMediumCreated(const QString&)),
    4545            this, SLOT(sltHandleMediumCreated(const QString&)));
    46     connect(&vboxGlobal(), SIGNAL(sigMediumUpdated(const QString&)),
    47             this, SLOT(sltHandleMediumUpdated(const QString&)));
    4846    connect(&vboxGlobal(), SIGNAL(sigMediumDeleted(const QString&)),
    4947            this, SLOT(sltHandleMediumDeleted(const QString&)));
    … …  
    5351            this, SLOT(sltHandleMediumEnumerationStart()));
    5452    connect(&vboxGlobal(), SIGNAL(sigMediumEnumerated(const QString&)),
    55             this, SLOT(sltHandleMediumUpdated(const QString&)));
     53            this, SLOT(sltHandleMediumEnumerated(const QString&)));
    5654
    5755    /* Setup other connections */
    … …  
    194192}
    195193
    196 void VBoxMediaComboBox::sltHandleMediumUpdated(const QString &strMediumID)
     194void VBoxMediaComboBox::sltHandleMediumEnumerated(const QString &strMediumID)
    197195{
    198196    /* Search for corresponding medium: */

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.h

    r48264 r49553  
    5454    /* Handlers: Medium-processing stuff: */
    5555    void sltHandleMediumCreated(const QString &strMediumID);
    56     void sltHandleMediumUpdated(const QString &strMediumID);
     56    void sltHandleMediumEnumerated(const QString &strMediumID);
    5757    void sltHandleMediumDeleted(const QString &strMediumID);
    5858
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette