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

AbiWidget: Use blockSignals properly

Browse Source 
Change-Id: Idd0e0a4486d6d94194d3a144fc238b93128ecf6b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-11-04 15:30:56 +01:00
parent aaa287cc4d
commit 5dc857fcae
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/abiwidget.cpp
View File

@@ -146,7 +146,7 @@ AbiWidget::~AbiWidget()
void AbiWidget::setAbis(const QList<Abi> &abiList, const Abi &current) void AbiWidget::setAbis(const QList<Abi> &abiList, const Abi &current)
{ {
blockSignals(true); bool blocked = blockSignals(true);
d->m_abi->clear(); d->m_abi->clear();
d->m_abi->addItem(tr("<custom>"), QLatin1String("custom")); d->m_abi->addItem(tr("<custom>"), QLatin1String("custom"));
@@ -168,7 +168,7 @@ void AbiWidget::setAbis(const QList<Abi> &abiList, const Abi &current)
} }
modeChanged(); modeChanged();
blockSignals(false); blockSignals(blocked);
} }
Abi AbiWidget::currentAbi() const Abi AbiWidget::currentAbi() const
@@ -185,14 +185,14 @@ Abi AbiWidget::currentAbi() const
void AbiWidget::osChanged() void AbiWidget::osChanged()
{ {
d->m_osFlavorComboBox->blockSignals(true); bool blocked = d->m_osFlavorComboBox->blockSignals(true);
d->m_osFlavorComboBox->clear(); d->m_osFlavorComboBox->clear();
Abi::OS os = static_cast<Abi::OS>(d->m_osComboBox->itemData(d->m_osComboBox->currentIndex()).toInt()); Abi::OS os = static_cast<Abi::OS>(d->m_osComboBox->itemData(d->m_osComboBox->currentIndex()).toInt());
QList<Abi::OSFlavor> flavors = Abi::flavorsForOs(os); QList<Abi::OSFlavor> flavors = Abi::flavorsForOs(os);
foreach (Abi::OSFlavor f, flavors) foreach (Abi::OSFlavor f, flavors)
d->m_osFlavorComboBox->addItem(Abi::toString(f), static_cast<int>(f)); d->m_osFlavorComboBox->addItem(Abi::toString(f), static_cast<int>(f));
d->m_osFlavorComboBox->setCurrentIndex(0); // default to generic flavor d->m_osFlavorComboBox->setCurrentIndex(0); // default to generic flavor
d->m_osFlavorComboBox->blockSignals(false); d->m_osFlavorComboBox->blockSignals(blocked);
emit abiChanged(); emit abiChanged();
} }