VirtualBox

Changeset 66568 in vbox


Ignore:
Timestamp:
Apr 14, 2017 10:53:01 AM (8 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
114595
Message:

FE/Qt: Global preferences: Nitpicks.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/settings/global
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp

    r66460 r66568  
    7979
    8080    /* Prepare old display data: */
    81     UIDataSettingsGlobalDisplay oldData;
     81    UIDataSettingsGlobalDisplay oldDisplayData;
    8282
    8383    /* Gather old display data: */
    84     oldData.m_strMaxGuestResolution = m_settings.maxGuestRes();
    85     oldData.m_fActivateHoveredMachineWindow = gEDataManager->activateHoveredMachineWindow();
     84    oldDisplayData.m_strMaxGuestResolution = m_settings.maxGuestRes();
     85    oldDisplayData.m_fActivateHoveredMachineWindow = gEDataManager->activateHoveredMachineWindow();
    8686
    8787    /* Cache old display data: */
    88     m_pCache->cacheInitialData(oldData);
     88    m_pCache->cacheInitialData(oldDisplayData);
    8989
    9090    /* Upload properties & settings to data: */
    … …  
    9595{
    9696    /* Get old display data from the cache: */
    97     const UIDataSettingsGlobalDisplay &oldData = m_pCache->base();
     97    const UIDataSettingsGlobalDisplay &oldDisplayData = m_pCache->base();
    9898
    9999    /* Load old display data from the cache: */
    100     if (   (oldData.m_strMaxGuestResolution.isEmpty())
    101         || (oldData.m_strMaxGuestResolution == "auto"))
     100    if (   (oldDisplayData.m_strMaxGuestResolution.isEmpty())
     101        || (oldDisplayData.m_strMaxGuestResolution == "auto"))
    102102    {
    103103        /* Switch combo-box item: */
    104104        m_pMaxResolutionCombo->setCurrentIndex(m_pMaxResolutionCombo->findData("auto"));
    105105    }
    106     else if (oldData.m_strMaxGuestResolution == "any")
     106    else if (oldDisplayData.m_strMaxGuestResolution == "any")
    107107    {
    108108        /* Switch combo-box item: */
    … …  
    114114        m_pMaxResolutionCombo->setCurrentIndex(m_pMaxResolutionCombo->findData("fixed"));
    115115        /* Trying to parse text into 2 sections by ',' symbol: */
    116         const int iWidth  = oldData.m_strMaxGuestResolution.section(',', 0, 0).toInt();
    117         const int iHeight = oldData.m_strMaxGuestResolution.section(',', 1, 1).toInt();
     116        const int iWidth  = oldDisplayData.m_strMaxGuestResolution.section(',', 0, 0).toInt();
     117        const int iHeight = oldDisplayData.m_strMaxGuestResolution.section(',', 1, 1).toInt();
    118118        /* And set values if they are present: */
    119119        m_pResolutionWidthSpin->setValue(iWidth);
    120120        m_pResolutionHeightSpin->setValue(iHeight);
    121121    }
    122     m_pCheckBoxActivateOnMouseHover->setChecked(oldData.m_fActivateHoveredMachineWindow);
     122    m_pCheckBoxActivateOnMouseHover->setChecked(oldDisplayData.m_fActivateHoveredMachineWindow);
    123123}
    124124
    … …  
    126126{
    127127    /* Prepare new display data: */
    128     UIDataSettingsGlobalDisplay newData = m_pCache->base();
     128    UIDataSettingsGlobalDisplay newDisplayData = m_pCache->base();
    129129
    130130    /* Gather new display data: */
    … …  
    132132    {
    133133        /* If resolution current combo item is "auto" => resolution set to "auto": */
    134         newData.m_strMaxGuestResolution = QString();
     134        newDisplayData.m_strMaxGuestResolution = QString();
    135135    }
    136136    else if (   m_pMaxResolutionCombo->itemData(m_pMaxResolutionCombo->currentIndex()).toString() == "any"
    … …  
    139139        /* Else if resolution current combo item is "any"
    140140         * or any of the resolution field attributes is zero => resolution set to "any": */
    141         newData.m_strMaxGuestResolution = "any";
     141        newDisplayData.m_strMaxGuestResolution = "any";
    142142    }
    143143    else if (m_pResolutionWidthSpin->value() != 0 && m_pResolutionHeightSpin->value() != 0)
    144144    {
    145145        /* Else if both field attributes are non-zeroes => resolution set to "fixed": */
    146         newData.m_strMaxGuestResolution = QString("%1,%2").arg(m_pResolutionWidthSpin->value()).arg(m_pResolutionHeightSpin->value());
    147     }
    148     newData.m_fActivateHoveredMachineWindow = m_pCheckBoxActivateOnMouseHover->isChecked();
     146        newDisplayData.m_strMaxGuestResolution = QString("%1,%2").arg(m_pResolutionWidthSpin->value()).arg(m_pResolutionHeightSpin->value());
     147    }
     148    newDisplayData.m_fActivateHoveredMachineWindow = m_pCheckBoxActivateOnMouseHover->isChecked();
    149149
    150150    /* Cache new display data: */
    151     m_pCache->cacheCurrentData(newData);
     151    m_pCache->cacheCurrentData(newDisplayData);
    152152}
    153153

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp

    r66460 r66568  
    278278
    279279    /* Prepare old extension data: */
    280     UIDataSettingsGlobalExtension oldData;
     280    UIDataSettingsGlobalExtension oldExtensionData;
    281281
    282282    /* Gather old extension data: */
    … …  
    287287        UIDataSettingsGlobalExtensionItem item;
    288288        loadData(package, item);
    289         oldData.m_items << item;
     289        oldExtensionData.m_items << item;
    290290    }
    291291
    292292    /* Cache old extension data: */
    293     m_pCache->cacheInitialData(oldData);
     293    m_pCache->cacheInitialData(oldExtensionData);
    294294
    295295    /* Upload properties & settings to data: */
    … …  
    300300{
    301301    /* Get old extension data from the cache: */
    302     const UIDataSettingsGlobalExtension &oldData = m_pCache->base();
     302    const UIDataSettingsGlobalExtension &oldExtensionData = m_pCache->base();
    303303
    304304    /* Load old extension data from the cache: */
    305     foreach (const UIDataSettingsGlobalExtensionItem &item, oldData.m_items)
     305    foreach (const UIDataSettingsGlobalExtensionItem &item, oldExtensionData.m_items)
    306306        new UIExtensionPackageItem(m_pPackagesTree, item);
    307307    /* If at least one item present: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp

    r66460 r66568  
    8686
    8787    /* Prepare old general data: */
    88     UIDataSettingsGlobalGeneral oldData;
     88    UIDataSettingsGlobalGeneral oldGeneralData;
    8989
    9090    /* Gather old general data: */
    91     oldData.m_strDefaultMachineFolder = m_properties.GetDefaultMachineFolder();
    92     oldData.m_strVRDEAuthLibrary = m_properties.GetVRDEAuthLibrary();
    93     oldData.m_fHostScreenSaverDisabled = m_settings.hostScreenSaverDisabled();
     91    oldGeneralData.m_strDefaultMachineFolder = m_properties.GetDefaultMachineFolder();
     92    oldGeneralData.m_strVRDEAuthLibrary = m_properties.GetVRDEAuthLibrary();
     93    oldGeneralData.m_fHostScreenSaverDisabled = m_settings.hostScreenSaverDisabled();
    9494
    9595    /* Cache old general data: */
    96     m_pCache->cacheInitialData(oldData);
     96    m_pCache->cacheInitialData(oldGeneralData);
    9797
    9898    /* Upload properties & settings to data: */
    … …  
    103103{
    104104    /* Get old general data from the cache: */
    105     const UIDataSettingsGlobalGeneral &oldData = m_pCache->base();
     105    const UIDataSettingsGlobalGeneral &oldGeneralData = m_pCache->base();
    106106
    107107    /* Load old general data from the cache: */
    108     m_pSelectorMachineFolder->setPath(oldData.m_strDefaultMachineFolder);
    109     m_pSelectorVRDPLibName->setPath(oldData.m_strVRDEAuthLibrary);
    110     m_pCheckBoxHostScreenSaver->setChecked(oldData.m_fHostScreenSaverDisabled);
     108    m_pSelectorMachineFolder->setPath(oldGeneralData.m_strDefaultMachineFolder);
     109    m_pSelectorVRDPLibName->setPath(oldGeneralData.m_strVRDEAuthLibrary);
     110    m_pCheckBoxHostScreenSaver->setChecked(oldGeneralData.m_fHostScreenSaverDisabled);
    111111}
    112112
    … …  
    114114{
    115115    /* Prepare new general data: */
    116     UIDataSettingsGlobalGeneral newData = m_pCache->base();
     116    UIDataSettingsGlobalGeneral newGeneralData = m_pCache->base();
    117117
    118118    /* Gather new general data: */
    119     newData.m_strDefaultMachineFolder = m_pSelectorMachineFolder->path();
    120     newData.m_strVRDEAuthLibrary = m_pSelectorVRDPLibName->path();
    121     newData.m_fHostScreenSaverDisabled = m_pCheckBoxHostScreenSaver->isChecked();
     119    newGeneralData.m_strDefaultMachineFolder = m_pSelectorMachineFolder->path();
     120    newGeneralData.m_strVRDEAuthLibrary = m_pSelectorVRDPLibName->path();
     121    newGeneralData.m_fHostScreenSaverDisabled = m_pCheckBoxHostScreenSaver->isChecked();
    122122
    123123    /* Cache new general data: */
    124     m_pCache->cacheCurrentData(newData);
     124    m_pCache->cacheCurrentData(newGeneralData);
    125125}
    126126

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp

    r66460 r66568  
    889889
    890890    /* Prepare old input data: */
    891     UIDataSettingsGlobalInput oldData;
     891    UIDataSettingsGlobalInput oldInputData;
    892892
    893893    /* Gather old input data: */
    894     oldData.shortcuts() << UIDataShortcutRow(m_pMachineTable, UIHostCombo::hostComboCacheKey(), tr("Host Key Combination"),  m_settings.hostCombo(), QString());
     894    oldInputData.shortcuts() << UIDataShortcutRow(m_pMachineTable, UIHostCombo::hostComboCacheKey(), tr("Host Key Combination"),  m_settings.hostCombo(), QString());
    895895    const QMap<QString, UIShortcut> &shortcuts = gShortcutPool->shortcuts();
    896896    const QList<QString> shortcutKeys = shortcuts.keys();
    … …  
    901901                               strShortcutKey.startsWith(GUI_Input_SelectorShortcuts) ? m_pSelectorTable : 0;
    902902        AssertPtr(pParent);
    903         oldData.shortcuts() << UIDataShortcutRow(pParent, strShortcutKey, VBoxGlobal::removeAccelMark(shortcut.description()),
     903        oldInputData.shortcuts() << UIDataShortcutRow(pParent, strShortcutKey, VBoxGlobal::removeAccelMark(shortcut.description()),
    904904                                                 shortcut.sequence().toString(QKeySequence::NativeText),
    905905                                                 shortcut.defaultSequence().toString(QKeySequence::NativeText));
    906906    }
    907     oldData.setAutoCapture(m_settings.autoCapture());
     907    oldInputData.setAutoCapture(m_settings.autoCapture());
    908908
    909909    /* Cache old input data: */
    910     m_pCache->cacheInitialData(oldData);
     910    m_pCache->cacheInitialData(oldInputData);
    911911
    912912    /* Upload properties & settings to data: */
    … …  
    917917{
    918918    /* Get old input data from the cache: */
    919     const UIDataSettingsGlobalInput &oldData = m_pCache->base();
     919    const UIDataSettingsGlobalInput &oldInputData = m_pCache->base();
    920920
    921921    /* Load old input data from the cache: */
    922     m_pSelectorModel->load(oldData.shortcuts());
    923     m_pMachineModel->load(oldData.shortcuts());
    924     m_pEnableAutoGrabCheckbox->setChecked(oldData.autoCapture());
     922    m_pSelectorModel->load(oldInputData.shortcuts());
     923    m_pMachineModel->load(oldInputData.shortcuts());
     924    m_pEnableAutoGrabCheckbox->setChecked(oldInputData.autoCapture());
    925925
    926926    /* Revalidate: */
    … …  
    931931{
    932932    /* Prepare new input data: */
    933     UIDataSettingsGlobalInput newData = m_pCache->base();
     933    UIDataSettingsGlobalInput newInputData = m_pCache->base();
    934934
    935935    /* Gather new input data: */
    936     m_pSelectorModel->save(newData.shortcuts());
    937     m_pMachineModel->save(newData.shortcuts());
    938     newData.setAutoCapture(m_pEnableAutoGrabCheckbox->isChecked());
     936    m_pSelectorModel->save(newInputData.shortcuts());
     937    m_pMachineModel->save(newInputData.shortcuts());
     938    newInputData.setAutoCapture(m_pEnableAutoGrabCheckbox->isChecked());
    939939
    940940    /* Cache new input data: */
    941     m_pCache->cacheCurrentData(newData);
     941    m_pCache->cacheCurrentData(newInputData);
    942942}
    943943

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp

    r66460 r66568  
    228228
    229229    /* Prepare old language data: */
    230     UIDataSettingsGlobalLanguage oldData;
     230    UIDataSettingsGlobalLanguage oldLanguageData;
    231231
    232232    /* Gather old language data: */
    233     oldData.m_strLanguageId = m_settings.languageId();
     233    oldLanguageData.m_strLanguageId = m_settings.languageId();
    234234
    235235    /* Cache old language data: */
    236     m_pCache->cacheInitialData(oldData);
     236    m_pCache->cacheInitialData(oldLanguageData);
    237237
    238238    /* Upload properties & settings to data: */
    … …  
    243243{
    244244    /* Get old language data from the cache: */
    245     const UIDataSettingsGlobalLanguage &oldData = m_pCache->base();
     245    const UIDataSettingsGlobalLanguage &oldLanguageData = m_pCache->base();
    246246
    247247    /* Load old language data from the cache: */
    248     reloadLanguageTree(oldData.m_strLanguageId);
     248    reloadLanguageTree(oldLanguageData.m_strLanguageId);
    249249}
    250250
    … …  
    252252{
    253253    /* Prepare new language data: */
    254     UIDataSettingsGlobalLanguage newData = m_pCache->base();
     254    UIDataSettingsGlobalLanguage newInputData = m_pCache->base();
    255255
    256256    /* Gather new language data: */
    … …  
    258258    Assert(pCurrentItem);
    259259    if (pCurrentItem)
    260         newData.m_strLanguageId = pCurrentItem->text(1);
     260        newInputData.m_strLanguageId = pCurrentItem->text(1);
    261261
    262262    /* Cache new language data: */
    263     m_pCache->cacheCurrentData(newData);
     263    m_pCache->cacheCurrentData(newInputData);
    264264}
    265265

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp

    r66562 r66568  
    444444
    445445    /* Prepare old network data: */
    446     UIDataSettingsGlobalNetwork oldData;
     446    UIDataSettingsGlobalNetwork oldNetworkData;
    447447
    448448    /* Gather old network data: */
    … …  
    451451        UIDataSettingsGlobalNetworkNAT data;
    452452        loadDataNetworkNAT(network, data);
    453         oldData.m_networksNAT << data;
     453        oldNetworkData.m_networksNAT << data;
    454454    }
    455455    foreach (const CHostNetworkInterface &iface, vboxGlobal().host().GetNetworkInterfaces())
    … …  
    458458            UIDataSettingsGlobalNetworkHost data;
    459459            loadDataNetworkHost(iface, data);
    460             oldData.m_networksHost << data;
     460            oldNetworkData.m_networksHost << data;
    461461        }
    462462
    463463    /* Cache old network data: */
    464     m_pCache->cacheInitialData(oldData);
     464    m_pCache->cacheInitialData(oldNetworkData);
    465465
    466466    /* Upload properties & settings to data: */
    … …  
    471471{
    472472    /* Get old network data from the cache: */
    473     const UIDataSettingsGlobalNetwork &oldData = m_pCache->base();
     473    const UIDataSettingsGlobalNetwork &oldNetworkData = m_pCache->base();
    474474
    475475    /* Load old network data from the cache: */
    476     foreach (const UIDataSettingsGlobalNetworkNAT &network, oldData.m_networksNAT)
     476    foreach (const UIDataSettingsGlobalNetworkNAT &network, oldNetworkData.m_networksNAT)
    477477        createTreeItemNetworkNAT(network);
    478478    m_pTreeNetworkNAT->sortByColumn(1, Qt::AscendingOrder);
    479479    m_pTreeNetworkNAT->setCurrentItem(m_pTreeNetworkNAT->topLevelItem(0));
    480480    sltHandleCurrentItemChangeNetworkNAT();
    481     foreach (const UIDataSettingsGlobalNetworkHost &network, oldData.m_networksHost)
     481    foreach (const UIDataSettingsGlobalNetworkHost &network, oldNetworkData.m_networksHost)
    482482        createTreeItemNetworkHost(network);
    483483    m_pTreeNetworkHost->sortByColumn(0, Qt::AscendingOrder);
    … …  
    492492{
    493493    /* Prepare new network data: */
    494     UIDataSettingsGlobalNetwork newData = m_pCache->base();
     494    UIDataSettingsGlobalNetwork newNetworkData = m_pCache->base();
    495495
    496496    /* Gather new network data: */
    497     newData.m_networksNAT.clear();
     497    newNetworkData.m_networksNAT.clear();
    498498    for (int iNetworkIndex = 0; iNetworkIndex < m_pTreeNetworkNAT->topLevelItemCount(); ++iNetworkIndex)
    499499    {
    … …  
    501501        UIItemNetworkNAT *pItem = static_cast<UIItemNetworkNAT*>(m_pTreeNetworkNAT->topLevelItem(iNetworkIndex));
    502502        pItem->uploadNetworkData(data);
    503         newData.m_networksNAT << data;
    504     }
    505     newData.m_networksHost.clear();
     503        newNetworkData.m_networksNAT << data;
     504    }
     505    newNetworkData.m_networksHost.clear();
    506506    for (int iNetworkIndex = 0; iNetworkIndex < m_pTreeNetworkHost->topLevelItemCount(); ++iNetworkIndex)
    507507    {
    … …  
    509509        UIItemNetworkHost *pItem = static_cast<UIItemNetworkHost*>(m_pTreeNetworkHost->topLevelItem(iNetworkIndex));
    510510        pItem->uploadNetworkData(data);
    511         newData.m_networksHost << data;
     511        newNetworkData.m_networksHost << data;
    512512    }
    513513
    514514    /* Cache new network data: */
    515     m_pCache->cacheCurrentData(newData);
     515    m_pCache->cacheCurrentData(newNetworkData);
    516516}
    517517

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp

    r66460 r66568  
    8787
    8888    /* Prepare old proxy data: */
    89     UIDataSettingsGlobalProxy oldData;
     89    UIDataSettingsGlobalProxy oldProxyData;
    9090
    9191    /* Gather old proxy data: */
    9292    UIProxyManager proxyManager(m_settings.proxySettings());
    93     oldData.m_enmProxyState = proxyManager.proxyState();
    94     oldData.m_strProxyHost = proxyManager.proxyHost();
    95     oldData.m_strProxyPort = proxyManager.proxyPort();
     93    oldProxyData.m_enmProxyState = proxyManager.proxyState();
     94    oldProxyData.m_strProxyHost = proxyManager.proxyHost();
     95    oldProxyData.m_strProxyPort = proxyManager.proxyPort();
    9696
    9797    /* Cache old proxy data: */
    98     m_pCache->cacheInitialData(oldData);
     98    m_pCache->cacheInitialData(oldProxyData);
    9999
    100100    /* Upload properties & settings to data: */
    … …  
    105105{
    106106    /* Get old proxy data from the cache: */
    107     const UIDataSettingsGlobalProxy &oldData = m_pCache->base();
     107    const UIDataSettingsGlobalProxy &oldProxyData = m_pCache->base();
    108108
    109109    /* Load old proxy data from the cache: */
    110     switch (oldData.m_enmProxyState)
     110    switch (oldProxyData.m_enmProxyState)
    111111    {
    112112        case UIProxyManager::ProxyState_Auto:     m_pRadioProxyAuto->setChecked(true); break;
    … …  
    114114        case UIProxyManager::ProxyState_Enabled:  m_pRadioProxyEnabled->setChecked(true); break;
    115115    }
    116     m_pHostEditor->setText(oldData.m_strProxyHost);
    117     m_pPortEditor->setText(oldData.m_strProxyPort);
     116    m_pHostEditor->setText(oldProxyData.m_strProxyHost);
     117    m_pPortEditor->setText(oldProxyData.m_strProxyPort);
    118118    sltHandleProxyToggle();
    119119
    … …  
    125125{
    126126    /* Prepare new proxy data: */
    127     UIDataSettingsGlobalProxy newData = m_pCache->base();
     127    UIDataSettingsGlobalProxy newProxyData = m_pCache->base();
    128128
    129129    /* Gather new proxy data: */
    130     newData.m_enmProxyState = m_pRadioProxyEnabled->isChecked()  ? UIProxyManager::ProxyState_Enabled :
    131                               m_pRadioProxyDisabled->isChecked() ? UIProxyManager::ProxyState_Disabled :
    132                                                                    UIProxyManager::ProxyState_Auto;
    133     newData.m_strProxyHost = m_pHostEditor->text();
    134     newData.m_strProxyPort = m_pPortEditor->text();
     130    newProxyData.m_enmProxyState = m_pRadioProxyEnabled->isChecked()  ? UIProxyManager::ProxyState_Enabled :
     131                                   m_pRadioProxyDisabled->isChecked() ? UIProxyManager::ProxyState_Disabled :
     132                                                                        UIProxyManager::ProxyState_Auto;
     133    newProxyData.m_strProxyHost = m_pHostEditor->text();
     134    newProxyData.m_strProxyPort = m_pPortEditor->text();
    135135
    136136    /* Cache new proxy data: */
    137     m_pCache->cacheCurrentData(newData);
     137    m_pCache->cacheCurrentData(newProxyData);
    138138}
    139139

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp

    r66460 r66568  
    8989
    9090    /* Prepare old update data: */
    91     UIDataSettingsGlobalUpdate oldData;
     91    UIDataSettingsGlobalUpdate oldUpdateData;
    9292
    9393    /* Gather old update data: */
    9494    const VBoxUpdateData updateData(gEDataManager->applicationUpdateData());
    95     oldData.m_fCheckEnabled = !updateData.isNoNeedToCheck();
    96     oldData.m_periodIndex = updateData.periodIndex();
    97     oldData.m_branchIndex = updateData.branchIndex();
    98     oldData.m_strDate = updateData.date();
     95    oldUpdateData.m_fCheckEnabled = !updateData.isNoNeedToCheck();
     96    oldUpdateData.m_periodIndex = updateData.periodIndex();
     97    oldUpdateData.m_branchIndex = updateData.branchIndex();
     98    oldUpdateData.m_strDate = updateData.date();
    9999
    100100    /* Cache old update data: */
    101     m_pCache->cacheInitialData(oldData);
     101    m_pCache->cacheInitialData(oldUpdateData);
    102102
    103103    /* Upload properties & settings to data: */
    … …  
    108108{
    109109    /* Get old update data from the cache: */
    110     const UIDataSettingsGlobalUpdate &oldData = m_pCache->base();
     110    const UIDataSettingsGlobalUpdate &oldUpdateData = m_pCache->base();
    111111
    112112    /* Load old update data from the cache: */
    113     m_pCheckBoxUpdate->setChecked(oldData.m_fCheckEnabled);
     113    m_pCheckBoxUpdate->setChecked(oldUpdateData.m_fCheckEnabled);
    114114    if (m_pCheckBoxUpdate->isChecked())
    115115    {
    116         m_pComboBoxUpdatePeriod->setCurrentIndex(oldData.m_periodIndex);
    117         if (oldData.m_branchIndex == VBoxUpdateData::BranchWithBetas)
     116        m_pComboBoxUpdatePeriod->setCurrentIndex(oldUpdateData.m_periodIndex);
     117        if (oldUpdateData.m_branchIndex == VBoxUpdateData::BranchWithBetas)
    118118            m_pRadioUpdateFilterBetas->setChecked(true);
    119         else if (oldData.m_branchIndex == VBoxUpdateData::BranchAllRelease)
     119        else if (oldUpdateData.m_branchIndex == VBoxUpdateData::BranchAllRelease)
    120120            m_pRadioUpdateFilterEvery->setChecked(true);
    121121        else
    122122            m_pRadioUpdateFilterStable->setChecked(true);
    123123    }
    124     m_pUpdateDateText->setText(oldData.m_strDate);
    125     sltHandleUpdateToggle(oldData.m_fCheckEnabled);
     124    m_pUpdateDateText->setText(oldUpdateData.m_strDate);
     125    sltHandleUpdateToggle(oldUpdateData.m_fCheckEnabled);
    126126}
    127127
    … …  
    129129{
    130130    /* Prepare new update data: */
    131     UIDataSettingsGlobalUpdate newData = m_pCache->base();
     131    UIDataSettingsGlobalUpdate newUpdateData = m_pCache->base();
    132132
    133133    /* Gather new update data: */
    134     newData.m_periodIndex = periodType();
    135     newData.m_branchIndex = branchType();
     134    newUpdateData.m_periodIndex = periodType();
     135    newUpdateData.m_branchIndex = branchType();
    136136
    137137    /* Cache new update data: */
    138     m_pCache->cacheCurrentData(newData);
     138    m_pCache->cacheCurrentData(newUpdateData);
    139139}
    140140
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