feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Replace manual signal blocking/unblocking with QSignalBlocker

Browse Source 
Change-Id: Ibb59fab4e37d045e506c5a8172b6f5cbb955b028
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2017-09-30 07:12:57 +02:00
parent 7c3ea5a78c
commit c330cf0679
39 changed files with 195 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/plugins/ios/iosbuildsettingswidget.cpp
View File

@@ -166,17 +166,18 @@ void IosBuildSettingsWidget::configureSigningUi(bool autoManageSigning)
void IosBuildSettingsWidget::populateDevelopmentTeams()
{
// Populate Team id's
ui->m_signEntityCombo->blockSignals(true);
ui->m_signEntityCombo->clear();
ui->m_signEntityCombo->addItem(tr("Default"));
foreach (auto team, IosConfigurations::developmentTeams()) {
ui->m_signEntityCombo->addItem(team->displayName());
const int index = ui->m_signEntityCombo->count() - 1;
ui->m_signEntityCombo->setItemData(index, team->identifier(), IdentifierRole);
ui->m_signEntityCombo->setItemData(index, team->details(), Qt::ToolTipRole);
{
QSignalBlocker blocker(ui->m_signEntityCombo);
// Populate Team id's
ui->m_signEntityCombo->clear();
ui->m_signEntityCombo->addItem(tr("Default"));
foreach (auto team, IosConfigurations::developmentTeams()) {
ui->m_signEntityCombo->addItem(team->displayName());
const int index = ui->m_signEntityCombo->count() - 1;
ui->m_signEntityCombo->setItemData(index, team->identifier(), IdentifierRole);
ui->m_signEntityCombo->setItemData(index, team->details(), Qt::ToolTipRole);
}
}
ui->m_signEntityCombo->blockSignals(false);
// Maintain previous selection.
setDefaultSigningIdentfier(m_lastTeamSelection);
updateWarningText();
@@ -184,21 +185,22 @@ void IosBuildSettingsWidget::populateDevelopmentTeams()
void IosBuildSettingsWidget::populateProvisioningProfiles()
{
// Populate Team id's
ui->m_signEntityCombo->blockSignals(true);
ui->m_signEntityCombo->clear();
ProvisioningProfiles profiles = IosConfigurations::provisioningProfiles();
if (profiles.count() > 0) {
foreach (auto profile, profiles) {
ui->m_signEntityCombo->addItem(profile->displayName());
const int index = ui->m_signEntityCombo->count() - 1;
ui->m_signEntityCombo->setItemData(index, profile->identifier(), IdentifierRole);
ui->m_signEntityCombo->setItemData(index, profile->details(), Qt::ToolTipRole);
{
// Populate Team id's
QSignalBlocker blocker(ui->m_signEntityCombo);
ui->m_signEntityCombo->clear();
ProvisioningProfiles profiles = IosConfigurations::provisioningProfiles();
if (profiles.count() > 0) {
foreach (auto profile, profiles) {
ui->m_signEntityCombo->addItem(profile->displayName());
const int index = ui->m_signEntityCombo->count() - 1;
ui->m_signEntityCombo->setItemData(index, profile->identifier(), IdentifierRole);
ui->m_signEntityCombo->setItemData(index, profile->details(), Qt::ToolTipRole);
}
} else {
ui->m_signEntityCombo->addItem(tr("None"));
}
} else {
ui->m_signEntityCombo->addItem(tr("None"));
}
ui->m_signEntityCombo->blockSignals(false);
// Maintain previous selection.
setDefaultSigningIdentfier(m_lastProfileSelection);
updateWarningText();