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

ClangToolsUtils: Reuse ClangToolType enum

Browse Source 
Change-Id: Iee95a014d634a99c6e10582f8e942a12ebf1bd74
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Jarek Kobus
2023-01-10 16:36:59 +01:00
parent 0ba3dbf1be
commit c4882a5a7a
8 changed files with 46 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/clangtools/runsettingswidget.cpp
View File

@@ -19,6 +19,7 @@
#include <QSpinBox>
#include <QThread>
using namespace CppEditor;
using namespace Utils;
namespace ClangTools::Internal {
@@ -28,7 +29,7 @@ RunSettingsWidget::RunSettingsWidget(QWidget *parent)
{
resize(383, 125);
m_diagnosticWidget = new CppEditor::ClangDiagnosticConfigsSelectionWidget;
m_diagnosticWidget = new ClangDiagnosticConfigsSelectionWidget;
m_buildBeforeAnalysis = new QCheckBox(tr("Build the project before analysis"));
@@ -55,13 +56,13 @@ RunSettingsWidget::RunSettingsWidget(QWidget *parent)
RunSettingsWidget::~RunSettingsWidget() = default;
CppEditor::ClangDiagnosticConfigsSelectionWidget *RunSettingsWidget::diagnosticSelectionWidget()
ClangDiagnosticConfigsSelectionWidget *RunSettingsWidget::diagnosticSelectionWidget()
{
return m_diagnosticWidget;
}
static CppEditor::ClangDiagnosticConfigsWidget *createEditWidget(
const CppEditor::ClangDiagnosticConfigs &configs, const Id &configToSelect)
static ClangDiagnosticConfigsWidget *createEditWidget(const ClangDiagnosticConfigs &configs,
const Id &configToSelect)
{
// Determine executable paths
FilePath clangTidyPath;
@@ -69,16 +70,17 @@ static CppEditor::ClangDiagnosticConfigsWidget *createEditWidget(
if (auto settingsWidget = SettingsWidget::instance()) {
// Global settings case; executables might not yet applied to settings
clangTidyPath = settingsWidget->clangTidyPath();
clangTidyPath = clangTidyPath.isEmpty() ? clangTidyFallbackExecutable()
clangTidyPath = clangTidyPath.isEmpty() ? toolFallbackExecutable(ClangToolType::Tidy)
: fullPath(clangTidyPath);
clazyStandalonePath = settingsWidget->clazyStandalonePath();
clazyStandalonePath = clazyStandalonePath.isEmpty() ? clazyStandaloneFallbackExecutable()
: fullPath(clazyStandalonePath);
clazyStandalonePath = clazyStandalonePath.isEmpty()
? toolFallbackExecutable(ClangToolType::Clazy)
: fullPath(clazyStandalonePath);
} else {
// "Projects Mode > Clang Tools" case, check settings
clangTidyPath = clangTidyExecutable();
clazyStandalonePath = clazyStandaloneExecutable();
clangTidyPath = toolExecutable(ClangToolType::Tidy);
clazyStandalonePath = toolExecutable(ClangToolType::Clazy);
}
return new DiagnosticConfigsWidget(configs,
@@ -93,10 +95,8 @@ void RunSettingsWidget::fromSettings(const RunSettings &s)
m_diagnosticWidget->refresh(diagnosticConfigsModel(),
s.diagnosticConfigId(),
createEditWidget);
connect(m_diagnosticWidget,
&CppEditor::ClangDiagnosticConfigsSelectionWidget::changed,
this,
&RunSettingsWidget::changed);
connect(m_diagnosticWidget, &ClangDiagnosticConfigsSelectionWidget::changed,
this, &RunSettingsWidget::changed);
disconnect(m_buildBeforeAnalysis, 0, 0, 0);
m_buildBeforeAnalysis->setToolTip(hintAboutBuildBeforeAnalysis());