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

ClangTools: Rename ClangToolsBasicSettings -> BasicSettingsWidget

Browse Source 
...as it's a widget.

Change-Id: If4f151e7b8ba8c8a6c2b5deb7cba34128a902e3e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-08-27 16:36:27 +02:00
parent c9b81d2d39
commit 8890a7412c
10 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/clangtools/clangselectablefilesdialog.cpp
View File

@@ -24,8 +24,9 @@
****************************************************************************/
#include "clangselectablefilesdialog.h"
#include "ui_clangselectablefilesdialog.h"
#include "ui_clangtoolsbasicsettings.h"
#include "ui_basicsettingswidget.h"
#include "clangtoolsprojectsettings.h"
#include "clangtoolssettings.h"
@@ -293,8 +294,8 @@ SelectableFilesDialog::SelectableFilesDialog(const ProjectInfo &projectInfo,
m_ui->buttons->addButton(m_analyzeButton, QDialogButtonBox::AcceptRole);
CppTools::ClangDiagnosticConfigsSelectionWidget *diagnosticConfigsSelectionWidget
= m_ui->clangToolsBasicSettings->ui()->clangDiagnosticConfigsSelectionWidget;
QCheckBox *buildBeforeAnalysis = m_ui->clangToolsBasicSettings->ui()->buildBeforeAnalysis;
= m_ui->basicSettingsWidget->ui()->clangDiagnosticConfigsSelectionWidget;
QCheckBox *buildBeforeAnalysis = m_ui->basicSettingsWidget->ui()->buildBeforeAnalysis;
buildBeforeAnalysis->setToolTip(hintAboutBuildBeforeAnalysis());
ClangToolsProjectSettings *settings = ClangToolsProjectSettingsManager::getSettings(m_project);
@@ -303,7 +304,7 @@ SelectableFilesDialog::SelectableFilesDialog(const ProjectInfo &projectInfo,
if (settings->useGlobalSettings()) {
m_ui->globalOrCustom->setCurrentIndex(GlobalSettings);
m_ui->clangToolsBasicSettings->setEnabled(false);
m_ui->basicSettingsWidget->setEnabled(false);
diagnosticConfigsSelectionWidget->refresh(
ClangToolsSettings::instance()->savedDiagnosticConfigId());
buildBeforeAnalysis->setCheckState(
@@ -311,7 +312,7 @@ SelectableFilesDialog::SelectableFilesDialog(const ProjectInfo &projectInfo,
? Qt::Checked : Qt::Unchecked);
} else {
m_ui->globalOrCustom->setCurrentIndex(CustomSettings);
m_ui->clangToolsBasicSettings->setEnabled(true);
m_ui->basicSettingsWidget->setEnabled(true);
diagnosticConfigsSelectionWidget->refresh(m_customDiagnosticConfig);
buildBeforeAnalysis->setCheckState(m_buildBeforeAnalysis ? Qt::Checked : Qt::Unchecked);
}
@@ -319,7 +320,7 @@ SelectableFilesDialog::SelectableFilesDialog(const ProjectInfo &projectInfo,
connect(m_ui->globalOrCustom,
QOverload<int>::of(&QComboBox::currentIndexChanged),
[=](int index){
m_ui->clangToolsBasicSettings->setEnabled(index == CustomSettings);
m_ui->basicSettingsWidget->setEnabled(index == CustomSettings);
if (index == CustomSettings) {
diagnosticConfigsSelectionWidget->refresh(m_customDiagnosticConfig);
buildBeforeAnalysis->setCheckState(m_buildBeforeAnalysis ? Qt::Checked : Qt::Unchecked);