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

2
src/plugins/clangtools/CMakeLists.txt
View File

@@ -10,6 +10,7 @@ add_qtc_plugin(ClangTools
PLUGIN_DEPENDS Core Debugger CppTools ${TST_COMPONENT}
INCLUDES ${CLANG_INCLUDE_DIRS}
SOURCES
basicsettingswidget.cpp basicsettingswidget.h basicsettingswidget.ui
clangfileinfo.h
clangfixitsrefactoringchanges.cpp clangfixitsrefactoringchanges.h
clangselectablefilesdialog.cpp clangselectablefilesdialog.h clangselectablefilesdialog.ui
@@ -20,7 +21,6 @@ add_qtc_plugin(ClangTools
clangtoolruncontrol.cpp clangtoolruncontrol.h
clangtoolrunner.cpp clangtoolrunner.h
clangtools_global.h
clangtoolsbasicsettings.cpp clangtoolsbasicsettings.h clangtoolsbasicsettings.ui
clangtoolsconstants.h
clangtoolsdiagnostic.cpp clangtoolsdiagnostic.h
clangtoolsdiagnosticmodel.cpp clangtoolsdiagnosticmodel.h

12
src/plugins/clangtools/clangtoolsbasicsettings.cpp → src/plugins/clangtools/basicsettingswidget.cpp
View File

@@ -23,27 +23,27 @@
**
****************************************************************************/
#include "clangtoolsbasicsettings.h"
#include "ui_clangtoolsbasicsettings.h"
#include "basicsettingswidget.h"
#include "ui_basicsettingswidget.h"
#include "clangtoolsutils.h"
namespace ClangTools {
namespace Internal {
ClangToolsBasicSettings::ClangToolsBasicSettings(QWidget *parent)
BasicSettingsWidget::BasicSettingsWidget(QWidget *parent)
: QWidget(parent)
, m_ui(new Ui::ClangToolsBasicSettings)
, m_ui(new Ui::BasicSettingsWidget)
{
m_ui->setupUi(this);
}
ClangToolsBasicSettings::~ClangToolsBasicSettings()
BasicSettingsWidget::~BasicSettingsWidget()
{
delete m_ui;
}
Ui::ClangToolsBasicSettings *ClangToolsBasicSettings::ui()
Ui::BasicSettingsWidget *BasicSettingsWidget::ui()
{
return m_ui;
}

12
src/plugins/clangtools/clangtoolsbasicsettings.h → src/plugins/clangtools/basicsettingswidget.h
View File

@@ -30,21 +30,21 @@
namespace ClangTools {
namespace Internal {
namespace Ui { class ClangToolsBasicSettings; }
namespace Ui { class BasicSettingsWidget; }
class ClangExecutableVersion;
class ClangToolsBasicSettings : public QWidget
class BasicSettingsWidget : public QWidget
{
Q_OBJECT
public:
explicit ClangToolsBasicSettings(QWidget *parent = nullptr);
~ClangToolsBasicSettings() override;
explicit BasicSettingsWidget(QWidget *parent = nullptr);
~BasicSettingsWidget() override;
Ui::ClangToolsBasicSettings *ui();
Ui::BasicSettingsWidget *ui();
private:
Ui::ClangToolsBasicSettings *m_ui;
Ui::BasicSettingsWidget *m_ui;
};
} // namespace Internal

4
src/plugins/clangtools/clangtoolsbasicsettings.ui → src/plugins/clangtools/basicsettingswidget.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ClangTools::Internal::ClangToolsBasicSettings</class>
<widget class="QWidget" name="ClangTools::Internal::ClangToolsBasicSettings">
<class>ClangTools::Internal::BasicSettingsWidget</class>
<widget class="QWidget" name="ClangTools::Internal::BasicSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>

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);

6
src/plugins/clangtools/clangselectablefilesdialog.ui
View File

@@ -52,7 +52,7 @@
</layout>
</item>
<item>
<widget class="ClangTools::Internal::ClangToolsBasicSettings" name="clangToolsBasicSettings" native="true"/>
<widget class="ClangTools::Internal::BasicSettingsWidget" name="basicSettingsWidget" native="true"/>
</item>
</layout>
</widget>
@@ -87,9 +87,9 @@
</widget>
<customwidgets>
<customwidget>
<class>ClangTools::Internal::ClangToolsBasicSettings</class>
<class>ClangTools::Internal::BasicSettingsWidget</class>
<extends>QWidget</extends>
<header>clangtools/clangtoolsbasicsettings.h</header>
<header>clangtools/basicsettingswidget.h</header>
</customwidget>
</customwidgets>
<resources/>

6
src/plugins/clangtools/clangtools.pro
View File

@@ -16,6 +16,7 @@ isEmpty(EXTERNAL_YAML_CPP_FOUND) {
}
SOURCES += \
basicsettingswidget.cpp \
clangfixitsrefactoringchanges.cpp \
clangselectablefilesdialog.cpp \
clangtoolsdiagnosticview.cpp \
@@ -26,7 +27,6 @@ SOURCES += \
clangtool.cpp \
clangtoolruncontrol.cpp \
clangtoolrunner.cpp \
clangtoolsbasicsettings.cpp \
clangtoolsdiagnostic.cpp \
clangtoolsdiagnosticmodel.cpp \
clangtoolslogfilereader.cpp \
@@ -37,6 +37,7 @@ SOURCES += \
settingswidget.cpp \
HEADERS += \
basicsettingswidget.h \
clangfileinfo.h \
clangfixitsrefactoringchanges.h \
clangselectablefilesdialog.h \
@@ -49,7 +50,6 @@ HEADERS += \
clangtoolruncontrol.h \
clangtoolrunner.h \
clangtools_global.h \
clangtoolsbasicsettings.h \
clangtoolsconstants.h \
clangtoolsdiagnostic.h \
clangtoolsdiagnosticmodel.h \
@@ -61,8 +61,8 @@ HEADERS += \
settingswidget.h \
FORMS += \
basicsettingswidget.ui \
clangtoolsprojectsettingswidget.ui \
clangtoolsbasicsettings.ui \
settingswidget.ui \
equals(TEST, 1) {

6
src/plugins/clangtools/clangtools.qbs
View File

@@ -31,6 +31,9 @@ QtcPlugin {
cpp.rpaths: base.concat(libclang.llvmLibDir)
files: [
"basicsettingswidget.cpp",
"basicsettingswidget.h",
"basicsettingswidget.ui",
"clangfileinfo.h",
"clangfixitsrefactoringchanges.cpp",
"clangfixitsrefactoringchanges.h",
@@ -50,9 +53,6 @@ QtcPlugin {
"clangtoolrunner.cpp",
"clangtoolrunner.h",
"clangtools_global.h",
"clangtoolsbasicsettings.cpp",
"clangtoolsbasicsettings.h",
"clangtoolsbasicsettings.ui",
"clangtoolsconstants.h",
"clangtoolsdiagnostic.cpp",
"clangtoolsdiagnostic.h",

6
src/plugins/clangtools/settingswidget.cpp
View File

@@ -25,7 +25,7 @@
#include "settingswidget.h"
#include "ui_clangtoolsbasicsettings.h"
#include "ui_basicsettingswidget.h"
#include "ui_settingswidget.h"
#include "clangtoolsutils.h"
@@ -56,7 +56,7 @@ SettingsWidget::SettingsWidget(
QOverload<int>::of(&QSpinBox::valueChanged),
[settings](int count) { settings->setSimultaneousProcesses(count); });
QCheckBox *buildBeforeAnalysis = m_ui->clangToolsBasicSettings->ui()->buildBeforeAnalysis;
QCheckBox *buildBeforeAnalysis = m_ui->basicSettingsWidget->ui()->buildBeforeAnalysis;
buildBeforeAnalysis->setToolTip(hintAboutBuildBeforeAnalysis());
buildBeforeAnalysis->setCheckState(settings->savedBuildBeforeAnalysis()
? Qt::Checked : Qt::Unchecked);
@@ -67,7 +67,7 @@ SettingsWidget::SettingsWidget(
});
CppTools::ClangDiagnosticConfigsSelectionWidget *clangDiagnosticConfigsSelectionWidget
= m_ui->clangToolsBasicSettings->ui()->clangDiagnosticConfigsSelectionWidget;
= m_ui->basicSettingsWidget->ui()->clangDiagnosticConfigsSelectionWidget;
clangDiagnosticConfigsSelectionWidget->refresh(settings->savedDiagnosticConfigId());
connect(clangDiagnosticConfigsSelectionWidget,

6
src/plugins/clangtools/settingswidget.ui
View File

@@ -21,7 +21,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="ClangTools::Internal::ClangToolsBasicSettings" name="clangToolsBasicSettings" native="true"/>
<widget class="ClangTools::Internal::BasicSettingsWidget" name="basicSettingsWidget" native="true"/>
</item>
<item>
<layout class="QHBoxLayout" name="processesLayout">
@@ -77,9 +77,9 @@
</widget>
<customwidgets>
<customwidget>
<class>ClangTools::Internal::ClangToolsBasicSettings</class>
<class>ClangTools::Internal::BasicSettingsWidget</class>
<extends>QWidget</extends>
<header>clangtools/clangtoolsbasicsettings.h</header>
<header>clangtools/basicsettingswidget.h</header>
</customwidget>
</customwidgets>
<resources/>