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

24
src/plugins/projectexplorer/buildconfiguration.h
View File

@@ -54,7 +54,7 @@ class PROJECTEXPLORER_EXPORT BuildConfiguration : public ProjectConfiguration
protected:
friend class BuildConfigurationFactory;
explicit BuildConfiguration(Target *target, Core::Id id);
explicit BuildConfiguration(Target *target, Utils::Id id);
public:
~BuildConfiguration() override;
@@ -79,14 +79,14 @@ public:
virtual void addToEnvironment(Utils::Environment &env) const;
const QList<Core::Id> customParsers() const;
void setCustomParsers(const QList<Core::Id> &parsers);
const QList<Utils::Id> customParsers() const;
void setCustomParsers(const QList<Utils::Id> &parsers);
BuildStepList *buildSteps() const;
BuildStepList *cleanSteps() const;
void appendInitialBuildStep(Core::Id id);
void appendInitialCleanStep(Core::Id id);
void appendInitialBuildStep(Utils::Id id);
void appendInitialCleanStep(Utils::Id id);
bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override;
@@ -177,16 +177,16 @@ protected:
= std::function<QList<BuildInfo>(const Kit *, const Utils::FilePath &, bool)>;
void setBuildGenerator(const BuildGenerator &buildGenerator);
bool supportsTargetDeviceType(Core::Id id) const;
void setSupportedProjectType(Core::Id id);
bool supportsTargetDeviceType(Utils::Id id) const;
void setSupportedProjectType(Utils::Id id);
void setSupportedProjectMimeTypeName(const QString &mimeTypeName);
void addSupportedTargetDeviceType(Core::Id id);
void addSupportedTargetDeviceType(Utils::Id id);
void setDefaultDisplayName(const QString &defaultDisplayName);
using BuildConfigurationCreator = std::function<BuildConfiguration *(Target *)>;
template <class BuildConfig>
void registerBuildConfiguration(Core::Id buildConfigId)
void registerBuildConfiguration(Utils::Id buildConfigId)
{
m_creator = [buildConfigId](Target *t) { return new BuildConfig(t, buildConfigId); };
m_buildConfigId = buildConfigId;
@@ -196,9 +196,9 @@ private:
bool canHandle(const ProjectExplorer::Target *t) const;
BuildConfigurationCreator m_creator;
Core::Id m_buildConfigId;
Core::Id m_supportedProjectType;
QList<Core::Id> m_supportedTargetDeviceTypes;
Utils::Id m_buildConfigId;
Utils::Id m_supportedProjectType;
QList<Utils::Id> m_supportedTargetDeviceTypes;
QString m_supportedProjectMimeTypeName;
IssueReporter m_issueReporter;
BuildGenerator m_buildGenerator;