VirtualBox

Changeset 82386 in vbox


Ignore:
Timestamp:
Dec 4, 2019 4:44:44 PM (5 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9390: UIWizardExportApp: Rename MACAddressPolicy => MACAddressExportPolicy; Update all linked function/variable names same way.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp

    r79816 r82386  
    305305        /* Prepare export options: */
    306306        QVector<KExportOptions> options;
    307         switch (field("macAddressPolicy").value<MACAddressPolicy>())
    308         {
    309             case MACAddressPolicy_StripAllNonNATMACs: options.append(KExportOptions_StripAllNonNATMACs); break;
    310             case MACAddressPolicy_StripAllMACs: options.append(KExportOptions_StripAllMACs); break;
     307        switch (field("macAddressExportPolicy").value<MACAddressExportPolicy>())
     308        {
     309            case MACAddressExportPolicy_StripAllNonNATMACs: options.append(KExportOptions_StripAllNonNATMACs); break;
     310            case MACAddressExportPolicy_StripAllMACs: options.append(KExportOptions_StripAllMACs); break;
    311311            default: break;
    312312        }

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp

    r79699 r82386  
    135135
    136136    /* Apply hardcoded policies list: */
    137     for (int i = 0; i < (int)MACAddressPolicy_MAX; ++i)
     137    for (int i = 0; i < (int)MACAddressExportPolicy_MAX; ++i)
    138138    {
    139139        m_pMACComboBox->addItem(QString::number(i));
    … …  
    142142
    143143    /* Set default: */
    144     setMACAddressPolicy(MACAddressPolicy_StripAllNonNATMACs);
     144    setMACAddressExportPolicy(MACAddressExportPolicy_StripAllNonNATMACs);
    145145}
    146146
    … …  
    505505}
    506506
    507 void UIWizardExportAppPage2::updateMACAddressPolicyComboToolTip()
     507void UIWizardExportAppPage2::updateMACAddressExportPolicyComboToolTip()
    508508{
    509509    const int iCurrentIndex = m_pMACComboBox->currentIndex();
    … …  
    575575}
    576576
    577 void UIWizardExportAppPage2::setMACAddressPolicy(MACAddressPolicy enmMACAddressPolicy)
    578 {
    579     const int iIndex = m_pMACComboBox->findData((int)enmMACAddressPolicy);
     577void UIWizardExportAppPage2::setMACAddressExportPolicy(MACAddressExportPolicy enmMACAddressExportPolicy)
     578{
     579    const int iIndex = m_pMACComboBox->findData((int)enmMACAddressExportPolicy);
    580580    AssertMsg(iIndex != -1, ("Data not found!"));
    581581    m_pMACComboBox->setCurrentIndex(iIndex);
    582582}
    583583
    584 MACAddressPolicy UIWizardExportAppPage2::macAddressPolicy() const
     584MACAddressExportPolicy UIWizardExportAppPage2::macAddressExportPolicy() const
    585585{
    586586    const int iIndex = m_pMACComboBox->currentIndex();
    587     return (MACAddressPolicy)m_pMACComboBox->itemData(iIndex).toInt();
     587    return (MACAddressExportPolicy)m_pMACComboBox->itemData(iIndex).toInt();
    588588}
    589589
    … …  
    965965            this, &UIWizardExportAppPageBasic2::sltHandleFormatComboChange);
    966966    connect(m_pMACComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
    967             this, &UIWizardExportAppPageBasic2::sltHandleMACAddressPolicyComboChange);
     967            this, &UIWizardExportAppPageBasic2::sltHandleMACAddressExportPolicyComboChange);
    968968    connect(m_pAccountComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
    969969            this, &UIWizardExportAppPageBasic2::sltHandleAccountComboChange);
    … …  
    975975    registerField("isFormatCloudOne", this, "isFormatCloudOne");
    976976    registerField("path", this, "path");
    977     registerField("macAddressPolicy", this, "macAddressPolicy");
     977    registerField("macAddressExportPolicy", this, "macAddressExportPolicy");
    978978    registerField("manifestSelected", this, "manifestSelected");
    979979    registerField("includeISOsSelected", this, "includeISOsSelected");
    … …  
    10491049    /* Translate MAC address policy combo-box: */
    10501050    m_pMACComboBoxLabel->setText(UIWizardExportApp::tr("MAC Address &Policy:"));
    1051     m_pMACComboBox->setItemText(MACAddressPolicy_KeepAllMACs,
     1051    m_pMACComboBox->setItemText(MACAddressExportPolicy_KeepAllMACs,
    10521052                                UIWizardExportApp::tr("Include all network adapter MAC addresses"));
    1053     m_pMACComboBox->setItemText(MACAddressPolicy_StripAllNonNATMACs,
     1053    m_pMACComboBox->setItemText(MACAddressExportPolicy_StripAllNonNATMACs,
    10541054                                UIWizardExportApp::tr("Include only NAT network adapter MAC addresses"));
    1055     m_pMACComboBox->setItemText(MACAddressPolicy_StripAllMACs,
     1055    m_pMACComboBox->setItemText(MACAddressExportPolicy_StripAllMACs,
    10561056                                UIWizardExportApp::tr("Strip all network adapter MAC addresses"));
    1057     m_pMACComboBox->setItemData(MACAddressPolicy_KeepAllMACs,
     1057    m_pMACComboBox->setItemData(MACAddressExportPolicy_KeepAllMACs,
    10581058                                UIWizardExportApp::tr("Include all network adapter MAC addresses in exported appliance archive."), Qt::ToolTipRole);
    1059     m_pMACComboBox->setItemData(MACAddressPolicy_StripAllNonNATMACs,
     1059    m_pMACComboBox->setItemData(MACAddressExportPolicy_StripAllNonNATMACs,
    10601060                                UIWizardExportApp::tr("Include only NAT network adapter MAC addresses in exported appliance archive."), Qt::ToolTipRole);
    1061     m_pMACComboBox->setItemData(MACAddressPolicy_StripAllMACs,
     1061    m_pMACComboBox->setItemData(MACAddressExportPolicy_StripAllMACs,
    10621062                                UIWizardExportApp::tr("Strip all network adapter MAC addresses from exported appliance archive."), Qt::ToolTipRole);
    10631063
    … …  
    11011101    /* Update tool-tips: */
    11021102    updateFormatComboToolTip();
    1103     updateMACAddressPolicyComboToolTip();
     1103    updateMACAddressExportPolicyComboToolTip();
    11041104    updateAccountPropertyTableToolTips();
    11051105}
    … …  
    12091209}
    12101210
    1211 void UIWizardExportAppPageBasic2::sltHandleMACAddressPolicyComboChange()
     1211void UIWizardExportAppPageBasic2::sltHandleMACAddressExportPolicyComboChange()
    12121212{
    12131213    /* Update tool-tip: */
    1214     updateMACAddressPolicyComboToolTip();
     1214    updateMACAddressExportPolicyComboToolTip();
    12151215}
    12161216

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h

    r81738 r82386  
    5353
    5454
    55 /** MAC address policies. */
    56 enum MACAddressPolicy
    57 {
    58     MACAddressPolicy_KeepAllMACs,
    59     MACAddressPolicy_StripAllNonNATMACs,
    60     MACAddressPolicy_StripAllMACs,
    61     MACAddressPolicy_MAX
    62 };
    63 Q_DECLARE_METATYPE(MACAddressPolicy);
     55/** MAC address export policies. */
     56enum MACAddressExportPolicy
     57{
     58    MACAddressExportPolicy_KeepAllMACs,
     59    MACAddressExportPolicy_StripAllNonNATMACs,
     60    MACAddressExportPolicy_StripAllMACs,
     61    MACAddressExportPolicy_MAX
     62};
     63Q_DECLARE_METATYPE(MACAddressExportPolicy);
    6464
    6565/** Format combo data fields. */
    … …  
    124124    /** Updates format combo tool-tips. */
    125125    void updateFormatComboToolTip();
    126     /** Updates MAC address policy combo tool-tips. */
    127     void updateMACAddressPolicyComboToolTip();
     126    /** Updates MAC address export policy combo tool-tips. */
     127    void updateMACAddressExportPolicyComboToolTip();
    128128    /** Updates account property table tool-tips. */
    129129    void updateAccountPropertyTableToolTips();
    … …  
    143143    QString path() const;
    144144
    145     /** Defines @a enmMACAddressPolicy. */
    146     void setMACAddressPolicy(MACAddressPolicy enmMACAddressPolicy);
    147     /** Returns MAC address policy. */
    148     MACAddressPolicy macAddressPolicy() const;
     145    /** Defines @a enmMACAddressExportPolicy. */
     146    void setMACAddressExportPolicy(MACAddressExportPolicy enmMACAddressExportPolicy);
     147    /** Returns MAC address export policy. */
     148    MACAddressExportPolicy macAddressExportPolicy() const;
    149149
    150150    /** Defines whether manifest @a fSelected. */
    … …  
    262262    Q_PROPERTY(bool isFormatCloudOne READ isFormatCloudOne);
    263263    Q_PROPERTY(QString path READ path WRITE setPath);
    264     Q_PROPERTY(MACAddressPolicy macAddressPolicy READ macAddressPolicy WRITE setMACAddressPolicy);
     264    Q_PROPERTY(MACAddressExportPolicy macAddressExportPolicy READ macAddressExportPolicy WRITE setMACAddressExportPolicy);
    265265    Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected);
    266266    Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
    … …  
    312312    void sltHandleFileSelectorChange();
    313313
    314     /** Handles change in MAC address policy combo-box. */
    315     void sltHandleMACAddressPolicyComboChange();
     314    /** Handles change in MAC address export policy combo-box. */
     315    void sltHandleMACAddressExportPolicyComboChange();
    316316
    317317    /** Handles change in account combo-box. */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp

    r79814 r82386  
    434434            this, &UIWizardExportAppPageExpert::sltHandleFormatComboChange);
    435435    connect(m_pMACComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
    436             this, &UIWizardExportAppPageExpert::sltHandleMACAddressPolicyComboChange);
     436            this, &UIWizardExportAppPageExpert::sltHandleMACAddressExportPolicyComboChange);
    437437    connect(m_pAccountComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
    438438            this, &UIWizardExportAppPageExpert::sltHandleAccountComboChange);
    … …  
    449449    registerField("isFormatCloudOne", this, "isFormatCloudOne");
    450450    registerField("path", this, "path");
    451     registerField("macAddressPolicy", this, "macAddressPolicy");
     451    registerField("macAddressExportPolicy", this, "macAddressExportPolicy");
    452452    registerField("manifestSelected", this, "manifestSelected");
    453453    registerField("includeISOsSelected", this, "includeISOsSelected");
    … …  
    516516    /* Translate MAC address policy combo-box: */
    517517    m_pMACComboBoxLabel->setText(UIWizardExportApp::tr("MAC Address &Policy:"));
    518     m_pMACComboBox->setItemText(MACAddressPolicy_KeepAllMACs,
     518    m_pMACComboBox->setItemText(MACAddressExportPolicy_KeepAllMACs,
    519519                                UIWizardExportApp::tr("Include all network adapter MAC addresses"));
    520     m_pMACComboBox->setItemText(MACAddressPolicy_StripAllNonNATMACs,
     520    m_pMACComboBox->setItemText(MACAddressExportPolicy_StripAllNonNATMACs,
    521521                                UIWizardExportApp::tr("Include only NAT network adapter MAC addresses"));
    522     m_pMACComboBox->setItemText(MACAddressPolicy_StripAllMACs,
     522    m_pMACComboBox->setItemText(MACAddressExportPolicy_StripAllMACs,
    523523                                UIWizardExportApp::tr("Strip all network adapter MAC addresses"));
    524     m_pMACComboBox->setItemData(MACAddressPolicy_KeepAllMACs,
     524    m_pMACComboBox->setItemData(MACAddressExportPolicy_KeepAllMACs,
    525525                                UIWizardExportApp::tr("Include all network adapter MAC addresses in exported appliance archive."), Qt::ToolTipRole);
    526     m_pMACComboBox->setItemData(MACAddressPolicy_StripAllNonNATMACs,
     526    m_pMACComboBox->setItemData(MACAddressExportPolicy_StripAllNonNATMACs,
    527527                                UIWizardExportApp::tr("Include only NAT network adapter MAC addresses in exported appliance archive."), Qt::ToolTipRole);
    528     m_pMACComboBox->setItemData(MACAddressPolicy_StripAllMACs,
     528    m_pMACComboBox->setItemData(MACAddressExportPolicy_StripAllMACs,
    529529                                UIWizardExportApp::tr("Strip all network adapter MAC addresses from exported appliance archive."), Qt::ToolTipRole);
    530530
    … …  
    565565    /* Update tool-tips: */
    566566    updateFormatComboToolTip();
    567     updateMACAddressPolicyComboToolTip();
     567    updateMACAddressExportPolicyComboToolTip();
    568568}
    569569
    … …  
    711711}
    712712
    713 void UIWizardExportAppPageExpert::sltHandleMACAddressPolicyComboChange()
     713void UIWizardExportAppPageExpert::sltHandleMACAddressExportPolicyComboChange()
    714714{
    715715    /* Update tool-tip: */
    716     updateMACAddressPolicyComboToolTip();
     716    updateMACAddressExportPolicyComboToolTip();
    717717}
    718718

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h

    r79590 r82386  
    4242    Q_PROPERTY(bool isFormatCloudOne READ isFormatCloudOne);
    4343    Q_PROPERTY(QString path READ path WRITE setPath);
    44     Q_PROPERTY(MACAddressPolicy macAddressPolicy READ macAddressPolicy WRITE setMACAddressPolicy);
     44    Q_PROPERTY(MACAddressExportPolicy macAddressExportPolicy READ macAddressExportPolicy WRITE setMACAddressExportPolicy);
    4545    Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected);
    4646    Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
    … …  
    9696    void sltHandleFileSelectorChange();
    9797
    98     /** Handles change in MAC address policy combo-box. */
    99     void sltHandleMACAddressPolicyComboChange();
     98    /** Handles change in MAC address export policy combo-box. */
     99    void sltHandleMACAddressExportPolicyComboChange();
    100100
    101101    /** Handles change in account combo-box. */
Note: See TracChangeset for help on using the changeset viewer.

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