Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp (revision 66567) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp (revision 66568) @@ -79,12 +79,12 @@ /* Prepare old display data: */ - UIDataSettingsGlobalDisplay oldData; + UIDataSettingsGlobalDisplay oldDisplayData; /* Gather old display data: */ - oldData.m_strMaxGuestResolution = m_settings.maxGuestRes(); - oldData.m_fActivateHoveredMachineWindow = gEDataManager->activateHoveredMachineWindow(); + oldDisplayData.m_strMaxGuestResolution = m_settings.maxGuestRes(); + oldDisplayData.m_fActivateHoveredMachineWindow = gEDataManager->activateHoveredMachineWindow(); /* Cache old display data: */ - m_pCache->cacheInitialData(oldData); + m_pCache->cacheInitialData(oldDisplayData); /* Upload properties & settings to data: */ @@ -95,14 +95,14 @@ { /* Get old display data from the cache: */ - const UIDataSettingsGlobalDisplay &oldData = m_pCache->base(); + const UIDataSettingsGlobalDisplay &oldDisplayData = m_pCache->base(); /* Load old display data from the cache: */ - if ( (oldData.m_strMaxGuestResolution.isEmpty()) - || (oldData.m_strMaxGuestResolution == "auto")) + if ( (oldDisplayData.m_strMaxGuestResolution.isEmpty()) + || (oldDisplayData.m_strMaxGuestResolution == "auto")) { /* Switch combo-box item: */ m_pMaxResolutionCombo->setCurrentIndex(m_pMaxResolutionCombo->findData("auto")); } - else if (oldData.m_strMaxGuestResolution == "any") + else if (oldDisplayData.m_strMaxGuestResolution == "any") { /* Switch combo-box item: */ @@ -114,11 +114,11 @@ m_pMaxResolutionCombo->setCurrentIndex(m_pMaxResolutionCombo->findData("fixed")); /* Trying to parse text into 2 sections by ',' symbol: */ - const int iWidth = oldData.m_strMaxGuestResolution.section(',', 0, 0).toInt(); - const int iHeight = oldData.m_strMaxGuestResolution.section(',', 1, 1).toInt(); + const int iWidth = oldDisplayData.m_strMaxGuestResolution.section(',', 0, 0).toInt(); + const int iHeight = oldDisplayData.m_strMaxGuestResolution.section(',', 1, 1).toInt(); /* And set values if they are present: */ m_pResolutionWidthSpin->setValue(iWidth); m_pResolutionHeightSpin->setValue(iHeight); } - m_pCheckBoxActivateOnMouseHover->setChecked(oldData.m_fActivateHoveredMachineWindow); + m_pCheckBoxActivateOnMouseHover->setChecked(oldDisplayData.m_fActivateHoveredMachineWindow); } @@ -126,5 +126,5 @@ { /* Prepare new display data: */ - UIDataSettingsGlobalDisplay newData = m_pCache->base(); + UIDataSettingsGlobalDisplay newDisplayData = m_pCache->base(); /* Gather new display data: */ @@ -132,5 +132,5 @@ { /* If resolution current combo item is "auto" => resolution set to "auto": */ - newData.m_strMaxGuestResolution = QString(); + newDisplayData.m_strMaxGuestResolution = QString(); } else if ( m_pMaxResolutionCombo->itemData(m_pMaxResolutionCombo->currentIndex()).toString() == "any" @@ -139,15 +139,15 @@ /* Else if resolution current combo item is "any" * or any of the resolution field attributes is zero => resolution set to "any": */ - newData.m_strMaxGuestResolution = "any"; + newDisplayData.m_strMaxGuestResolution = "any"; } else if (m_pResolutionWidthSpin->value() != 0 && m_pResolutionHeightSpin->value() != 0) { /* Else if both field attributes are non-zeroes => resolution set to "fixed": */ - newData.m_strMaxGuestResolution = QString("%1,%2").arg(m_pResolutionWidthSpin->value()).arg(m_pResolutionHeightSpin->value()); - } - newData.m_fActivateHoveredMachineWindow = m_pCheckBoxActivateOnMouseHover->isChecked(); + newDisplayData.m_strMaxGuestResolution = QString("%1,%2").arg(m_pResolutionWidthSpin->value()).arg(m_pResolutionHeightSpin->value()); + } + newDisplayData.m_fActivateHoveredMachineWindow = m_pCheckBoxActivateOnMouseHover->isChecked(); /* Cache new display data: */ - m_pCache->cacheCurrentData(newData); + m_pCache->cacheCurrentData(newDisplayData); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp (revision 66567) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp (revision 66568) @@ -278,5 +278,5 @@ /* Prepare old extension data: */ - UIDataSettingsGlobalExtension oldData; + UIDataSettingsGlobalExtension oldExtensionData; /* Gather old extension data: */ @@ -287,9 +287,9 @@ UIDataSettingsGlobalExtensionItem item; loadData(package, item); - oldData.m_items << item; + oldExtensionData.m_items << item; } /* Cache old extension data: */ - m_pCache->cacheInitialData(oldData); + m_pCache->cacheInitialData(oldExtensionData); /* Upload properties & settings to data: */ @@ -300,8 +300,8 @@ { /* Get old extension data from the cache: */ - const UIDataSettingsGlobalExtension &oldData = m_pCache->base(); + const UIDataSettingsGlobalExtension &oldExtensionData = m_pCache->base(); /* Load old extension data from the cache: */ - foreach (const UIDataSettingsGlobalExtensionItem &item, oldData.m_items) + foreach (const UIDataSettingsGlobalExtensionItem &item, oldExtensionData.m_items) new UIExtensionPackageItem(m_pPackagesTree, item); /* If at least one item present: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp (revision 66567) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp (revision 66568) @@ -86,13 +86,13 @@ /* Prepare old general data: */ - UIDataSettingsGlobalGeneral oldData; + UIDataSettingsGlobalGeneral oldGeneralData; /* Gather old general data: */ - oldData.m_strDefaultMachineFolder = m_properties.GetDefaultMachineFolder(); - oldData.m_strVRDEAuthLibrary = m_properties.GetVRDEAuthLibrary(); - oldData.m_fHostScreenSaverDisabled = m_settings.hostScreenSaverDisabled(); + oldGeneralData.m_strDefaultMachineFolder = m_properties.GetDefaultMachineFolder(); + oldGeneralData.m_strVRDEAuthLibrary = m_properties.GetVRDEAuthLibrary(); + oldGeneralData.m_fHostScreenSaverDisabled = m_settings.hostScreenSaverDisabled(); /* Cache old general data: */ - m_pCache->cacheInitialData(oldData); + m_pCache->cacheInitialData(oldGeneralData); /* Upload properties & settings to data: */ @@ -103,10 +103,10 @@ { /* Get old general data from the cache: */ - const UIDataSettingsGlobalGeneral &oldData = m_pCache->base(); + const UIDataSettingsGlobalGeneral &oldGeneralData = m_pCache->base(); /* Load old general data from the cache: */ - m_pSelectorMachineFolder->setPath(oldData.m_strDefaultMachineFolder); - m_pSelectorVRDPLibName->setPath(oldData.m_strVRDEAuthLibrary); - m_pCheckBoxHostScreenSaver->setChecked(oldData.m_fHostScreenSaverDisabled); + m_pSelectorMachineFolder->setPath(oldGeneralData.m_strDefaultMachineFolder); + m_pSelectorVRDPLibName->setPath(oldGeneralData.m_strVRDEAuthLibrary); + m_pCheckBoxHostScreenSaver->setChecked(oldGeneralData.m_fHostScreenSaverDisabled); } @@ -114,13 +114,13 @@ { /* Prepare new general data: */ - UIDataSettingsGlobalGeneral newData = m_pCache->base(); + UIDataSettingsGlobalGeneral newGeneralData = m_pCache->base(); /* Gather new general data: */ - newData.m_strDefaultMachineFolder = m_pSelectorMachineFolder->path(); - newData.m_strVRDEAuthLibrary = m_pSelectorVRDPLibName->path(); - newData.m_fHostScreenSaverDisabled = m_pCheckBoxHostScreenSaver->isChecked(); + newGeneralData.m_strDefaultMachineFolder = m_pSelectorMachineFolder->path(); + newGeneralData.m_strVRDEAuthLibrary = m_pSelectorVRDPLibName->path(); + newGeneralData.m_fHostScreenSaverDisabled = m_pCheckBoxHostScreenSaver->isChecked(); /* Cache new general data: */ - m_pCache->cacheCurrentData(newData); + m_pCache->cacheCurrentData(newGeneralData); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp (revision 66567) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp (revision 66568) @@ -889,8 +889,8 @@ /* Prepare old input data: */ - UIDataSettingsGlobalInput oldData; + UIDataSettingsGlobalInput oldInputData; /* Gather old input data: */ - oldData.shortcuts() << UIDataShortcutRow(m_pMachineTable, UIHostCombo::hostComboCacheKey(), tr("Host Key Combination"), m_settings.hostCombo(), QString()); + oldInputData.shortcuts() << UIDataShortcutRow(m_pMachineTable, UIHostCombo::hostComboCacheKey(), tr("Host Key Combination"), m_settings.hostCombo(), QString()); const QMap &shortcuts = gShortcutPool->shortcuts(); const QList shortcutKeys = shortcuts.keys(); @@ -901,12 +901,12 @@ strShortcutKey.startsWith(GUI_Input_SelectorShortcuts) ? m_pSelectorTable : 0; AssertPtr(pParent); - oldData.shortcuts() << UIDataShortcutRow(pParent, strShortcutKey, VBoxGlobal::removeAccelMark(shortcut.description()), + oldInputData.shortcuts() << UIDataShortcutRow(pParent, strShortcutKey, VBoxGlobal::removeAccelMark(shortcut.description()), shortcut.sequence().toString(QKeySequence::NativeText), shortcut.defaultSequence().toString(QKeySequence::NativeText)); } - oldData.setAutoCapture(m_settings.autoCapture()); + oldInputData.setAutoCapture(m_settings.autoCapture()); /* Cache old input data: */ - m_pCache->cacheInitialData(oldData); + m_pCache->cacheInitialData(oldInputData); /* Upload properties & settings to data: */ @@ -917,10 +917,10 @@ { /* Get old input data from the cache: */ - const UIDataSettingsGlobalInput &oldData = m_pCache->base(); + const UIDataSettingsGlobalInput &oldInputData = m_pCache->base(); /* Load old input data from the cache: */ - m_pSelectorModel->load(oldData.shortcuts()); - m_pMachineModel->load(oldData.shortcuts()); - m_pEnableAutoGrabCheckbox->setChecked(oldData.autoCapture()); + m_pSelectorModel->load(oldInputData.shortcuts()); + m_pMachineModel->load(oldInputData.shortcuts()); + m_pEnableAutoGrabCheckbox->setChecked(oldInputData.autoCapture()); /* Revalidate: */ @@ -931,13 +931,13 @@ { /* Prepare new input data: */ - UIDataSettingsGlobalInput newData = m_pCache->base(); + UIDataSettingsGlobalInput newInputData = m_pCache->base(); /* Gather new input data: */ - m_pSelectorModel->save(newData.shortcuts()); - m_pMachineModel->save(newData.shortcuts()); - newData.setAutoCapture(m_pEnableAutoGrabCheckbox->isChecked()); + m_pSelectorModel->save(newInputData.shortcuts()); + m_pMachineModel->save(newInputData.shortcuts()); + newInputData.setAutoCapture(m_pEnableAutoGrabCheckbox->isChecked()); /* Cache new input data: */ - m_pCache->cacheCurrentData(newData); + m_pCache->cacheCurrentData(newInputData); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp (revision 66567) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp (revision 66568) @@ -228,11 +228,11 @@ /* Prepare old language data: */ - UIDataSettingsGlobalLanguage oldData; + UIDataSettingsGlobalLanguage oldLanguageData; /* Gather old language data: */ - oldData.m_strLanguageId = m_settings.languageId(); + oldLanguageData.m_strLanguageId = m_settings.languageId(); /* Cache old language data: */ - m_pCache->cacheInitialData(oldData); + m_pCache->cacheInitialData(oldLanguageData); /* Upload properties & settings to data: */ @@ -243,8 +243,8 @@ { /* Get old language data from the cache: */ - const UIDataSettingsGlobalLanguage &oldData = m_pCache->base(); + const UIDataSettingsGlobalLanguage &oldLanguageData = m_pCache->base(); /* Load old language data from the cache: */ - reloadLanguageTree(oldData.m_strLanguageId); + reloadLanguageTree(oldLanguageData.m_strLanguageId); } @@ -252,5 +252,5 @@ { /* Prepare new language data: */ - UIDataSettingsGlobalLanguage newData = m_pCache->base(); + UIDataSettingsGlobalLanguage newInputData = m_pCache->base(); /* Gather new language data: */ @@ -258,8 +258,8 @@ Assert(pCurrentItem); if (pCurrentItem) - newData.m_strLanguageId = pCurrentItem->text(1); + newInputData.m_strLanguageId = pCurrentItem->text(1); /* Cache new language data: */ - m_pCache->cacheCurrentData(newData); + m_pCache->cacheCurrentData(newInputData); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp (revision 66567) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp (revision 66568) @@ -444,5 +444,5 @@ /* Prepare old network data: */ - UIDataSettingsGlobalNetwork oldData; + UIDataSettingsGlobalNetwork oldNetworkData; /* Gather old network data: */ @@ -451,5 +451,5 @@ UIDataSettingsGlobalNetworkNAT data; loadDataNetworkNAT(network, data); - oldData.m_networksNAT << data; + oldNetworkData.m_networksNAT << data; } foreach (const CHostNetworkInterface &iface, vboxGlobal().host().GetNetworkInterfaces()) @@ -458,9 +458,9 @@ UIDataSettingsGlobalNetworkHost data; loadDataNetworkHost(iface, data); - oldData.m_networksHost << data; + oldNetworkData.m_networksHost << data; } /* Cache old network data: */ - m_pCache->cacheInitialData(oldData); + m_pCache->cacheInitialData(oldNetworkData); /* Upload properties & settings to data: */ @@ -471,13 +471,13 @@ { /* Get old network data from the cache: */ - const UIDataSettingsGlobalNetwork &oldData = m_pCache->base(); + const UIDataSettingsGlobalNetwork &oldNetworkData = m_pCache->base(); /* Load old network data from the cache: */ - foreach (const UIDataSettingsGlobalNetworkNAT &network, oldData.m_networksNAT) + foreach (const UIDataSettingsGlobalNetworkNAT &network, oldNetworkData.m_networksNAT) createTreeItemNetworkNAT(network); m_pTreeNetworkNAT->sortByColumn(1, Qt::AscendingOrder); m_pTreeNetworkNAT->setCurrentItem(m_pTreeNetworkNAT->topLevelItem(0)); sltHandleCurrentItemChangeNetworkNAT(); - foreach (const UIDataSettingsGlobalNetworkHost &network, oldData.m_networksHost) + foreach (const UIDataSettingsGlobalNetworkHost &network, oldNetworkData.m_networksHost) createTreeItemNetworkHost(network); m_pTreeNetworkHost->sortByColumn(0, Qt::AscendingOrder); @@ -492,8 +492,8 @@ { /* Prepare new network data: */ - UIDataSettingsGlobalNetwork newData = m_pCache->base(); + UIDataSettingsGlobalNetwork newNetworkData = m_pCache->base(); /* Gather new network data: */ - newData.m_networksNAT.clear(); + newNetworkData.m_networksNAT.clear(); for (int iNetworkIndex = 0; iNetworkIndex < m_pTreeNetworkNAT->topLevelItemCount(); ++iNetworkIndex) { @@ -501,7 +501,7 @@ UIItemNetworkNAT *pItem = static_cast(m_pTreeNetworkNAT->topLevelItem(iNetworkIndex)); pItem->uploadNetworkData(data); - newData.m_networksNAT << data; - } - newData.m_networksHost.clear(); + newNetworkData.m_networksNAT << data; + } + newNetworkData.m_networksHost.clear(); for (int iNetworkIndex = 0; iNetworkIndex < m_pTreeNetworkHost->topLevelItemCount(); ++iNetworkIndex) { @@ -509,9 +509,9 @@ UIItemNetworkHost *pItem = static_cast(m_pTreeNetworkHost->topLevelItem(iNetworkIndex)); pItem->uploadNetworkData(data); - newData.m_networksHost << data; + newNetworkData.m_networksHost << data; } /* Cache new network data: */ - m_pCache->cacheCurrentData(newData); + m_pCache->cacheCurrentData(newNetworkData); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp (revision 66567) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp (revision 66568) @@ -87,14 +87,14 @@ /* Prepare old proxy data: */ - UIDataSettingsGlobalProxy oldData; + UIDataSettingsGlobalProxy oldProxyData; /* Gather old proxy data: */ UIProxyManager proxyManager(m_settings.proxySettings()); - oldData.m_enmProxyState = proxyManager.proxyState(); - oldData.m_strProxyHost = proxyManager.proxyHost(); - oldData.m_strProxyPort = proxyManager.proxyPort(); + oldProxyData.m_enmProxyState = proxyManager.proxyState(); + oldProxyData.m_strProxyHost = proxyManager.proxyHost(); + oldProxyData.m_strProxyPort = proxyManager.proxyPort(); /* Cache old proxy data: */ - m_pCache->cacheInitialData(oldData); + m_pCache->cacheInitialData(oldProxyData); /* Upload properties & settings to data: */ @@ -105,8 +105,8 @@ { /* Get old proxy data from the cache: */ - const UIDataSettingsGlobalProxy &oldData = m_pCache->base(); + const UIDataSettingsGlobalProxy &oldProxyData = m_pCache->base(); /* Load old proxy data from the cache: */ - switch (oldData.m_enmProxyState) + switch (oldProxyData.m_enmProxyState) { case UIProxyManager::ProxyState_Auto: m_pRadioProxyAuto->setChecked(true); break; @@ -114,6 +114,6 @@ case UIProxyManager::ProxyState_Enabled: m_pRadioProxyEnabled->setChecked(true); break; } - m_pHostEditor->setText(oldData.m_strProxyHost); - m_pPortEditor->setText(oldData.m_strProxyPort); + m_pHostEditor->setText(oldProxyData.m_strProxyHost); + m_pPortEditor->setText(oldProxyData.m_strProxyPort); sltHandleProxyToggle(); @@ -125,15 +125,15 @@ { /* Prepare new proxy data: */ - UIDataSettingsGlobalProxy newData = m_pCache->base(); + UIDataSettingsGlobalProxy newProxyData = m_pCache->base(); /* Gather new proxy data: */ - newData.m_enmProxyState = m_pRadioProxyEnabled->isChecked() ? UIProxyManager::ProxyState_Enabled : - m_pRadioProxyDisabled->isChecked() ? UIProxyManager::ProxyState_Disabled : - UIProxyManager::ProxyState_Auto; - newData.m_strProxyHost = m_pHostEditor->text(); - newData.m_strProxyPort = m_pPortEditor->text(); + newProxyData.m_enmProxyState = m_pRadioProxyEnabled->isChecked() ? UIProxyManager::ProxyState_Enabled : + m_pRadioProxyDisabled->isChecked() ? UIProxyManager::ProxyState_Disabled : + UIProxyManager::ProxyState_Auto; + newProxyData.m_strProxyHost = m_pHostEditor->text(); + newProxyData.m_strProxyPort = m_pPortEditor->text(); /* Cache new proxy data: */ - m_pCache->cacheCurrentData(newData); + m_pCache->cacheCurrentData(newProxyData); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp (revision 66567) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp (revision 66568) @@ -89,15 +89,15 @@ /* Prepare old update data: */ - UIDataSettingsGlobalUpdate oldData; + UIDataSettingsGlobalUpdate oldUpdateData; /* Gather old update data: */ const VBoxUpdateData updateData(gEDataManager->applicationUpdateData()); - oldData.m_fCheckEnabled = !updateData.isNoNeedToCheck(); - oldData.m_periodIndex = updateData.periodIndex(); - oldData.m_branchIndex = updateData.branchIndex(); - oldData.m_strDate = updateData.date(); + oldUpdateData.m_fCheckEnabled = !updateData.isNoNeedToCheck(); + oldUpdateData.m_periodIndex = updateData.periodIndex(); + oldUpdateData.m_branchIndex = updateData.branchIndex(); + oldUpdateData.m_strDate = updateData.date(); /* Cache old update data: */ - m_pCache->cacheInitialData(oldData); + m_pCache->cacheInitialData(oldUpdateData); /* Upload properties & settings to data: */ @@ -108,20 +108,20 @@ { /* Get old update data from the cache: */ - const UIDataSettingsGlobalUpdate &oldData = m_pCache->base(); + const UIDataSettingsGlobalUpdate &oldUpdateData = m_pCache->base(); /* Load old update data from the cache: */ - m_pCheckBoxUpdate->setChecked(oldData.m_fCheckEnabled); + m_pCheckBoxUpdate->setChecked(oldUpdateData.m_fCheckEnabled); if (m_pCheckBoxUpdate->isChecked()) { - m_pComboBoxUpdatePeriod->setCurrentIndex(oldData.m_periodIndex); - if (oldData.m_branchIndex == VBoxUpdateData::BranchWithBetas) + m_pComboBoxUpdatePeriod->setCurrentIndex(oldUpdateData.m_periodIndex); + if (oldUpdateData.m_branchIndex == VBoxUpdateData::BranchWithBetas) m_pRadioUpdateFilterBetas->setChecked(true); - else if (oldData.m_branchIndex == VBoxUpdateData::BranchAllRelease) + else if (oldUpdateData.m_branchIndex == VBoxUpdateData::BranchAllRelease) m_pRadioUpdateFilterEvery->setChecked(true); else m_pRadioUpdateFilterStable->setChecked(true); } - m_pUpdateDateText->setText(oldData.m_strDate); - sltHandleUpdateToggle(oldData.m_fCheckEnabled); + m_pUpdateDateText->setText(oldUpdateData.m_strDate); + sltHandleUpdateToggle(oldUpdateData.m_fCheckEnabled); } @@ -129,12 +129,12 @@ { /* Prepare new update data: */ - UIDataSettingsGlobalUpdate newData = m_pCache->base(); + UIDataSettingsGlobalUpdate newUpdateData = m_pCache->base(); /* Gather new update data: */ - newData.m_periodIndex = periodType(); - newData.m_branchIndex = branchType(); + newUpdateData.m_periodIndex = periodType(); + newUpdateData.m_branchIndex = branchType(); /* Cache new update data: */ - m_pCache->cacheCurrentData(newData); + m_pCache->cacheCurrentData(newUpdateData); }