From 5dc857fcaecaa5393d9b9cedaaecf5102e617ee5 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 4 Nov 2013 15:30:56 +0100 Subject: [PATCH] AbiWidget: Use blockSignals properly Change-Id: Idd0e0a4486d6d94194d3a144fc238b93128ecf6b Reviewed-by: Daniel Teske --- src/plugins/projectexplorer/abiwidget.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/projectexplorer/abiwidget.cpp b/src/plugins/projectexplorer/abiwidget.cpp index 062edf1899f..ed2f8926dd0 100644 --- a/src/plugins/projectexplorer/abiwidget.cpp +++ b/src/plugins/projectexplorer/abiwidget.cpp @@ -146,7 +146,7 @@ AbiWidget::~AbiWidget() void AbiWidget::setAbis(const QList &abiList, const Abi ¤t) { - blockSignals(true); + bool blocked = blockSignals(true); d->m_abi->clear(); d->m_abi->addItem(tr(""), QLatin1String("custom")); @@ -168,7 +168,7 @@ void AbiWidget::setAbis(const QList &abiList, const Abi ¤t) } modeChanged(); - blockSignals(false); + blockSignals(blocked); } Abi AbiWidget::currentAbi() const @@ -185,14 +185,14 @@ Abi AbiWidget::currentAbi() const void AbiWidget::osChanged() { - d->m_osFlavorComboBox->blockSignals(true); + bool blocked = d->m_osFlavorComboBox->blockSignals(true); d->m_osFlavorComboBox->clear(); Abi::OS os = static_cast(d->m_osComboBox->itemData(d->m_osComboBox->currentIndex()).toInt()); QList flavors = Abi::flavorsForOs(os); foreach (Abi::OSFlavor f, flavors) d->m_osFlavorComboBox->addItem(Abi::toString(f), static_cast(f)); d->m_osFlavorComboBox->setCurrentIndex(0); // default to generic flavor - d->m_osFlavorComboBox->blockSignals(false); + d->m_osFlavorComboBox->blockSignals(blocked); emit abiChanged(); }