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

Merge CppTools into CppEditor

Browse Source 
There was no proper separation of responsibilities between these
plugins. In particular, CppTools had lots of editor-related
functionality, so it's not clear why it was separated out in the first
place.
In fact, for a lot of code, it seemed quite arbitrary where it was put
(just one example: switchHeaderSource() was in CppTools, wheras
switchDeclarationDefinition() was in CppEditor).
Merging the plugins will enable us to get rid of various convoluted
pseudo-abstractions that were only introduced to keep up the artificial
separation.

Change-Id: Iafc3bce625b4794f6d4aa03df6cddc7f2d26716a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2021-08-30 10:58:08 +02:00
parent 3e1fa0f170
commit 284817fae6
525 changed files with 3705 additions and 4179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/clangcodemodel/clangprojectsettingswidget.cpp
View File

@@ -30,11 +30,11 @@
#include <coreplugin/icore.h>
#include <cpptools/clangdiagnosticconfig.h>
#include <cpptools/clangdiagnosticconfigswidget.h>
#include <cpptools/cppcodemodelsettings.h>
#include <cpptools/cpptoolsconstants.h>
#include <cpptools/cpptoolsreuse.h>
#include <cppeditor/clangdiagnosticconfig.h>
#include <cppeditor/clangdiagnosticconfigswidget.h>
#include <cppeditor/cppeditorconstants.h>
#include <cppeditor/cppcodemodelsettings.h>
#include <cppeditor/cpptoolsreuse.h>
#include <utils/hostosinfo.h>
@@ -44,7 +44,7 @@ namespace Internal {
static Utils::Id configIdForProject(ClangProjectSettings &projectSettings)
{
if (projectSettings.useGlobalConfig())
return CppTools::codeModelSettings()->clangDiagnosticConfigId();
return CppEditor::codeModelSettings()->clangDiagnosticConfigId();
return projectSettings.warningConfigId();
}
@@ -53,13 +53,13 @@ ClangProjectSettingsWidget::ClangProjectSettingsWidget(ProjectExplorer::Project
{
m_ui.setupUi(this);
using namespace CppTools;
using namespace CppEditor;
m_ui.delayedTemplateParseCheckBox->setVisible(Utils::HostOsInfo::isWindowsHost());
// Links
connect(m_ui.gotoGlobalSettingsLabel, &QLabel::linkActivated, [](const QString &) {
Core::ICore::showOptionsDialog(CppTools::Constants::CPP_CODE_MODEL_SETTINGS_ID);
Core::ICore::showOptionsDialog(CppEditor::Constants::CPP_CODE_MODEL_SETTINGS_ID);
});
connect(m_ui.clangDiagnosticConfigsSelectionWidget,
@@ -74,8 +74,8 @@ ClangProjectSettingsWidget::ClangProjectSettingsWidget(ProjectExplorer::Project
// Save global custom configs
const ClangDiagnosticConfigs configs = m_ui.clangDiagnosticConfigsSelectionWidget
->customConfigs();
CppTools::codeModelSettings()->setClangCustomDiagnosticConfigs(configs);
CppTools::codeModelSettings()->toSettings(Core::ICore::settings());
CppEditor::codeModelSettings()->setClangCustomDiagnosticConfigs(configs);
CppEditor::codeModelSettings()->toSettings(Core::ICore::settings());
});
connect(m_ui.delayedTemplateParseCheckBox, &QCheckBox::toggled,
@@ -88,7 +88,7 @@ ClangProjectSettingsWidget::ClangProjectSettingsWidget(ProjectExplorer::Project
connect(&m_projectSettings, &ClangProjectSettings::changed,
this, &ClangProjectSettingsWidget::syncWidgets);
connect(CppTools::codeModelSettings(), &CppTools::CppCodeModelSettings::changed,
connect(CppEditor::codeModelSettings(), &CppEditor::CppCodeModelSettings::changed,
this, &ClangProjectSettingsWidget::syncOtherWidgetsToComboBox);
syncWidgets();
@@ -117,7 +117,7 @@ void ClangProjectSettingsWidget::onGlobalCustomChanged(int index)
void ClangProjectSettingsWidget::onAboutToSaveProjectSettings()
{
CppTools::codeModelSettings()->toSettings(Core::ICore::settings());
CppEditor::codeModelSettings()->toSettings(Core::ICore::settings());
}
void ClangProjectSettingsWidget::syncWidgets()
@@ -147,11 +147,11 @@ void ClangProjectSettingsWidget::syncOtherWidgetsToComboBox()
}
m_ui.clangDiagnosticConfigsSelectionWidget
->refresh(CppTools::diagnosticConfigsModel(),
->refresh(CppEditor::diagnosticConfigsModel(),
configIdForProject(m_projectSettings),
[](const CppTools::ClangDiagnosticConfigs &configs,
[](const CppEditor::ClangDiagnosticConfigs &configs,
const Utils::Id &configToSelect) {
return new CppTools::ClangDiagnosticConfigsWidget(configs, configToSelect);
return new CppEditor::ClangDiagnosticConfigsWidget(configs, configToSelect);
});
}