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

6
src/plugins/help/generalsettingspage.cpp
View File

@@ -232,7 +232,7 @@ void GeneralSettingsPage::updateFontSizeSelector()
if (pointSizes.empty())
pointSizes = QFontDatabase::standardSizes();
bool blocked = m_ui->sizeComboBox->blockSignals(true);
QSignalBlocker blocker(m_ui->sizeComboBox);
m_ui->sizeComboBox->clear();
m_ui->sizeComboBox->setCurrentIndex(-1);
m_ui->sizeComboBox->setEnabled(!pointSizes.empty());
@@ -246,7 +246,6 @@ void GeneralSettingsPage::updateFontSizeSelector()
if (closestIndex != -1)
m_ui->sizeComboBox->setCurrentIndex(closestIndex);
}
m_ui->sizeComboBox->blockSignals(blocked);
}
void GeneralSettingsPage::updateFontStyleSelector()
@@ -254,7 +253,7 @@ void GeneralSettingsPage::updateFontStyleSelector()
const QString &fontStyle = m_fontDatabase.styleString(m_font);
const QStringList &styles = m_fontDatabase.styles(m_font.family());
bool blocked = m_ui->styleComboBox->blockSignals(true);
QSignalBlocker blocker(m_ui->styleComboBox);
m_ui->styleComboBox->clear();
m_ui->styleComboBox->setCurrentIndex(-1);
m_ui->styleComboBox->setEnabled(!styles.empty());
@@ -276,7 +275,6 @@ void GeneralSettingsPage::updateFontStyleSelector()
if (m_ui->styleComboBox->currentIndex() == -1 && normalIndex != -1)
m_ui->styleComboBox->setCurrentIndex(normalIndex);
}
m_ui->styleComboBox->blockSignals(blocked);
}
void GeneralSettingsPage::updateFontFamilySelector()