From 1f4a3447be12395312fe30963e1b69b8c75634a8 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 20 Jul 2022 18:55:58 +0200 Subject: [PATCH] CodeStylePool: Avoid using sender() Change-Id: I72bf94a7d0a3c4e583016e1cffacba4b246bd858 Reviewed-by: Orgad Shaneh --- src/plugins/texteditor/codestylepool.cpp | 19 ++++--------------- src/plugins/texteditor/codestylepool.h | 2 -- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/plugins/texteditor/codestylepool.cpp b/src/plugins/texteditor/codestylepool.cpp index 3ed439d98f4..7cf1fbf60e1 100644 --- a/src/plugins/texteditor/codestylepool.cpp +++ b/src/plugins/texteditor/codestylepool.cpp @@ -174,12 +174,10 @@ void CodeStylePool::addCodeStyle(ICodeStylePreferences *codeStyle) // take ownership codeStyle->setParent(this); - connect(codeStyle, &ICodeStylePreferences::valueChanged, - this, &CodeStylePool::slotSaveCodeStyle); - connect(codeStyle, &ICodeStylePreferences::tabSettingsChanged, - this, &CodeStylePool::slotSaveCodeStyle); - connect(codeStyle, &ICodeStylePreferences::displayNameChanged, - this, &CodeStylePool::slotSaveCodeStyle); + auto doSaveStyle = [this, codeStyle] { saveCodeStyle(codeStyle); }; + connect(codeStyle, &ICodeStylePreferences::valueChanged, this, doSaveStyle); + connect(codeStyle, &ICodeStylePreferences::tabSettingsChanged, this, doSaveStyle); + connect(codeStyle, &ICodeStylePreferences::displayNameChanged, this, doSaveStyle); emit codeStyleAdded(codeStyle); } @@ -250,15 +248,6 @@ ICodeStylePreferences *CodeStylePool::loadCodeStyle(const Utils::FilePath &fileN return codeStyle; } -void CodeStylePool::slotSaveCodeStyle() -{ - auto codeStyle = qobject_cast(sender()); - if (!codeStyle) - return; - - saveCodeStyle(codeStyle); -} - void CodeStylePool::saveCodeStyle(ICodeStylePreferences *codeStyle) const { const QString codeStylesPath = customCodeStylesPath().toString(); diff --git a/src/plugins/texteditor/codestylepool.h b/src/plugins/texteditor/codestylepool.h index 150e57013a6..3e2ce4ff98c 100644 --- a/src/plugins/texteditor/codestylepool.h +++ b/src/plugins/texteditor/codestylepool.h @@ -69,8 +69,6 @@ signals: void codeStyleRemoved(ICodeStylePreferences *); private: - void slotSaveCodeStyle(); - QString settingsDir() const; Utils::FilePath settingsPath(const QByteArray &id) const; ICodeStylePreferences *loadCodeStyle(const Utils::FilePath &fileName);