diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2017-09-30 07:12:57 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2017-10-04 09:35:06 +0000 |
| commit | c330cf067959b1919fd2d75a5e3797e0e64cc9fc (patch) | |
| tree | 7ccfef4b8841efde06cdffce7708c8f4e0ec156b /src/plugins/vcsbase/vcsbaseeditorconfig.cpp | |
| parent | 7c3ea5a78c30c90d6ce250aa312a2cb6cc587901 (diff) | |
Replace manual signal blocking/unblocking with QSignalBlocker
Change-Id: Ibb59fab4e37d045e506c5a8172b6f5cbb955b028
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseeditorconfig.cpp')
| -rw-r--r-- | src/plugins/vcsbase/vcsbaseeditorconfig.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/vcsbase/vcsbaseeditorconfig.cpp b/src/plugins/vcsbase/vcsbaseeditorconfig.cpp index 80e9d9bb08..1c0d70f4e6 100644 --- a/src/plugins/vcsbase/vcsbaseeditorconfig.cpp +++ b/src/plugins/vcsbase/vcsbaseeditorconfig.cpp @@ -181,9 +181,8 @@ void VcsBaseEditorConfig::mapSetting(QAction *button, bool *setting) if (!d->m_settingMapping.contains(button) && button) { d->m_settingMapping.insert(button, Internal::SettingMappingData(setting)); if (setting) { - button->blockSignals(true); + QSignalBlocker blocker(button); button->setChecked(*setting); - button->blockSignals(false); } } } @@ -193,11 +192,10 @@ void VcsBaseEditorConfig::mapSetting(QComboBox *comboBox, QString *setting) if (!d->m_settingMapping.contains(comboBox) && comboBox) { d->m_settingMapping.insert(comboBox, Internal::SettingMappingData(setting)); if (setting) { - comboBox->blockSignals(true); + QSignalBlocker blocker(comboBox); const int itemIndex = comboBox->findData(*setting); if (itemIndex != -1) comboBox->setCurrentIndex(itemIndex); - comboBox->blockSignals(false); } } } @@ -212,9 +210,8 @@ void VcsBaseEditorConfig::mapSetting(QComboBox *comboBox, int *setting) if (!setting || *setting < 0 || *setting >= comboBox->count()) return; - comboBox->blockSignals(true); + QSignalBlocker blocker(comboBox); comboBox->setCurrentIndex(*setting); - comboBox->blockSignals(false); } void VcsBaseEditorConfig::handleArgumentsChanged() |