From 763c76b47768a76e5e49f73b0aaf9d1f08b54c42 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 12 Dec 2022 09:32:41 +0100 Subject: [PATCH] ClangToolsProjectSettingsWidget: Don't overload slots Make slot names unique in order to avoid QOverload. Change-Id: Icb43f6087de85c637f4b33ff48588dc4e56b9db3 Reviewed-by: Christian Kandeler --- .../clangtoolsprojectsettingswidget.cpp | 16 ++++------------ .../clangtools/clangtoolsprojectsettingswidget.h | 1 - 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp b/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp index 77b48c373e3..82ecff437db 100644 --- a/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp +++ b/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp @@ -7,7 +7,6 @@ #include "clangtoolsconstants.h" #include "clangtoolsprojectsettings.h" #include "clangtoolssettings.h" -#include "clangtoolsutils.h" #include "runsettingswidget.h" #include @@ -86,15 +85,13 @@ ClangToolsProjectSettingsWidget::ClangToolsProjectSettingsWidget(ProjectExplorer }.attachTo(this, WithoutMargins); setUseGlobalSettings(m_projectSettings->useGlobalSettings()); - onGlobalCustomChanged(); + onGlobalCustomChanged(useGlobalSettings()); connect(this, &ProjectSettingsWidget::useGlobalSettingsChanged, - this, QOverload::of(&ClangToolsProjectSettingsWidget::onGlobalCustomChanged)); + this, &ClangToolsProjectSettingsWidget::onGlobalCustomChanged); // Global settings - connect(ClangToolsSettings::instance(), - &ClangToolsSettings::changed, - this, - QOverload<>::of(&ClangToolsProjectSettingsWidget::onGlobalCustomChanged)); + connect(ClangToolsSettings::instance(), &ClangToolsSettings::changed, + this, [this] { onGlobalCustomChanged(useGlobalSettings()); }); connect(m_restoreGlobal, &QPushButton::clicked, this, [this] { m_runSettingsWidget->fromSettings(ClangToolsSettings::instance()->runSettings()); }); @@ -135,11 +132,6 @@ ClangToolsProjectSettingsWidget::ClangToolsProjectSettingsWidget(ProjectExplorer this, [this](bool) { m_projectSettings->removeAllSuppressedDiagnostics();}); } -void ClangToolsProjectSettingsWidget::onGlobalCustomChanged() -{ - onGlobalCustomChanged(useGlobalSettings()); -} - void ClangToolsProjectSettingsWidget::onGlobalCustomChanged(bool useGlobal) { const RunSettings runSettings = useGlobal ? ClangToolsSettings::instance()->runSettings() diff --git a/src/plugins/clangtools/clangtoolsprojectsettingswidget.h b/src/plugins/clangtools/clangtoolsprojectsettingswidget.h index e0f5ee4fe14..8aeb9cf87a5 100644 --- a/src/plugins/clangtools/clangtoolsprojectsettingswidget.h +++ b/src/plugins/clangtools/clangtoolsprojectsettingswidget.h @@ -29,7 +29,6 @@ public: explicit ClangToolsProjectSettingsWidget(ProjectExplorer::Project *project, QWidget *parent = nullptr); private: - void onGlobalCustomChanged(); void onGlobalCustomChanged(bool useGlobal); void updateButtonStates();