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

14
src/plugins/projectexplorer/deployconfiguration.cpp
View File

@@ -42,7 +42,7 @@ const char BUILD_STEP_LIST_PREFIX[] = "ProjectExplorer.BuildConfiguration.BuildS
const char USES_DEPLOYMENT_DATA[] = "ProjectExplorer.DeployConfiguration.CustomDataEnabled";
const char DEPLOYMENT_DATA[] = "ProjectExplorer.DeployConfiguration.CustomData";
DeployConfiguration::DeployConfiguration(Target *target, Core::Id id)
DeployConfiguration::DeployConfiguration(Target *target, Utils::Id id)
: ProjectConfiguration(target, id),
m_stepList(this, Constants::BUILDSTEPS_DEPLOY)
{
@@ -133,7 +133,7 @@ DeployConfigurationFactory::~DeployConfigurationFactory()
g_deployConfigurationFactories.removeOne(this);
}
Core::Id DeployConfigurationFactory::creationId() const
Utils::Id DeployConfigurationFactory::creationId() const
{
return m_deployConfigBaseId;
}
@@ -174,7 +174,7 @@ void DeployConfigurationFactory::setUseDeploymentDataView()
};
}
void DeployConfigurationFactory::setConfigBaseId(Core::Id deployConfigBaseId)
void DeployConfigurationFactory::setConfigBaseId(Utils::Id deployConfigBaseId)
{
m_deployConfigBaseId = deployConfigBaseId;
}
@@ -208,7 +208,7 @@ DeployConfiguration *DeployConfigurationFactory::clone(Target *parent,
DeployConfiguration *DeployConfigurationFactory::restore(Target *parent, const QVariantMap &map)
{
const Core::Id id = idFromMap(map);
const Utils::Id id = idFromMap(map);
DeployConfigurationFactory *factory = Utils::findOrDefault(g_deployConfigurationFactories,
[parent, id](DeployConfigurationFactory *f) {
if (!f->canHandle(parent))
@@ -237,7 +237,7 @@ const QList<DeployConfigurationFactory *> DeployConfigurationFactory::find(Targe
});
}
void DeployConfigurationFactory::addSupportedTargetDeviceType(Core::Id id)
void DeployConfigurationFactory::addSupportedTargetDeviceType(Utils::Id id)
{
m_supportedTargetDeviceTypes.append(id);
}
@@ -247,12 +247,12 @@ void DeployConfigurationFactory::setDefaultDisplayName(const QString &defaultDis
m_defaultDisplayName = defaultDisplayName;
}
void DeployConfigurationFactory::setSupportedProjectType(Core::Id id)
void DeployConfigurationFactory::setSupportedProjectType(Utils::Id id)
{
m_supportedProjectType = id;
}
void DeployConfigurationFactory::addInitialStep(Core::Id stepId, const std::function<bool (Target *)> &condition)
void DeployConfigurationFactory::addInitialStep(Utils::Id stepId, const std::function<bool (Target *)> &condition)
{
m_initialSteps.append({stepId, condition});
}