Core/Utils: Migrate further to Utils::Id

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

View File

@@ -92,17 +92,17 @@ void ToolKitAspectWidget::removeTool(const MesonTools::Tool_t &tool)
void ToolKitAspectWidget::setCurrentToolIndex(int index)
{
const Core::Id id = Core::Id::fromSetting(m_toolsComboBox->itemData(index));
const Utils::Id id = Utils::Id::fromSetting(m_toolsComboBox->itemData(index));
if (m_type == ToolType::Meson)
MesonToolKitAspect::setMesonTool(m_kit, id);
else
NinjaToolKitAspect::setNinjaTool(m_kit, id);
}
int ToolKitAspectWidget::indexOf(const Core::Id &id)
int ToolKitAspectWidget::indexOf(const Utils::Id &id)
{
for (int i = 0; i < m_toolsComboBox->count(); ++i) {
if (id == Core::Id::fromSetting(m_toolsComboBox->itemData(i)))
if (id == Utils::Id::fromSetting(m_toolsComboBox->itemData(i)))
return i;
}
return -1;