Replace manual signal blocking/unblocking with QSignalBlocker

Change-Id: Ibb59fab4e37d045e506c5a8172b6f5cbb955b028
Reviewed-by: Tim Jenssen <[email protected]>
Reviewed-by: Eike Ziller <[email protected]>

39 files changed, 193 insertions, 224 deletions

diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp
index 23beaf61abb..f1d1bccf9c0 100644
--- a/src/libs/qmleditorwidgets/contextpanewidget.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp
@@ -493,9 +493,8 @@ void ContextPaneWidget::setPinButton()
 
     pinnedChanged(true);
     if (m_resetAction) {
-        m_resetAction->blockSignals(true);
+        QSignalBlocker blocker(m_resetAction);
         m_resetAction->setChecked(true);
-        m_resetAction->blockSignals(false);
     }
 }
 
@@ -511,9 +510,8 @@ void ContextPaneWidget::setLineButton()
 
     pinnedChanged(false);
     if (m_resetAction) {
-        m_resetAction->blockSignals(true);
+        QSignalBlocker blocker(m_resetAction);
         m_resetAction->setChecked(false);
-        m_resetAction->blockSignals(false);
     }
 }
 
diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp
index 17455f45f17..87bd414139c 100644
--- a/src/libs/utils/fancylineedit.cpp
+++ b/src/libs/utils/fancylineedit.cpp
@@ -478,14 +478,13 @@ void FancyLineEdit::validate()
         if (validHasChanged)
             emit validChanged(newState == Valid);
     }
-    bool block = blockSignals(true);
     const QString fixedString = fixInputString(t);
     if (t != fixedString) {
         const int cursorPos = cursorPosition();
+        QSignalBlocker blocker(this);
         setText(fixedString);
         setCursorPosition(qMin(cursorPos, fixedString.length()));
     }
-    blockSignals(block);
 
     // Check buttons.
     if (d->m_oldText.isEmpty() || t.isEmpty()) {
diff --git a/src/plugins/baremetal/defaultgdbserverprovider.cpp b/src/plugins/baremetal/defaultgdbserverprovider.cpp
index f27a4b2d2ac..567b9369189 100644
--- a/src/plugins/baremetal/defaultgdbserverprovider.cpp
+++ b/src/plugins/baremetal/defaultgdbserverprovider.cpp
@@ -217,12 +217,11 @@ void DefaultGdbServerProviderConfigWidget::setFromProvider()
     const auto p = static_cast<DefaultGdbServerProvider *>(provider());
     Q_ASSERT(p);
 
-    const auto b = blockSignals(true);
+    QSignalBlocker blocker(this);
     m_hostWidget->setHost(p->m_host);
     m_hostWidget->setPort(p->m_port);
     m_initCommandsTextEdit->setPlainText(p->initCommands());
     m_resetCommandsTextEdit->setPlainText(p->resetCommands());
-    blockSignals(b);
 }
 
 } // namespace Internal
diff --git a/src/plugins/baremetal/gdbserverprovider.cpp b/src/plugins/baremetal/gdbserverprovider.cpp
index afcce6dcaee..2d3ed63d039 100644
--- a/src/plugins/baremetal/gdbserverprovider.cpp
+++ b/src/plugins/baremetal/gdbserverprovider.cpp
@@ -355,10 +355,9 @@ void GdbServerProviderConfigWidget::clearErrorMessage()
 
 void GdbServerProviderConfigWidget::setFromProvider()
 {
-    const bool b = blockSignals(true);
+    QSignalBlocker blocker(this);
     m_nameLineEdit->setText(m_provider->displayName());
     setStartupMode(m_provider->startupMode());
-    blockSignals(b);
 }
 
 QString GdbServerProviderConfigWidget::defaultInitCommandsTooltip()
@@ -398,9 +397,8 @@ HostWidget::HostWidget(QWidget *parent)
 
 void HostWidget::setHost(const QString &host)
 {
-    const bool b = blockSignals(true);
+    QSignalBlocker blocker(this);
     m_hostLineEdit->setText(host);
-    blockSignals(b);
 }
 
 QString HostWidget::host() const
@@ -410,9 +408,8 @@ QString HostWidget::host() const
 
 void HostWidget::setPort(const quint16 &port)
 {
-    const bool b = blockSignals(true);
+    QSignalBlocker blocker(this);
     m_portSpinBox->setValue(port);
-    blockSignals(b);
 }
 
 quint16 HostWidget::port() const
diff --git a/src/plugins/baremetal/gdbserverproviderchooser.cpp b/src/plugins/baremetal/gdbserverproviderchooser.cpp
index ba91637683a..043d71bd2f0 100644
--- a/src/plugins/baremetal/gdbserverproviderchooser.cpp
+++ b/src/plugins/baremetal/gdbserverproviderchooser.cpp
@@ -101,7 +101,7 @@ QString GdbServerProviderChooser::providerText(const GdbServerProvider *provider
 
 void GdbServerProviderChooser::populate()
 {
-    const bool b = m_chooser->blockSignals(true);
+    QSignalBlocker blocker(m_chooser);
     m_chooser->clear();
     m_chooser->addItem(tr("None"));
 
@@ -110,7 +110,6 @@ void GdbServerProviderChooser::populate()
             continue;
         m_chooser->addItem(providerText(p), qVariantFromValue(p->id()));
     }
-    m_chooser->blockSignals(b);
 }
 
 } // namespace Internal
diff --git a/src/plugins/baremetal/openocdgdbserverprovider.cpp b/src/plugins/baremetal/openocdgdbserverprovider.cpp
index cca6d9964f9..0e21b9d0b3c 100644
--- a/src/plugins/baremetal/openocdgdbserverprovider.cpp
+++ b/src/plugins/baremetal/openocdgdbserverprovider.cpp
@@ -350,7 +350,7 @@ void OpenOcdGdbServerProviderConfigWidget::setFromProvider()
     const auto p = static_cast<OpenOcdGdbServerProvider *>(provider());
     Q_ASSERT(p);
 
-    const bool b = blockSignals(true);
+    QSignalBlocker blocker(this);
     startupModeChanged();
     m_hostWidget->setHost(p->m_host);
     m_hostWidget->setPort(p->m_port);
@@ -360,7 +360,6 @@ void OpenOcdGdbServerProviderConfigWidget::setFromProvider()
     m_additionalArgumentsLineEdit->setText(p->m_additionalArguments);
     m_initCommandsTextEdit->setPlainText(p->initCommands());
     m_resetCommandsTextEdit->setPlainText(p->resetCommands());
-    blockSignals(b);
 }
 
 } // namespace Internal
diff --git a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp
index caa946fe266..ada59255fd0 100644
--- a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp
+++ b/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp
@@ -391,7 +391,7 @@ void StLinkUtilGdbServerProviderConfigWidget::setFromProvider()
     const auto p = static_cast<StLinkUtilGdbServerProvider *>(provider());
     Q_ASSERT(p);
 
-    const bool b = blockSignals(true);
+    QSignalBlocker blocker(this);
     startupModeChanged();
     m_hostWidget->setHost(p->m_host);
     m_hostWidget->setPort(p->m_port);
@@ -402,7 +402,6 @@ void StLinkUtilGdbServerProviderConfigWidget::setFromProvider()
     setTransportLayer(p->m_transport);
     m_initCommandsTextEdit->setPlainText(p->initCommands());
     m_resetCommandsTextEdit->setPlainText(p->resetCommands());
-    blockSignals(b);
 }
 
 } // namespace Internal
diff --git a/src/plugins/beautifier/configurationpanel.cpp b/src/plugins/beautifier/configurationpanel.cpp
index 102b8763766..1e5a8dfaa9f 100644
--- a/src/plugins/beautifier/configurationpanel.cpp
+++ b/src/plugins/beautifier/configurationpanel.cpp
@@ -105,7 +105,7 @@ void ConfigurationPanel::edit()
 
 void ConfigurationPanel::populateConfigurations(const QString &key)
 {
-    const bool block = ui->configurations->blockSignals(true);
+    QSignalBlocker blocker(ui->configurations);
     const QString currentText = (!key.isEmpty()) ? key : ui->configurations->currentText();
     ui->configurations->clear();
     ui->configurations->addItems(m_settings->styles());
@@ -113,7 +113,6 @@ void ConfigurationPanel::populateConfigurations(const QString &key)
     if (textIndex != -1)
         ui->configurations->setCurrentIndex(textIndex);
     updateButtons();
-    ui->configurations->blockSignals(block);
 }
 
 void ConfigurationPanel::updateButtons()
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index d512c5138bc..5eea51739d3 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -507,48 +507,50 @@ QString CMakeBuildStepConfigWidget::displayName() const
 
 void CMakeBuildStepConfigWidget::buildTargetsChanged()
 {
-    const bool wasBlocked = m_buildTargetsList->blockSignals(true);
-    m_buildTargetsList->clear();
+    {
+        QSignalBlocker blocker(m_buildTargetsList);
+        m_buildTargetsList->clear();
 
-    auto pro = static_cast<CMakeProject *>(m_buildStep->project());
-    QStringList targetList = pro->buildTargetTitles();
-    targetList.sort();
+        auto pro = static_cast<CMakeProject *>(m_buildStep->project());
+        QStringList targetList = pro->buildTargetTitles();
+        targetList.sort();
 
-    QFont italics;
-    italics.setItalic(true);
+        QFont italics;
+        italics.setItalic(true);
 
-    auto exeItem = new QListWidgetItem(tr(ADD_RUNCONFIGURATION_TEXT), m_buildTargetsList);
-    exeItem->setData(Qt::UserRole, ADD_RUNCONFIGURATION_TEXT);
+        auto exeItem = new QListWidgetItem(tr(ADD_RUNCONFIGURATION_TEXT), m_buildTargetsList);
+        exeItem->setData(Qt::UserRole, ADD_RUNCONFIGURATION_TEXT);
 
-    foreach (const QString &buildTarget, targetList) {
-        auto item = new QListWidgetItem(buildTarget, m_buildTargetsList);
-        item->setData(Qt::UserRole, buildTarget);
-    }
+        foreach (const QString &buildTarget, targetList) {
+            auto item = new QListWidgetItem(buildTarget, m_buildTargetsList);
+            item->setData(Qt::UserRole, buildTarget);
+        }
 
-    for (int i = 0; i < m_buildTargetsList->count(); ++i) {
-        QListWidgetItem *item = m_buildTargetsList->item(i);
-        const QString title = item->data(Qt::UserRole).toString();
+        for (int i = 0; i < m_buildTargetsList->count(); ++i) {
+            QListWidgetItem *item = m_buildTargetsList->item(i);
+            const QString title = item->data(Qt::UserRole).toString();
 
-        item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
-        item->setCheckState(m_buildStep->buildsBuildTarget(title) ? Qt::Checked : Qt::Unchecked);
+            item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
+            item->setCheckState(m_buildStep->buildsBuildTarget(title) ? Qt::Checked : Qt::Unchecked);
 
-        // Print utility targets in italics:
-        if (CMakeBuildStep::specialTargets().contains(title) || title == ADD_RUNCONFIGURATION_TEXT)
-            item->setFont(italics);
+            // Print utility targets in italics:
+            if (CMakeBuildStep::specialTargets().contains(title) || title == ADD_RUNCONFIGURATION_TEXT)
+                item->setFont(italics);
+        }
     }
-    m_buildTargetsList->blockSignals(wasBlocked);
     updateDetails();
 }
 
 void CMakeBuildStepConfigWidget::selectedBuildTargetsChanged()
 {
-    const bool wasBlocked = m_buildTargetsList->blockSignals(true);
-    for (int y = 0; y < m_buildTargetsList->count(); ++y) {
-        QListWidgetItem *item = m_buildTargetsList->item(y);
-        item->setCheckState(m_buildStep->buildsBuildTarget(item->data(Qt::UserRole).toString())
-                            ? Qt::Checked : Qt::Unchecked);
+    {
+        QSignalBlocker blocker(m_buildTargetsList);
+        for (int y = 0; y < m_buildTargetsList->count(); ++y) {
+            QListWidgetItem *item = m_buildTargetsList->item(y);
+            item->setCheckState(m_buildStep->buildsBuildTarget(item->data(Qt::UserRole).toString())
+                                ? Qt::Checked : Qt::Unchecked);
+        }
     }
-    m_buildTargetsList->blockSignals(wasBlocked);
     updateDetails();
 }
 
diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
index 45d18d48f98..6f022a621b6 100644
--- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
+++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
@@ -550,9 +550,10 @@ void ExternalToolConfig::showInfoForItem(const QModelIndex &index)
     ui->modifiesDocumentCheckbox->setChecked(tool->modifiesCurrentDocument());
     m_environment = tool->environment();
 
-    bool blocked = ui->inputText->blockSignals(true);
-    ui->inputText->setPlainText(tool->input());
-    ui->inputText->blockSignals(blocked);
+    {
+        QSignalBlocker blocker(ui->inputText);
+        ui->inputText->setPlainText(tool->input());
+    }
 
     ui->description->setCursorPosition(0);
     ui->arguments->setCursorPosition(0);
diff --git a/src/plugins/coreplugin/find/findplugin.cpp b/src/plugins/coreplugin/find/findplugin.cpp
index 7509d5c0df9..3ae5ce0e500 100644
--- a/src/plugins/coreplugin/find/findplugin.cpp
+++ b/src/plugins/coreplugin/find/findplugin.cpp
@@ -301,13 +301,14 @@ void FindPrivate::readSettings()
 {
     QSettings *settings = ICore::settings();
     settings->beginGroup(QLatin1String("Find"));
-    bool block = m_instance->blockSignals(true);
-    Find::setBackward(settings->value(QLatin1String("Backward"), false).toBool());
-    Find::setCaseSensitive(settings->value(QLatin1String("CaseSensitively"), false).toBool());
-    Find::setWholeWord(settings->value(QLatin1String("WholeWords"), false).toBool());
-    Find::setRegularExpression(settings->value(QLatin1String("RegularExpression"), false).toBool());
-    Find::setPreserveCase(settings->value(QLatin1String("PreserveCase"), false).toBool());
-    m_instance->blockSignals(block);
+    {
+        QSignalBlocker blocker(m_instance);
+        Find::setBackward(settings->value(QLatin1String("Backward"), false).toBool());
+        Find::setCaseSensitive(settings->value(QLatin1String("CaseSensitively"), false).toBool());
+        Find::setWholeWord(settings->value(QLatin1String("WholeWords"), false).toBool());
+        Find::setRegularExpression(settings->value(QLatin1String("RegularExpression"), false).toBool());
+        Find::setPreserveCase(settings->value(QLatin1String("PreserveCase"), false).toBool());
+    }
     m_findCompletions = settings->value(QLatin1String("FindStrings")).toStringList();
     m_replaceCompletions = settings->value(QLatin1String("ReplaceStrings")).toStringList();
     m_findCompletionModel.setStringList(m_findCompletions);
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index 8b9016d8f29..ba619cfa309 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -637,9 +637,8 @@ void FindToolBar::putSelectionToFindClipboard()
 void FindToolBar::updateFromFindClipboard()
 {
     if (QApplication::clipboard()->supportsFindBuffer()) {
-        const bool blocks = m_ui.findEdit->blockSignals(true);
+        QSignalBlocker blocker(m_ui.findEdit);
         setFindText(QApplication::clipboard()->text(QClipboard::FindBuffer));
-        m_ui.findEdit->blockSignals(blocks);
     }
 }
 
diff --git a/src/plugins/coreplugin/sidebarwidget.cpp b/src/plugins/coreplugin/sidebarwidget.cpp
index 82c2e9ff4ad..7982214a37e 100644
--- a/src/plugins/coreplugin/sidebarwidget.cpp
+++ b/src/plugins/coreplugin/sidebarwidget.cpp
@@ -128,9 +128,8 @@ void SideBarWidget::setCurrentItem(const QString &id)
         if (idx < 0)
             idx = 0;
 
-        bool blocked = m_comboBox->blockSignals(true);
+        QSignalBlocker blocker(m_comboBox);
         m_comboBox->setCurrentIndex(idx);
-        m_comboBox->blockSignals(blocked);
     }
 
     SideBarItem *item = m_sideBar->item(id);
@@ -149,7 +148,7 @@ void SideBarWidget::setCurrentItem(const QString &id)
 
 void SideBarWidget::updateAvailableItems()
 {
-    bool blocked = m_comboBox->blockSignals(true);
+    QSignalBlocker blocker(m_comboBox);
     QString currentTitle = m_comboBox->currentText();
     m_comboBox->clear();
     QStringList titleList = m_sideBar->availableItemTitles();
@@ -167,7 +166,6 @@ void SideBarWidget::updateAvailableItems()
 
     m_comboBox->setCurrentIndex(idx);
     m_splitAction->setEnabled(titleList.count() > 1);
-    m_comboBox->blockSignals(blocked);
 }
 
 void SideBarWidget::removeCurrentItem()
diff --git a/src/plugins/cpptools/cppeditoroutline.cpp b/src/plugins/cpptools/cppeditoroutline.cpp
index 8bd16ac98b2..18d735050f0 100644
--- a/src/plugins/cpptools/cppeditoroutline.cpp
+++ b/src/plugins/cpptools/cppeditoroutline.cpp
@@ -155,9 +155,10 @@ void CppEditorOutline::setSorted(bool sort)
             m_proxyModel->sort(0, Qt::AscendingOrder);
         else
             m_proxyModel->sort(-1, Qt::AscendingOrder);
-        bool block = m_sortAction->blockSignals(true);
-        m_sortAction->setChecked(m_proxyModel->sortColumn() == 0);
-        m_sortAction->blockSignals(block);
+        {
+            QSignalBlocker blocker(m_sortAction);
+            m_sortAction->setChecked(m_proxyModel->sortColumn() == 0);
+        }
         updateIndexNow();
     }
 }
@@ -226,10 +227,9 @@ void CppEditorOutline::updateIndexNow()
     QModelIndex comboIndex = modelIndex();
 
     if (comboIndex.isValid()) {
-        bool blocked = m_combo->blockSignals(true);
+        QSignalBlocker blocker(m_combo);
         m_combo->setCurrentIndex(m_proxyModel->mapFromSource(comboIndex));
         updateToolTip();
-        m_combo->blockSignals(blocked);
     }
 }
 
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 5e378ac20c0..6e3e6bdd61e 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -645,12 +645,11 @@ public:
 
     void setThreadBoxContents(const QStringList &list, int index)
     {
-        const bool state = m_threadBox->blockSignals(true);
+        QSignalBlocker blocker(m_threadBox);
         m_threadBox->clear();
         foreach (const QString &item, list)
             m_threadBox->addItem(item);
         m_threadBox->setCurrentIndex(index);
-        m_threadBox->blockSignals(state);
     }
 
     RunControl *attachToRunningProcess(Kit *kit, DeviceProcessItem process, bool contAfterAttach);
diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp
index 12c33627709..63c250b74ac 100644
--- a/src/plugins/diffeditor/diffeditordocument.cpp
+++ b/src/plugins/diffeditor/diffeditordocument.cpp
@@ -339,10 +339,9 @@ void DiffEditorDocument::beginReload()
     emit aboutToReload();
     m_state = Reloading;
     emit changed();
-    const bool blocked = blockSignals(true);
+    QSignalBlocker blocker(this);
     setDiffFiles(QList<FileData>(), QString());
     setDescription(QString());
-    blockSignals(blocked);
 }
 
 void DiffEditorDocument::endReload(bool success)
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 5a914075a6d..0ec944f92e0 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -137,14 +137,15 @@ public:
                      int messageLevel, FakeVimHandler *eventFilter)
     {
         if (cursorPos != -1) {
-            m_edit->blockSignals(true);
-            m_label->clear();
-            m_edit->setText(contents);
-            if (anchorPos != -1 && anchorPos != cursorPos)
-                m_edit->setSelection(anchorPos, cursorPos - anchorPos);
-            else
-                m_edit->setCursorPosition(cursorPos);
-            m_edit->blockSignals(false);
+            {
+                QSignalBlocker blocker(m_edit);
+                m_label->clear();
+                m_edit->setText(contents);
+                if (anchorPos != -1 && anchorPos != cursorPos)
+                    m_edit->setSelection(anchorPos, cursorPos - anchorPos);
+                else
+                    m_edit->setCursorPosition(cursorPos);
+            }
             setCurrentWidget(m_edit);
             m_edit->setFocus();
         } else {
diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp
index d293373e0bb..21f39a7e4a6 100644
--- a/src/plugins/git/gerrit/gerritpushdialog.cpp
+++ b/src/plugins/git/gerrit/gerritpushdialog.cpp
@@ -223,43 +223,44 @@ void GerritPushDialog::storeTopic()
 
 void GerritPushDialog::setRemoteBranches(bool includeOld)
 {
-    bool blocked = m_ui->targetBranchComboBox->blockSignals(true);
-    m_ui->targetBranchComboBox->clear();
-
-    const QString remoteName = selectedRemoteName();
-    if (!m_remoteBranches.contains(remoteName)) {
-        const QStringList remoteBranches =
-                GitPlugin::client()->synchronousRepositoryBranches(remoteName, m_workingDir);
-        for (const QString &branch : remoteBranches)
-            m_remoteBranches.insertMulti(remoteName, qMakePair(branch, QDate()));
-        if (remoteBranches.isEmpty()) {
-            m_ui->targetBranchComboBox->setEditable(true);
-            m_ui->targetBranchComboBox->setToolTip(
-                        tr("No remote branches found. This is probably the initial commit."));
-            if (QLineEdit *lineEdit = m_ui->targetBranchComboBox->lineEdit())
-                lineEdit->setPlaceholderText(tr("Branch name"));
+    {
+        QSignalBlocker blocker(m_ui->targetBranchComboBox);
+        m_ui->targetBranchComboBox->clear();
+
+        const QString remoteName = selectedRemoteName();
+        if (!m_remoteBranches.contains(remoteName)) {
+            const QStringList remoteBranches =
+                    GitPlugin::client()->synchronousRepositoryBranches(remoteName, m_workingDir);
+            for (const QString &branch : remoteBranches)
+                m_remoteBranches.insertMulti(remoteName, qMakePair(branch, QDate()));
+            if (remoteBranches.isEmpty()) {
+                m_ui->targetBranchComboBox->setEditable(true);
+                m_ui->targetBranchComboBox->setToolTip(
+                            tr("No remote branches found. This is probably the initial commit."));
+                if (QLineEdit *lineEdit = m_ui->targetBranchComboBox->lineEdit())
+                    lineEdit->setPlaceholderText(tr("Branch name"));
+            }
         }
-    }
 
-    int i = 0;
-    bool excluded = false;
-    const QList<BranchDate> remoteBranches = m_remoteBranches.values(remoteName);
-    for (const BranchDate &bd : remoteBranches) {
-        const bool isSuggested = bd.first == m_suggestedRemoteBranch;
-        if (includeOld || isSuggested || !bd.second.isValid()
-                || bd.second.daysTo(QDate::currentDate()) <= Git::Constants::OBSOLETE_COMMIT_AGE_IN_DAYS) {
-            m_ui->targetBranchComboBox->addItem(bd.first);
-            if (isSuggested)
-                m_ui->targetBranchComboBox->setCurrentIndex(i);
-            ++i;
-        } else {
-            excluded = true;
+        int i = 0;
+        bool excluded = false;
+        const QList<BranchDate> remoteBranches = m_remoteBranches.values(remoteName);
+        for (const BranchDate &bd : remoteBranches) {
+            const bool isSuggested = bd.first == m_suggestedRemoteBranch;
+            if (includeOld || isSuggested || !bd.second.isValid()
+                    || bd.second.daysTo(QDate::currentDate()) <= Git::Constants::OBSOLETE_COMMIT_AGE_IN_DAYS) {
+                m_ui->targetBranchComboBox->addItem(bd.first);
+                if (isSuggested)
+                    m_ui->targetBranchComboBox->setCurrentIndex(i);
+                ++i;
+            } else {
+                excluded = true;
+            }
         }
+        if (excluded)
+            m_ui->targetBranchComboBox->addItem(tr("... Include older branches ..."), 1);
+        setChangeRange();
     }
-    if (excluded)
-        m_ui->targetBranchComboBox->addItem(tr("... Include older branches ..."), 1);
-    setChangeRange();
-    m_ui->targetBranchComboBox->blockSignals(blocked);
     validate();
 }
 
diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp
index 8001a8c9f01..9c5c7458cba 100644
--- a/src/plugins/help/generalsettingspage.cpp
+++ b/src/plugins/help/generalsettingspage.cpp
@@ -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()
diff --git a/src/plugins/imageviewer/exportdialog.cpp b/src/plugins/imageviewer/exportdialog.cpp
index b46b3da2398..778d90e9ecf 100644
--- a/src/plugins/imageviewer/exportdialog.cpp
+++ b/src/plugins/imageviewer/exportdialog.cpp
@@ -163,18 +163,16 @@ void ExportDialog::resetExportSize()
 void ExportDialog::setExportWidthBlocked(int width)
 {
     if (m_widthSpinBox->value() != width) {
-        const bool blockSignals = m_widthSpinBox->blockSignals(true);
+        QSignalBlocker blocker(m_widthSpinBox);
         m_widthSpinBox->setValue(width);
-        m_widthSpinBox->blockSignals(blockSignals);
     }
 }
 
 void ExportDialog::setExportHeightBlocked(int height)
 {
     if (m_heightSpinBox->value() != height) {
-        const bool blockSignals = m_heightSpinBox->blockSignals(true);
+        QSignalBlocker blocker(m_heightSpinBox);
         m_heightSpinBox->setValue(height);
-        m_heightSpinBox->blockSignals(blockSignals);
     }
 }
 
diff --git a/src/plugins/ios/iosbuildsettingswidget.cpp b/src/plugins/ios/iosbuildsettingswidget.cpp
index f5c61fea793..0068f10938e 100644
--- a/src/plugins/ios/iosbuildsettingswidget.cpp
+++ b/src/plugins/ios/iosbuildsettingswidget.cpp
@@ -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();
diff --git a/src/plugins/projectexplorer/abiwidget.cpp b/src/plugins/projectexplorer/abiwidget.cpp
index 5c7671f37f1..942e9b55ace 100644
--- a/src/plugins/projectexplorer/abiwidget.cpp
+++ b/src/plugins/projectexplorer/abiwidget.cpp
@@ -153,7 +153,7 @@ AbiWidget::~AbiWidget()
 
 void AbiWidget::setAbis(const QList<Abi> &abiList, const Abi &current)
 {
-    bool blocked = blockSignals(true);
+    QSignalBlocker blocker(this);
     d->m_abi->clear();
 
     Abi defaultAbi = current;
@@ -183,8 +183,6 @@ void AbiWidget::setAbis(const QList<Abi> &abiList, const Abi &current)
             setCustomAbi(current);
     }
     modeChanged();
-
-    blockSignals(blocked);
 }
 
 QList<Abi> AbiWidget::supportedAbis() const
@@ -208,14 +206,15 @@ Abi AbiWidget::currentAbi() const
 
 void AbiWidget::osChanged()
 {
-    bool blocked = d->m_osFlavorComboBox->blockSignals(true);
-    d->m_osFlavorComboBox->clear();
-    Abi::OS os = static_cast<Abi::OS>(d->m_osComboBox->itemData(d->m_osComboBox->currentIndex()).toInt());
-    QList<Abi::OSFlavor> flavors = Abi::flavorsForOs(os);
-    foreach (Abi::OSFlavor f, flavors)
-        d->m_osFlavorComboBox->addItem(Abi::toString(f), static_cast<int>(f));
-    d->m_osFlavorComboBox->setCurrentIndex(0); // default to generic flavor
-    d->m_osFlavorComboBox->blockSignals(blocked);
+    {
+        QSignalBlocker blocker(d->m_osFlavorComboBox);
+        d->m_osFlavorComboBox->clear();
+        Abi::OS os = static_cast<Abi::OS>(d->m_osComboBox->itemData(d->m_osComboBox->currentIndex()).toInt());
+        QList<Abi::OSFlavor> flavors = Abi::flavorsForOs(os);
+        foreach (Abi::OSFlavor f, flavors)
+            d->m_osFlavorComboBox->addItem(Abi::toString(f), static_cast<int>(f));
+        d->m_osFlavorComboBox->setCurrentIndex(0); // default to generic flavor
+    }
     customAbiChanged();
 }
 
@@ -248,26 +247,27 @@ void AbiWidget::customAbiChanged()
 
 void AbiWidget::setCustomAbi(const Abi &current)
 {
-    bool blocked = blockSignals(true);
-    d->m_architectureComboBox->setCurrentIndex(static_cast<int>(current.architecture()));
-    d->m_osComboBox->setCurrentIndex(static_cast<int>(current.os()));
-    osChanged();
-    for (int i = 0; i < d->m_osFlavorComboBox->count(); ++i) {
-        if (d->m_osFlavorComboBox->itemData(i).toInt() == current.osFlavor()) {
-            d->m_osFlavorComboBox->setCurrentIndex(i);
-            break;
+    {
+        QSignalBlocker blocker(this);
+        d->m_architectureComboBox->setCurrentIndex(static_cast<int>(current.architecture()));
+        d->m_osComboBox->setCurrentIndex(static_cast<int>(current.os()));
+        osChanged();
+        for (int i = 0; i < d->m_osFlavorComboBox->count(); ++i) {
+            if (d->m_osFlavorComboBox->itemData(i).toInt() == current.osFlavor()) {
+                d->m_osFlavorComboBox->setCurrentIndex(i);
+                break;
+            }
         }
-    }
-    d->m_binaryFormatComboBox->setCurrentIndex(static_cast<int>(current.binaryFormat()));
-    for (int i = 0; i < d->m_wordWidthComboBox->count(); ++i) {
-        if (d->m_wordWidthComboBox->itemData(i).toInt() == current.wordWidth()) {
-            d->m_wordWidthComboBox->setCurrentIndex(i);
-            break;
+        d->m_binaryFormatComboBox->setCurrentIndex(static_cast<int>(current.binaryFormat()));
+        for (int i = 0; i < d->m_wordWidthComboBox->count(); ++i) {
+            if (d->m_wordWidthComboBox->itemData(i).toInt() == current.wordWidth()) {
+                d->m_wordWidthComboBox->setCurrentIndex(i);
+                break;
+            }
         }
+        if (d->isCustom())
+            d->m_abi->setItemData(0, current.toString());
     }
-    if (d->isCustom())
-        d->m_abi->setItemData(0, current.toString());
-    blockSignals(blocked);
 
     emit abiChanged();
 }
diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp
index dc0989eed19..e6f03ec47d6 100644
--- a/src/plugins/projectexplorer/customtoolchain.cpp
+++ b/src/plugins/projectexplorer/customtoolchain.cpp
@@ -661,7 +661,7 @@ void CustomToolChainConfigWidget::applyImpl()
 void CustomToolChainConfigWidget::setFromToolchain()
 {
     // subwidgets are not yet connected!
-    bool blocked = blockSignals(true);
+    QSignalBlocker blocker(this);
     auto tc = static_cast<CustomToolChain *>(toolChain());
     m_compilerCommand->setFileName(tc->compilerCommand());
     m_makeCommand->setFileName(FileName::fromString(tc->makeCommand(Environment())));
@@ -673,7 +673,6 @@ void CustomToolChainConfigWidget::setFromToolchain()
     int index = m_errorParserComboBox->findData(tc->outputParserId().toSetting());
     m_errorParserComboBox->setCurrentIndex(index);
     m_customParserSettings = tc->customParserSettings();
-    blockSignals(blocked);
 }
 
 bool CustomToolChainConfigWidget::isDirtyImpl() const
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 6ebb8365e1d..ad02ca2ef68 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -1149,7 +1149,7 @@ void GccToolChainConfigWidget::applyImpl()
 void GccToolChainConfigWidget::setFromToolchain()
 {
     // subwidgets are not yet connected!
-    bool blocked = blockSignals(true);
+    QSignalBlocker blocker(this);
     auto tc = static_cast<GccToolChain *>(toolChain());
     m_compilerCommand->setFileName(tc->compilerCommand());
     m_platformCodeGenFlagsLineEdit->setText(QtcProcess::joinArgs(tc->platformCodeGenFlags()));
@@ -1157,7 +1157,6 @@ void GccToolChainConfigWidget::setFromToolchain()
     m_abiWidget->setAbis(tc->supportedAbis(), tc->targetAbi());
     if (!m_isReadOnly && !m_compilerCommand->path().isEmpty())
         m_abiWidget->setEnabled(true);
-    blockSignals(blocked);
 }
 
 bool GccToolChainConfigWidget::isDirtyImpl() const
diff --git a/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp b/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp
index e3659185866..dfec087a452 100644
--- a/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp
@@ -74,7 +74,7 @@ QWidget *ChangeStyleWidgetAction::createWidget(QWidget *parent)
         if (!comboBox)
             return;
 
-        bool block = comboBox->blockSignals(true);
+        QSignalBlocker blocker(comboBox);
 
         if (style.isEmpty()) { /* The .conf file is misssing. */
             comboBox->setDisabled(true);
@@ -85,8 +85,6 @@ QWidget *ChangeStyleWidgetAction::createWidget(QWidget *parent)
             comboBox->setToolTip(tr(enabledTooltip));
             comboBox->setEditText(style);
         }
-
-        comboBox->blockSignals(block);
     });
 
     connect(comboBox,
diff --git a/src/plugins/qmldesigner/components/integration/componentview.cpp b/src/plugins/qmldesigner/components/integration/componentview.cpp
index f341c1e31e4..e31b59d911a 100644
--- a/src/plugins/qmldesigner/components/integration/componentview.cpp
+++ b/src/plugins/qmldesigner/components/integration/componentview.cpp
@@ -160,22 +160,19 @@ void ComponentView::modelAttached(Model *model)
     if (AbstractView::model() == model)
         return;
 
-    bool block = m_componentAction->blockSignals(true);
+    QSignalBlocker blocker(m_componentAction);
     m_standardItemModel->clear();
 
     AbstractView::modelAttached(model);
 
     searchForComponentAndAddToList(rootModelNode());
-
-    m_componentAction->blockSignals(block);
 }
 
 void ComponentView::modelAboutToBeDetached(Model *model)
 {
-    bool block = m_componentAction->blockSignals(true);
+    QSignalBlocker blocker(m_componentAction);
     m_standardItemModel->clear();
     AbstractView::modelAboutToBeDetached(model);
-    m_componentAction->blockSignals(block);
 }
 
 ComponentAction *ComponentView::action()
diff --git a/src/plugins/qmldesigner/documentwarningwidget.cpp b/src/plugins/qmldesigner/documentwarningwidget.cpp
index a1f588559e8..91c4e55e12c 100644
--- a/src/plugins/qmldesigner/documentwarningwidget.cpp
+++ b/src/plugins/qmldesigner/documentwarningwidget.cpp
@@ -117,9 +117,10 @@ void DocumentWarningWidget::refreshContent()
         m_continueButton->setText(tr("OK"));
     } else {
         m_headerLabel->setText(tr("This QML file contains features which are not supported by Qt Quick Designer at:"));
-        bool block = m_ignoreWarningsCheckBox->blockSignals(true);
-        m_ignoreWarningsCheckBox->setChecked(!warningsEnabled());
-        m_ignoreWarningsCheckBox->blockSignals(block);
+        {
+            QSignalBlocker blocker(m_ignoreWarningsCheckBox);
+            m_ignoreWarningsCheckBox->setChecked(!warningsEnabled());
+        }
         m_ignoreWarningsCheckBox->show();
         m_continueButton->setText(tr("Ignore"));
     }
diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/addnewbackenddialog.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/addnewbackenddialog.cpp
index 1ba26dcfc8a..9de928ae906 100644
--- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/addnewbackenddialog.cpp
+++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/addnewbackenddialog.cpp
@@ -54,14 +54,13 @@ AddNewBackendDialog::~AddNewBackendDialog()
 
 void AddNewBackendDialog::setupPossibleTypes(const QList<CppTypeData> &types)
 {
-    bool block = blockSignals(true);
+    QSignalBlocker blocker(this);
     m_typeData = types;
     for (const CppTypeData &typeData : types)
         m_ui->comboBox->addItem(typeData.typeName);
 
     m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(m_ui->comboBox->count() > 0);
     invalidate();
-    blockSignals(block);
 }
 
 QString AddNewBackendDialog::importString() const
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 2164b724e1a..c4042d7d5d8 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -257,14 +257,12 @@ void QmlJSEditorWidget::updateOutlineIndexNow()
     emit outlineModelIndexChanged(m_outlineModelIndex);
 
     if (comboIndex.isValid()) {
-        bool blocked = m_outlineCombo->blockSignals(true);
+        QSignalBlocker blocker(m_outlineCombo);
 
         // There is no direct way to select a non-root item
         m_outlineCombo->setRootModelIndex(comboIndex.parent());
         m_outlineCombo->setCurrentIndex(comboIndex.row());
         m_outlineCombo->setRootModelIndex(QModelIndex());
-
-        m_outlineCombo->blockSignals(blocked);
     }
 }
 } // namespace Internal
diff --git a/src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp b/src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp
index 44f6a84d92b..7c41726c6ed 100644
--- a/src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp
@@ -85,14 +85,15 @@ int QmlProfilerNotesModel::addQmlNote(int typeId, int collapsedRow, qint64 start
 
 void QmlProfilerNotesModel::loadData()
 {
-    blockSignals(true);
-    for (int i = 0; i != m_notes.size(); ++i) {
-        QmlNote &note = m_notes[i];
-        note.setLoaded(addQmlNote(note.typeIndex(), note.collapsedRow(), note.startTime(),
-                                  note.duration(), note.text()) != -1);
+    {
+        QSignalBlocker blocker(this);
+        for (int i = 0; i != m_notes.size(); ++i) {
+            QmlNote &note = m_notes[i];
+            note.setLoaded(addQmlNote(note.typeIndex(), note.collapsedRow(), note.startTime(),
+                                      note.duration(), note.text()) != -1);
+        }
+        resetModified();
     }
-    resetModified();
-    blockSignals(false);
     emit changed(-1, -1, -1);
 }
 
diff --git a/src/plugins/qnx/qnxtoolchain.cpp b/src/plugins/qnx/qnxtoolchain.cpp
index 99a90c89a95..895346febe0 100644
--- a/src/plugins/qnx/qnxtoolchain.cpp
+++ b/src/plugins/qnx/qnxtoolchain.cpp
@@ -309,14 +309,13 @@ void QnxToolChainConfigWidget::applyImpl()
 void QnxToolChainConfigWidget::discardImpl()
 {
     // subwidgets are not yet connected!
-    bool blocked = blockSignals(true);
+    QSignalBlocker blocker(this);
     QnxToolChain *tc = static_cast<QnxToolChain *>(toolChain());
     m_compilerCommand->setFileName(tc->compilerCommand());
     m_sdpPath->setPath(tc->sdpPath());
     m_abiWidget->setAbis(tc->supportedAbis(), tc->targetAbi());
     if (!m_compilerCommand->path().isEmpty())
         m_abiWidget->setEnabled(true);
-    blockSignals(blocked);
 }
 
 bool QnxToolChainConfigWidget::isDirtyImpl() const
diff --git a/src/plugins/scxmleditor/common/navigatorslider.cpp b/src/plugins/scxmleditor/common/navigatorslider.cpp
index 53ed72cdfc4..7effd087eb3 100644
--- a/src/plugins/scxmleditor/common/navigatorslider.cpp
+++ b/src/plugins/scxmleditor/common/navigatorslider.cpp
@@ -51,7 +51,6 @@ void NavigatorSlider::zoomOut()
 
 void NavigatorSlider::setSliderValue(int val)
 {
-    m_ui.m_slider->blockSignals(true);
+    QSignalBlocker blocker(m_ui.m_slider);
     m_ui.m_slider->setValue(val);
-    m_ui.m_slider->blockSignals(false);
 }
diff --git a/src/plugins/scxmleditor/common/stateproperties.cpp b/src/plugins/scxmleditor/common/stateproperties.cpp
index 568336295f9..11d8ca005b3 100644
--- a/src/plugins/scxmleditor/common/stateproperties.cpp
+++ b/src/plugins/scxmleditor/common/stateproperties.cpp
@@ -193,8 +193,7 @@ void StateProperties::setContentVisibility(bool visible)
 void StateProperties::updateContent()
 {
     if (!m_contentEdit->hasFocus()) {
-        m_contentEdit->blockSignals(true);
+        QSignalBlocker blocker(m_contentEdit);
         m_contentEdit->setPlainText(content());
-        m_contentEdit->blockSignals(false);
     }
 }
diff --git a/src/plugins/scxmleditor/plugin_interface/textitem.cpp b/src/plugins/scxmleditor/plugin_interface/textitem.cpp
index f86bf03cfe6..812fd562b45 100644
--- a/src/plugins/scxmleditor/plugin_interface/textitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/textitem.cpp
@@ -84,9 +84,8 @@ void TextItem::checkText()
 
 void TextItem::setText(const QString &t)
 {
-    blockSignals(true);
+    QSignalBlocker blocker(this);
     setPlainText(t);
-    blockSignals(false);
 }
 
 void TextItem::focusInEvent(QFocusEvent *event)
diff --git a/src/plugins/texteditor/codestyleselectorwidget.cpp b/src/plugins/texteditor/codestyleselectorwidget.cpp
index d8af5ab6188..be8a0762848 100644
--- a/src/plugins/texteditor/codestyleselectorwidget.cpp
+++ b/src/plugins/texteditor/codestyleselectorwidget.cpp
@@ -242,9 +242,8 @@ void CodeStyleSelectorWidget::slotComboBoxActivated(int index)
     ICodeStylePreferences *delegate =
             m_ui->delegateComboBox->itemData(index).value<ICodeStylePreferences *>();
 
-    const bool wasBlocked = blockSignals(true);
+    QSignalBlocker blocker(this);
     m_codeStyle->setCurrentDelegate(delegate);
-    blockSignals(wasBlocked);
 }
 
 void CodeStyleSelectorWidget::slotCurrentDelegateChanged(ICodeStylePreferences *delegate)
diff --git a/src/plugins/texteditor/tabsettingswidget.cpp b/src/plugins/texteditor/tabsettingswidget.cpp
index 4e33fbea17a..08dd90e7108 100644
--- a/src/plugins/texteditor/tabsettingswidget.cpp
+++ b/src/plugins/texteditor/tabsettingswidget.cpp
@@ -59,12 +59,11 @@ TabSettingsWidget::~TabSettingsWidget()
 
 void TabSettingsWidget::setTabSettings(const TextEditor::TabSettings& s)
 {
-    const bool wasBlocked = blockSignals(true);
+    QSignalBlocker blocker(this);
     ui->tabPolicy->setCurrentIndex(s.m_tabPolicy);
     ui->tabSize->setValue(s.m_tabSize);
     ui->indentSize->setValue(s.m_indentSize);
     ui->continuationAlignBehavior->setCurrentIndex(s.m_continuationAlignBehavior);
-    blockSignals(wasBlocked);
 }
 
 TabSettings TabSettingsWidget::tabSettings() const
diff --git a/src/plugins/vcsbase/submitfieldwidget.cpp b/src/plugins/vcsbase/submitfieldwidget.cpp
index 201f260e6b1..58581ad5b8e 100644
--- a/src/plugins/vcsbase/submitfieldwidget.cpp
+++ b/src/plugins/vcsbase/submitfieldwidget.cpp
@@ -42,9 +42,8 @@ enum { spacing = 2 };
 
 static void inline setComboBlocked(QComboBox *cb, int index)
 {
-    const bool blocked = cb->blockSignals(true);
+    QSignalBlocker blocker(cb);
     cb->setCurrentIndex(index);
-    cb->blockSignals(blocked);
 }
 
 /*!
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 2d17bb36928..c39686e6021 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -943,9 +943,8 @@ void VcsBaseEditorWidget::slotCursorPositionChanged()
     if (section != -1) {
         QComboBox *entriesComboBox = d->entriesComboBox();
         if (entriesComboBox->currentIndex() != section) {
-            const bool blocked = entriesComboBox->blockSignals(true);
+            QSignalBlocker blocker(entriesComboBox);
             entriesComboBox->setCurrentIndex(section);
-            entriesComboBox->blockSignals(blocked);
         }
     }
 }
diff --git a/src/plugins/vcsbase/vcsbaseeditorconfig.cpp b/src/plugins/vcsbase/vcsbaseeditorconfig.cpp
index 80e9d9bb085..1c0d70f4e66 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()