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

Core/Utils: Migrate further to Utils::Id

Browse Source 
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent 4924392620
commit 430a33dcd9
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
View File

@@ -109,13 +109,13 @@ public:
m_customRoot->appendChild(new ConfigNode(config));
}
void removeConfig(const Core::Id &id)
void removeConfig(const Utils::Id &id)
{
ConfigNode *node = itemForConfigId(id);
node->parent()->removeChildAt(node->indexInParent());
}
ConfigNode *itemForConfigId(const Core::Id &id) const
ConfigNode *itemForConfigId(const Utils::Id &id) const
{
return findItemAtLevel<2>([id](const ConfigNode *node) {
return node->config.id() == id;
@@ -128,7 +128,7 @@ private:
};
ClangDiagnosticConfigsWidget::ClangDiagnosticConfigsWidget(const ClangDiagnosticConfigs &configs,
const Core::Id &configToSelect,
const Utils::Id &configToSelect,
QWidget *parent)
: QWidget(parent)
, m_ui(new Ui::ClangDiagnosticConfigsWidget)
@@ -215,7 +215,7 @@ const ClangDiagnosticConfig ClangDiagnosticConfigsWidget::currentConfig() const
void ClangDiagnosticConfigsWidget::onRemoveButtonClicked()
{
const Core::Id configToRemove = currentConfig().id();
const Utils::Id configToRemove = currentConfig().id();
if (m_configsModel->customConfigsCount() == 1)
m_ui->configsView->setCurrentIndex(m_configsModel->fallbackConfigIndex());
m_configsModel->removeConfig(configToRemove);