feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangToolsProjectSettingsWidget: Don't overload slots

Browse Source 
Make slot names unique in order to avoid QOverload.

Change-Id: Icb43f6087de85c637f4b33ff48588dc4e56b9db3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2022-12-12 09:32:41 +01:00
parent 92ab0c7f13
commit 763c76b477
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp
View File

@@ -7,7 +7,6 @@
#include "clangtoolsconstants.h" #include "clangtoolsconstants.h"
#include "clangtoolsprojectsettings.h" #include "clangtoolsprojectsettings.h"
#include "clangtoolssettings.h" #include "clangtoolssettings.h"
#include "clangtoolsutils.h"
#include "runsettingswidget.h" #include "runsettingswidget.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
@@ -86,15 +85,13 @@ ClangToolsProjectSettingsWidget::ClangToolsProjectSettingsWidget(ProjectExplorer
}.attachTo(this, WithoutMargins); }.attachTo(this, WithoutMargins);
setUseGlobalSettings(m_projectSettings->useGlobalSettings()); setUseGlobalSettings(m_projectSettings->useGlobalSettings());
onGlobalCustomChanged(); onGlobalCustomChanged(useGlobalSettings());
connect(this, &ProjectSettingsWidget::useGlobalSettingsChanged, connect(this, &ProjectSettingsWidget::useGlobalSettingsChanged,
this, QOverload<bool>::of(&ClangToolsProjectSettingsWidget::onGlobalCustomChanged)); this, &ClangToolsProjectSettingsWidget::onGlobalCustomChanged);
// Global settings // Global settings
connect(ClangToolsSettings::instance(), connect(ClangToolsSettings::instance(), &ClangToolsSettings::changed,
&ClangToolsSettings::changed, this, [this] { onGlobalCustomChanged(useGlobalSettings()); });
this,
QOverload<>::of(&ClangToolsProjectSettingsWidget::onGlobalCustomChanged));
connect(m_restoreGlobal, &QPushButton::clicked, this, [this] { connect(m_restoreGlobal, &QPushButton::clicked, this, [this] {
m_runSettingsWidget->fromSettings(ClangToolsSettings::instance()->runSettings()); m_runSettingsWidget->fromSettings(ClangToolsSettings::instance()->runSettings());
}); });
@@ -135,11 +132,6 @@ ClangToolsProjectSettingsWidget::ClangToolsProjectSettingsWidget(ProjectExplorer
this, [this](bool) { m_projectSettings->removeAllSuppressedDiagnostics();}); this, [this](bool) { m_projectSettings->removeAllSuppressedDiagnostics();});
} }
void ClangToolsProjectSettingsWidget::onGlobalCustomChanged()
{
onGlobalCustomChanged(useGlobalSettings());
}
void ClangToolsProjectSettingsWidget::onGlobalCustomChanged(bool useGlobal) void ClangToolsProjectSettingsWidget::onGlobalCustomChanged(bool useGlobal)
{ {
const RunSettings runSettings = useGlobal ? ClangToolsSettings::instance()->runSettings() const RunSettings runSettings = useGlobal ? ClangToolsSettings::instance()->runSettings()

1
src/plugins/clangtools/clangtoolsprojectsettingswidget.h
View File

@@ -29,7 +29,6 @@ public:
explicit ClangToolsProjectSettingsWidget(ProjectExplorer::Project *project, QWidget *parent = nullptr); explicit ClangToolsProjectSettingsWidget(ProjectExplorer::Project *project, QWidget *parent = nullptr);
private: private:
void onGlobalCustomChanged();
void onGlobalCustomChanged(bool useGlobal); void onGlobalCustomChanged(bool useGlobal);
void updateButtonStates(); void updateButtonStates();