diff --git a/src/plugins/texteditor/codestyleselectorwidget.cpp b/src/plugins/texteditor/codestyleselectorwidget.cpp
index b62612e535c..85ed87f0f9c 100644
--- a/src/plugins/texteditor/codestyleselectorwidget.cpp
+++ b/src/plugins/texteditor/codestyleselectorwidget.cpp
@@ -109,7 +109,7 @@ CodeStyleDialog::CodeStyleDialog(ICodeStylePreferencesFactory *factory,
     m_codeStyle->setId(codeStyle->id());
     m_codeStyle->setDisplayName(m_originalDisplayName);
     m_codeStyle->setReadOnly(codeStyle->isReadOnly());
-    TextEditor::CodeStyleEditorWidget *editor = factory->createEditor(m_codeStyle, project, this);
+    CodeStyleEditorWidget *editor = factory->createEditor(m_codeStyle, project, this);
 
     m_buttons = new QDialogButtonBox(
                 QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
@@ -372,38 +372,34 @@ void CodeStyleSelectorWidget::slotCodeStyleAdded(ICodeStylePreferences *codeStyl
     m_ui->delegateComboBox->addItem(name, data);
     m_ui->delegateComboBox->setItemData(m_ui->delegateComboBox->count() - 1, name, Qt::ToolTipRole);
     connect(codeStylePreferences, &ICodeStylePreferences::displayNameChanged,
-            this, &CodeStyleSelectorWidget::slotUpdateName);
+            this, [this, codeStylePreferences] { slotUpdateName(codeStylePreferences); });
     if (codeStylePreferences->delegatingPool()) {
         connect(codeStylePreferences, &ICodeStylePreferences::currentPreferencesChanged,
-                this, &CodeStyleSelectorWidget::slotUpdateName);
+                this, [this, codeStylePreferences] { slotUpdateName(codeStylePreferences); });
     }
 }
 
 void CodeStyleSelectorWidget::slotCodeStyleRemoved(ICodeStylePreferences *codeStylePreferences)
 {
     m_ignoreGuiSignals = true;
-    m_ui->delegateComboBox->removeItem(m_ui->delegateComboBox->findData(QVariant::fromValue(codeStylePreferences)));
-    disconnect(codeStylePreferences, &ICodeStylePreferences::displayNameChanged,
-               this, &CodeStyleSelectorWidget::slotUpdateName);
+    m_ui->delegateComboBox->removeItem(m_ui->delegateComboBox->findData(
+                                           QVariant::fromValue(codeStylePreferences)));
+    disconnect(codeStylePreferences, &ICodeStylePreferences::displayNameChanged, this, nullptr);
     if (codeStylePreferences->delegatingPool()) {
         disconnect(codeStylePreferences, &ICodeStylePreferences::currentPreferencesChanged,
-                   this, &CodeStyleSelectorWidget::slotUpdateName);
+                   this, nullptr);
     }
     m_ignoreGuiSignals = false;
 }
 
-void CodeStyleSelectorWidget::slotUpdateName()
+void CodeStyleSelectorWidget::slotUpdateName(ICodeStylePreferences *codeStylePreferences)
 {
-    auto changedCodeStyle = qobject_cast<ICodeStylePreferences *>(sender());
-    if (!changedCodeStyle)
-        return;
-
-    updateName(changedCodeStyle);
+    updateName(codeStylePreferences);
 
     QList<ICodeStylePreferences *> codeStyles = m_codeStyle->delegatingPool()->codeStyles();
     for (int i = 0; i < codeStyles.count(); i++) {
         ICodeStylePreferences *codeStyle = codeStyles.at(i);
-        if (codeStyle->currentDelegate() == changedCodeStyle)
+        if (codeStyle->currentDelegate() == codeStylePreferences)
             updateName(codeStyle);
     }
 
diff --git a/src/plugins/texteditor/codestyleselectorwidget.h b/src/plugins/texteditor/codestyleselectorwidget.h
index aca7f9bcacc..ea5df6e840f 100644
--- a/src/plugins/texteditor/codestyleselectorwidget.h
+++ b/src/plugins/texteditor/codestyleselectorwidget.h
@@ -46,19 +46,19 @@ public:
                                      QWidget *parent = nullptr);
     ~CodeStyleSelectorWidget() override;
 
-    void setCodeStyle(TextEditor::ICodeStylePreferences *codeStyle);
+    void setCodeStyle(ICodeStylePreferences *codeStyle);
 
 private:
     void slotComboBoxActivated(int index);
-    void slotCurrentDelegateChanged(TextEditor::ICodeStylePreferences *delegate);
+    void slotCurrentDelegateChanged(ICodeStylePreferences *delegate);
     void slotCopyClicked();
     void slotEditClicked();
     void slotRemoveClicked();
     void slotImportClicked();
     void slotExportClicked();
-    void slotCodeStyleAdded(ICodeStylePreferences*);
-    void slotCodeStyleRemoved(ICodeStylePreferences*);
-    void slotUpdateName();
+    void slotCodeStyleAdded(ICodeStylePreferences *codeStylePreferences);
+    void slotCodeStyleRemoved(ICodeStylePreferences *codeStylePreferences);
+    void slotUpdateName(ICodeStylePreferences *codeStylePreferences);
 
     void updateName(ICodeStylePreferences *codeStyle);
     ICodeStylePreferencesFactory *m_factory;