diff options
Diffstat (limited to 'src/plugins/projectexplorer')
137 files changed, 832 insertions, 840 deletions
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index 1a9d18a937..7b1dd44d3c 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -113,7 +113,7 @@ public: OutputFormatter *outputFormatter = nullptr; }; -AbstractProcessStep::AbstractProcessStep(BuildStepList *bsl, Core::Id id) : +AbstractProcessStep::AbstractProcessStep(BuildStepList *bsl, Utils::Id id) : BuildStep(bsl, id), d(new Private(this)) { diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h index 9431c3a97c..cee8ece9fc 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.h +++ b/src/plugins/projectexplorer/abstractprocessstep.h @@ -48,7 +48,7 @@ public: void emitFaultyConfigurationMessage(); protected: - AbstractProcessStep(BuildStepList *bsl, Core::Id id); + AbstractProcessStep(BuildStepList *bsl, Utils::Id id); ~AbstractProcessStep() override; bool init() override; void setupOutputFormatter(Utils::OutputFormatter *formatter) override; diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index de92f588cb..320cd5ac6e 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -419,7 +419,7 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc) } // Create new static int counter = 0; - Core::Id contextId = Core::Id(C_APP_OUTPUT).withSuffix(counter++); + Utils::Id contextId = Utils::Id(C_APP_OUTPUT).withSuffix(counter++); Core::Context context(contextId); Core::OutputWindow *ow = new Core::OutputWindow(context, SETTINGS_KEY, m_tabWidget); ow->setWindowTitle(tr("Application Output Window")); diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp index 14551d1d44..ef93d5b6f7 100644 --- a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp +++ b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp @@ -49,8 +49,8 @@ struct BaseProjectWizardDialogPrivate { const int desiredIntroPageId; Utils::ProjectIntroPage *introPage; int introPageId; - Core::Id selectedPlatform; - QSet<Core::Id> requiredFeatureSet; + Utils::Id selectedPlatform; + QSet<Utils::Id> requiredFeatureSet; }; BaseProjectWizardDialogPrivate::BaseProjectWizardDialogPrivate(Utils::ProjectIntroPage *page, int id) : @@ -182,22 +182,22 @@ void BaseProjectWizardDialog::addExtensionPages(const QList<QWizardPage *> &wiza addPage(p); } -Core::Id BaseProjectWizardDialog::selectedPlatform() const +Utils::Id BaseProjectWizardDialog::selectedPlatform() const { return d->selectedPlatform; } -void BaseProjectWizardDialog::setSelectedPlatform(Core::Id platform) +void BaseProjectWizardDialog::setSelectedPlatform(Utils::Id platform) { d->selectedPlatform = platform; } -QSet<Core::Id> BaseProjectWizardDialog::requiredFeatures() const +QSet<Utils::Id> BaseProjectWizardDialog::requiredFeatures() const { return d->requiredFeatureSet; } -void BaseProjectWizardDialog::setRequiredFeatures(const QSet<Core::Id> &featureSet) +void BaseProjectWizardDialog::setRequiredFeatures(const QSet<Utils::Id> &featureSet) { d->requiredFeatureSet = featureSet; } diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.h b/src/plugins/projectexplorer/baseprojectwizarddialog.h index 98db214c96..7b2fd3c546 100644 --- a/src/plugins/projectexplorer/baseprojectwizarddialog.h +++ b/src/plugins/projectexplorer/baseprojectwizarddialog.h @@ -73,11 +73,11 @@ signals: protected: Utils::ProjectIntroPage *introPage() const; - Core::Id selectedPlatform() const; - void setSelectedPlatform(Core::Id platform); + Utils::Id selectedPlatform() const; + void setSelectedPlatform(Utils::Id platform); - QSet<Core::Id> requiredFeatures() const; - void setRequiredFeatures(const QSet<Core::Id> &featureSet); + QSet<Utils::Id> requiredFeatures() const; + void setRequiredFeatures(const QSet<Utils::Id> &featureSet); private: void init(); diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index de8ac4dbe4..0e3a30427c 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -146,10 +146,10 @@ public: mutable Environment m_cachedEnvironment; QString m_configWidgetDisplayName; bool m_configWidgetHasFrame = false; - QList<Core::Id> m_initialBuildSteps; - QList<Core::Id> m_initialCleanSteps; + QList<Utils::Id> m_initialBuildSteps; + QList<Utils::Id> m_initialCleanSteps; Utils::MacroExpander m_macroExpander; - QList<Core::Id> m_customParsers; + QList<Utils::Id> m_customParsers; // FIXME: Remove. BuildConfiguration::BuildType m_initialBuildType = BuildConfiguration::Unknown; @@ -158,7 +158,7 @@ public: } // Internal -BuildConfiguration::BuildConfiguration(Target *target, Core::Id id) +BuildConfiguration::BuildConfiguration(Target *target, Utils::Id id) : ProjectConfiguration(target, id), d(new Internal::BuildConfigurationPrivate(this)) { QTC_CHECK(target && target == this->target()); @@ -256,10 +256,10 @@ void BuildConfiguration::doInitialize(const BuildInfo &info) d->m_initialBuildType = info.buildType; - for (Core::Id id : qAsConst(d->m_initialBuildSteps)) + for (Utils::Id id : qAsConst(d->m_initialBuildSteps)) d->m_buildSteps.appendStep(id); - for (Core::Id id : qAsConst(d->m_initialCleanSteps)) + for (Utils::Id id : qAsConst(d->m_initialCleanSteps)) d->m_cleanSteps.appendStep(id); acquaintAspects(); @@ -338,12 +338,12 @@ BuildStepList *BuildConfiguration::cleanSteps() const return &d->m_cleanSteps; } -void BuildConfiguration::appendInitialBuildStep(Core::Id id) +void BuildConfiguration::appendInitialBuildStep(Utils::Id id) { d->m_initialBuildSteps.append(id); } -void BuildConfiguration::appendInitialCleanStep(Core::Id id) +void BuildConfiguration::appendInitialCleanStep(Utils::Id id) { d->m_initialCleanSteps.append(id); } @@ -359,7 +359,7 @@ QVariantMap BuildConfiguration::toMap() const map.insert(QLatin1String(BUILD_STEP_LIST_PREFIX) + QString::number(0), d->m_buildSteps.toMap()); map.insert(QLatin1String(BUILD_STEP_LIST_PREFIX) + QString::number(1), d->m_cleanSteps.toMap()); - map.insert(CUSTOM_PARSERS_KEY, transform(d->m_customParsers,&Core::Id::toSetting)); + map.insert(CUSTOM_PARSERS_KEY, transform(d->m_customParsers,&Utils::Id::toSetting)); return map; } @@ -381,7 +381,7 @@ bool BuildConfiguration::fromMap(const QVariantMap &map) qWarning() << "No data for build step list" << i << "found!"; continue; } - Core::Id id = idFromMap(data); + Utils::Id id = idFromMap(data); if (id == Constants::BUILDSTEPS_BUILD) { if (!d->m_buildSteps.fromMap(data)) qWarning() << "Failed to restore build step list"; @@ -393,7 +393,7 @@ bool BuildConfiguration::fromMap(const QVariantMap &map) } } - d->m_customParsers = transform(map.value(CUSTOM_PARSERS_KEY).toList(), &Core::Id::fromSetting); + d->m_customParsers = transform(map.value(CUSTOM_PARSERS_KEY).toList(), &Utils::Id::fromSetting); return ProjectConfiguration::fromMap(map); } @@ -478,12 +478,12 @@ void BuildConfiguration::addToEnvironment(Environment &env) const Q_UNUSED(env) } -const QList<Core::Id> BuildConfiguration::customParsers() const +const QList<Utils::Id> BuildConfiguration::customParsers() const { return d->m_customParsers; } -void BuildConfiguration::setCustomParsers(const QList<Core::Id> &parsers) +void BuildConfiguration::setCustomParsers(const QList<Utils::Id> &parsers) { d->m_customParsers = parsers; } @@ -622,7 +622,7 @@ const QList<BuildInfo> return list; } -bool BuildConfigurationFactory::supportsTargetDeviceType(Core::Id id) const +bool BuildConfigurationFactory::supportsTargetDeviceType(Utils::Id id) const { if (m_supportedTargetDeviceTypes.isEmpty()) return true; @@ -633,7 +633,7 @@ bool BuildConfigurationFactory::supportsTargetDeviceType(Core::Id id) const BuildConfigurationFactory *BuildConfigurationFactory::find(const Kit *k, const FilePath &projectPath) { QTC_ASSERT(k, return nullptr); - const Core::Id deviceType = DeviceTypeKitAspect::deviceTypeId(k); + const Utils::Id deviceType = DeviceTypeKitAspect::deviceTypeId(k); for (BuildConfigurationFactory *factory : g_buildConfigurationFactories) { if (Utils::mimeTypeForFile(projectPath.toString()) .matchesName(factory->m_supportedProjectMimeTypeName) @@ -653,7 +653,7 @@ BuildConfigurationFactory * BuildConfigurationFactory::find(Target *parent) return nullptr; } -void BuildConfigurationFactory::setSupportedProjectType(Core::Id id) +void BuildConfigurationFactory::setSupportedProjectType(Utils::Id id) { m_supportedProjectType = id; } @@ -663,7 +663,7 @@ void BuildConfigurationFactory::setSupportedProjectMimeTypeName(const QString &m m_supportedProjectMimeTypeName = mimeTypeName; } -void BuildConfigurationFactory::addSupportedTargetDeviceType(Core::Id id) +void BuildConfigurationFactory::addSupportedTargetDeviceType(Utils::Id id) { m_supportedTargetDeviceTypes.append(id); } @@ -707,7 +707,7 @@ BuildConfiguration *BuildConfigurationFactory::create(Target *parent, const Buil BuildConfiguration *BuildConfigurationFactory::restore(Target *parent, const QVariantMap &map) { - const Core::Id id = idFromMap(map); + const Utils::Id id = idFromMap(map); for (BuildConfigurationFactory *factory : g_buildConfigurationFactories) { QTC_ASSERT(factory->m_creator, return nullptr); if (!factory->canHandle(parent)) diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index 5e7bf1d03a..73d2eb3fe9 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -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; diff --git a/src/plugins/projectexplorer/buildinfo.h b/src/plugins/projectexplorer/buildinfo.h index e54285af35..02148a17ff 100644 --- a/src/plugins/projectexplorer/buildinfo.h +++ b/src/plugins/projectexplorer/buildinfo.h @@ -29,8 +29,8 @@ #include "buildconfiguration.h" -#include <coreplugin/id.h> #include <utils/fileutils.h> +#include <utils/id.h> namespace ProjectExplorer { @@ -44,7 +44,7 @@ public: QString displayName; QString typeName; Utils::FilePath buildDirectory; - Core::Id kitId; + Utils::Id kitId; BuildConfiguration::BuildType buildType = BuildConfiguration::Unknown; QVariant extraInfo; diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index f312648540..16ae265bca 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -61,6 +61,7 @@ #include <QTimer> using namespace Core; +using namespace Utils; namespace ProjectExplorer { using namespace Internal; diff --git a/src/plugins/projectexplorer/buildmanager.h b/src/plugins/projectexplorer/buildmanager.h index f50b458b23..c964c417a1 100644 --- a/src/plugins/projectexplorer/buildmanager.h +++ b/src/plugins/projectexplorer/buildmanager.h @@ -91,7 +91,7 @@ public: static void setCompileOutputSettings(const Internal::CompileOutputSettings &settings); static const Internal::CompileOutputSettings &compileOutputSettings(); - static QString displayNameForStepId(Core::Id stepId); + static QString displayNameForStepId(Utils::Id stepId); public slots: static void cancel(); diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp index 4a56d805c4..39a2e647fd 100644 --- a/src/plugins/projectexplorer/buildstep.cpp +++ b/src/plugins/projectexplorer/buildstep.cpp @@ -130,7 +130,7 @@ namespace ProjectExplorer { static QList<BuildStepFactory *> g_buildStepFactories; -BuildStep::BuildStep(BuildStepList *bsl, Core::Id id) : +BuildStep::BuildStep(BuildStepList *bsl, Utils::Id id) : ProjectConfiguration(bsl, id) { QTC_CHECK(bsl->target() && bsl->target() == this->target()); @@ -265,7 +265,7 @@ QString BuildStep::fallbackWorkingDirectory() const void BuildStep::setupOutputFormatter(OutputFormatter *formatter) { - for (const Core::Id id : buildConfiguration()->customParsers()) { + for (const Utils::Id id : buildConfiguration()->customParsers()) { if (Internal::CustomParser * const parser = Internal::CustomParser::createFromId(id)) formatter->addLineParser(parser); } @@ -291,7 +291,7 @@ void BuildStep::setWidgetExpandedByDefault(bool widgetExpandedByDefault) m_widgetExpandedByDefault = widgetExpandedByDefault; } -QVariant BuildStep::data(Core::Id id) const +QVariant BuildStep::data(Utils::Id id) const { Q_UNUSED(id) return {}; @@ -386,7 +386,7 @@ bool BuildStepFactory::canHandle(BuildStepList *bsl) const if (!m_supportedDeviceTypes.isEmpty()) { Target *target = bsl->target(); QTC_ASSERT(target, return false); - Core::Id deviceType = DeviceTypeKitAspect::deviceTypeId(target->kit()); + Utils::Id deviceType = DeviceTypeKitAspect::deviceTypeId(target->kit()); if (!m_supportedDeviceTypes.contains(deviceType)) return false; } @@ -394,7 +394,7 @@ bool BuildStepFactory::canHandle(BuildStepList *bsl) const if (m_supportedProjectType.isValid()) { if (!config) return false; - Core::Id projectId = config->project()->id(); + Utils::Id projectId = config->project()->id(); if (projectId != m_supportedProjectType) return false; } @@ -405,7 +405,7 @@ bool BuildStepFactory::canHandle(BuildStepList *bsl) const if (m_supportedConfiguration.isValid()) { if (!config) return false; - Core::Id configId = config->id(); + Utils::Id configId = config->id(); if (configId != m_supportedConfiguration) return false; } @@ -423,32 +423,32 @@ void BuildStepFactory::setFlags(BuildStepInfo::Flags flags) m_info.flags = flags; } -void BuildStepFactory::setSupportedStepList(Core::Id id) +void BuildStepFactory::setSupportedStepList(Utils::Id id) { m_supportedStepLists = {id}; } -void BuildStepFactory::setSupportedStepLists(const QList<Core::Id> &ids) +void BuildStepFactory::setSupportedStepLists(const QList<Utils::Id> &ids) { m_supportedStepLists = ids; } -void BuildStepFactory::setSupportedConfiguration(Core::Id id) +void BuildStepFactory::setSupportedConfiguration(Utils::Id id) { m_supportedConfiguration = id; } -void BuildStepFactory::setSupportedProjectType(Core::Id id) +void BuildStepFactory::setSupportedProjectType(Utils::Id id) { m_supportedProjectType = id; } -void BuildStepFactory::setSupportedDeviceType(Core::Id id) +void BuildStepFactory::setSupportedDeviceType(Utils::Id id) { m_supportedDeviceTypes = {id}; } -void BuildStepFactory::setSupportedDeviceTypes(const QList<Core::Id> &ids) +void BuildStepFactory::setSupportedDeviceTypes(const QList<Utils::Id> &ids) { m_supportedDeviceTypes = ids; } @@ -458,12 +458,12 @@ BuildStepInfo BuildStepFactory::stepInfo() const return m_info; } -Core::Id BuildStepFactory::stepId() const +Utils::Id BuildStepFactory::stepId() const { return m_info.id; } -BuildStep *BuildStepFactory::create(BuildStepList *parent, Core::Id id) +BuildStep *BuildStepFactory::create(BuildStepList *parent, Utils::Id id) { BuildStep *bs = nullptr; if (id == m_info.id) diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index 03a88c8b1a..f736e2474e 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -65,7 +65,7 @@ class PROJECTEXPLORER_EXPORT BuildStep : public ProjectConfiguration protected: friend class BuildStepFactory; - explicit BuildStep(BuildStepList *bsl, Core::Id id); + explicit BuildStep(BuildStepList *bsl, Utils::Id id); public: ~BuildStep() override; @@ -114,7 +114,7 @@ public: bool isImmutable() const { return m_immutable; } void setImmutable(bool immutable) { m_immutable = immutable; } - virtual QVariant data(Core::Id id) const; + virtual QVariant data(Utils::Id id) const; void setSummaryUpdater(const std::function<QString ()> &summaryUpdater); void addMacroExpander(); @@ -168,7 +168,7 @@ public: using BuildStepCreator = std::function<BuildStep *(BuildStepList *)>; - Core::Id id; + Utils::Id id; QString displayName; Flags flags = Flags(); BuildStepCreator creator; @@ -185,8 +185,8 @@ public: static const QList<BuildStepFactory *> allBuildStepFactories(); BuildStepInfo stepInfo() const; - Core::Id stepId() const; - BuildStep *create(BuildStepList *parent, Core::Id id); + Utils::Id stepId() const; + BuildStep *create(BuildStepList *parent, Utils::Id id); BuildStep *restore(BuildStepList *parent, const QVariantMap &map); bool canHandle(BuildStepList *bsl) const; @@ -195,19 +195,19 @@ protected: using BuildStepCreator = std::function<BuildStep *(BuildStepList *)>; template <class BuildStepType> - void registerStep(Core::Id id) + void registerStep(Utils::Id id) { QTC_CHECK(!m_info.creator); m_info.id = id; m_info.creator = [id](BuildStepList *bsl) { return new BuildStepType(bsl, id); }; } - void setSupportedStepList(Core::Id id); - void setSupportedStepLists(const QList<Core::Id> &ids); - void setSupportedConfiguration(Core::Id id); - void setSupportedProjectType(Core::Id id); - void setSupportedDeviceType(Core::Id id); - void setSupportedDeviceTypes(const QList<Core::Id> &ids); + void setSupportedStepList(Utils::Id id); + void setSupportedStepLists(const QList<Utils::Id> &ids); + void setSupportedConfiguration(Utils::Id id); + void setSupportedProjectType(Utils::Id id); + void setSupportedDeviceType(Utils::Id id); + void setSupportedDeviceTypes(const QList<Utils::Id> &ids); void setRepeatable(bool on) { m_isRepeatable = on; } void setDisplayName(const QString &displayName); void setFlags(BuildStepInfo::Flags flags); @@ -215,10 +215,10 @@ protected: private: BuildStepInfo m_info; - Core::Id m_supportedProjectType; - QList<Core::Id> m_supportedDeviceTypes; - QList<Core::Id> m_supportedStepLists; - Core::Id m_supportedConfiguration; + Utils::Id m_supportedProjectType; + QList<Utils::Id> m_supportedDeviceTypes; + QList<Utils::Id> m_supportedStepLists; + Utils::Id m_supportedConfiguration; bool m_isRepeatable = true; }; diff --git a/src/plugins/projectexplorer/buildsteplist.cpp b/src/plugins/projectexplorer/buildsteplist.cpp index 273835bd99..3fd22f8c4e 100644 --- a/src/plugins/projectexplorer/buildsteplist.cpp +++ b/src/plugins/projectexplorer/buildsteplist.cpp @@ -39,7 +39,7 @@ namespace ProjectExplorer { const char STEPS_COUNT_KEY[] = "ProjectExplorer.BuildStepList.StepsCount"; const char STEPS_PREFIX[] = "ProjectExplorer.BuildStepList.Step."; -BuildStepList::BuildStepList(QObject *parent, Core::Id id) +BuildStepList::BuildStepList(QObject *parent, Utils::Id id) : QObject(parent), m_id(id) { QTC_ASSERT(parent, return); @@ -91,7 +91,7 @@ bool BuildStepList::isEmpty() const return m_steps.isEmpty(); } -bool BuildStepList::contains(Core::Id id) const +bool BuildStepList::contains(Utils::Id id) const { return Utils::anyOf(steps(), [id](BuildStep *bs){ return bs->id() == id; @@ -130,7 +130,7 @@ bool BuildStepList::fromMap(const QVariantMap &map) continue; } bool handled = false; - Core::Id stepId = idFromMap(bsData); + Utils::Id stepId = idFromMap(bsData); for (BuildStepFactory *factory : factories) { if (factory->stepId() == stepId) { if (factory->canHandle(this)) { @@ -153,7 +153,7 @@ QList<BuildStep *> BuildStepList::steps() const return m_steps; } -BuildStep *BuildStepList::firstStepWithId(Core::Id id) const +BuildStep *BuildStepList::firstStepWithId(Utils::Id id) const { return Utils::findOrDefault(m_steps, Utils::equal(&BuildStep::id, id)); } @@ -164,7 +164,7 @@ void BuildStepList::insertStep(int position, BuildStep *step) emit stepInserted(position); } -void BuildStepList::insertStep(int position, Core::Id stepId) +void BuildStepList::insertStep(int position, Utils::Id stepId) { for (BuildStepFactory *factory : BuildStepFactory::allBuildStepFactories()) { if (BuildStep *step = factory->create(this, stepId)) { diff --git a/src/plugins/projectexplorer/buildsteplist.h b/src/plugins/projectexplorer/buildsteplist.h index 52fdd99f89..49c0f8b206 100644 --- a/src/plugins/projectexplorer/buildsteplist.h +++ b/src/plugins/projectexplorer/buildsteplist.h @@ -27,7 +27,7 @@ #include "projectexplorer_export.h" -#include <coreplugin/id.h> +#include <utils/id.h> #include <QObject> #include <QVariantMap> @@ -42,7 +42,7 @@ class PROJECTEXPLORER_EXPORT BuildStepList : public QObject Q_OBJECT public: - explicit BuildStepList(QObject *parent, Core::Id id); + explicit BuildStepList(QObject *parent, Utils::Id id); ~BuildStepList() override; void clear(); @@ -58,19 +58,19 @@ public: } return nullptr; } - BuildStep *firstStepWithId(Core::Id id) const; + BuildStep *firstStepWithId(Utils::Id id) const; int count() const; bool isEmpty() const; - bool contains(Core::Id id) const; + bool contains(Utils::Id id) const; void insertStep(int position, BuildStep *step); - void insertStep(int position, Core::Id id); + void insertStep(int position, Utils::Id id); void appendStep(BuildStep *step) { insertStep(count(), step); } - void appendStep(Core::Id stepId) { insertStep(count(), stepId); } + void appendStep(Utils::Id stepId) { insertStep(count(), stepId); } struct StepCreationInfo { - Core::Id stepId; + Utils::Id stepId; std::function<bool(Target *)> condition; // unset counts as unrestricted }; @@ -83,7 +83,7 @@ public: QVariantMap toMap() const; bool fromMap(const QVariantMap &map); - Core::Id id() const { return m_id; } + Utils::Id id() const { return m_id; } QString displayName() const; signals: @@ -94,7 +94,7 @@ signals: private: Target *m_target; - Core::Id m_id; + Utils::Id m_id; QList<BuildStep *> m_steps; }; diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp index 7877e0e968..5d44ba143a 100644 --- a/src/plugins/projectexplorer/buildstepspage.cpp +++ b/src/plugins/projectexplorer/buildstepspage.cpp @@ -253,7 +253,7 @@ void BuildStepListWidget::updateEnabledState() void BuildStepListWidget::updateAddBuildStepMenu() { - QMap<QString, QPair<Core::Id, BuildStepFactory *> > map; + QMap<QString, QPair<Utils::Id, BuildStepFactory *> > map; //Build up a list of possible steps and save map the display names to the (internal) name and factories. for (BuildStepFactory *factory : BuildStepFactory::allBuildStepFactories()) { if (factory->canHandle(m_buildStepList)) { @@ -270,12 +270,12 @@ void BuildStepListWidget::updateAddBuildStepMenu() QMenu *menu = m_addButton->menu(); menu->clear(); if (!map.isEmpty()) { - QMap<QString, QPair<Core::Id, BuildStepFactory *> >::const_iterator it, end; + QMap<QString, QPair<Utils::Id, BuildStepFactory *> >::const_iterator it, end; end = map.constEnd(); for (it = map.constBegin(); it != end; ++it) { QAction *action = menu->addAction(it.key()); BuildStepFactory *factory = it.value().second; - Core::Id id = it.value().first; + Utils::Id id = it.value().first; connect(action, &QAction::triggered, [id, factory, this]() { BuildStep *newStep = factory->create(m_buildStepList, id); diff --git a/src/plugins/projectexplorer/buildsystem.cpp b/src/plugins/projectexplorer/buildsystem.cpp index 7b6f4bbf5a..b91af550d6 100644 --- a/src/plugins/projectexplorer/buildsystem.cpp +++ b/src/plugins/projectexplorer/buildsystem.cpp @@ -253,7 +253,7 @@ QStringList BuildSystem::filesGeneratedFrom(const QString &sourceFile) const return {}; } -QVariant BuildSystem::additionalData(Core::Id id) const +QVariant BuildSystem::additionalData(Utils::Id id) const { Q_UNUSED(id) return {}; @@ -341,14 +341,14 @@ void BuildSystem::emitBuildSystemUpdated() target()->buildSystemUpdated(this); } -void BuildSystem::setExtraData(const QString &buildKey, Core::Id dataKey, const QVariant &data) +void BuildSystem::setExtraData(const QString &buildKey, Utils::Id dataKey, const QVariant &data) { const ProjectNode *node = d->m_target->project()->findNodeForBuildKey(buildKey); QTC_ASSERT(node, return); node->setData(dataKey, data); } -QVariant BuildSystem::extraData(const QString &buildKey, Core::Id dataKey) const +QVariant BuildSystem::extraData(const QString &buildKey, Utils::Id dataKey) const { const ProjectNode *node = d->m_target->project()->findNodeForBuildKey(buildKey); QTC_ASSERT(node, return {}); diff --git a/src/plugins/projectexplorer/buildsystem.h b/src/plugins/projectexplorer/buildsystem.h index 5d38e8300c..305d296b4c 100644 --- a/src/plugins/projectexplorer/buildsystem.h +++ b/src/plugins/projectexplorer/buildsystem.h @@ -84,7 +84,7 @@ public: virtual bool supportsAction(Node *context, ProjectAction action, const Node *node) const; virtual QStringList filesGeneratedFrom(const QString &sourceFile) const; - virtual QVariant additionalData(Core::Id id) const; + virtual QVariant additionalData(Utils::Id id) const; void setDeploymentData(const DeploymentData &deploymentData); DeploymentData deploymentData() const; @@ -122,8 +122,8 @@ public: void emitBuildSystemUpdated(); - void setExtraData(const QString &buildKey, Core::Id dataKey, const QVariant &data); - QVariant extraData(const QString &buildKey, Core::Id dataKey) const; + void setExtraData(const QString &buildKey, Utils::Id dataKey, const QVariant &data); + QVariant extraData(const QString &buildKey, Utils::Id dataKey) const; public: // FIXME: Make this private and the BuildSystem a friend diff --git a/src/plugins/projectexplorer/clangparser.cpp b/src/plugins/projectexplorer/clangparser.cpp index 4c34209671..dcf935b2db 100644 --- a/src/plugins/projectexplorer/clangparser.cpp +++ b/src/plugins/projectexplorer/clangparser.cpp @@ -120,9 +120,9 @@ OutputLineParser::Result ClangParser::handleLine(const QString &line, OutputForm return Status::NotHandled; } -Core::Id ClangParser::id() +Utils::Id ClangParser::id() { - return Core::Id("ProjectExplorer.OutputParser.Clang"); + return Utils::Id("ProjectExplorer.OutputParser.Clang"); } // Unit tests: diff --git a/src/plugins/projectexplorer/clangparser.h b/src/plugins/projectexplorer/clangparser.h index 5b61d0cbaa..8dd311cd66 100644 --- a/src/plugins/projectexplorer/clangparser.h +++ b/src/plugins/projectexplorer/clangparser.h @@ -41,7 +41,7 @@ public: static QList<Utils::OutputLineParser *> clangParserSuite(); - static Core::Id id(); + static Utils::Id id(); private: Result handleLine(const QString &line, Utils::OutputFormat type) override; diff --git a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp index 098596d3c1..7c42b0bc49 100644 --- a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp @@ -41,7 +41,7 @@ CodeStyleSettingsWidget::CodeStyleSettingsWidget(Project *project) : QWidget(), const EditorConfiguration *config = m_project->editorConfiguration(); for (ICodeStylePreferencesFactory *factory : TextEditorSettings::codeStyleFactories()) { - Core::Id languageId = factory->languageId(); + Utils::Id languageId = factory->languageId(); ICodeStylePreferences *codeStylePreferences = config->codeStyle(languageId); auto preview = factory->createCodeStyleEditor(codeStylePreferences, m_ui.stackedWidget); diff --git a/src/plugins/projectexplorer/configtaskhandler.cpp b/src/plugins/projectexplorer/configtaskhandler.cpp index e7daf060c2..80eea3c4a7 100644 --- a/src/plugins/projectexplorer/configtaskhandler.cpp +++ b/src/plugins/projectexplorer/configtaskhandler.cpp @@ -37,7 +37,7 @@ using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; -ConfigTaskHandler::ConfigTaskHandler(const Task &pattern, Core::Id page) : +ConfigTaskHandler::ConfigTaskHandler(const Task &pattern, Utils::Id page) : m_pattern(pattern), m_targetPage(page) { } diff --git a/src/plugins/projectexplorer/configtaskhandler.h b/src/plugins/projectexplorer/configtaskhandler.h index 418c325233..879828bef9 100644 --- a/src/plugins/projectexplorer/configtaskhandler.h +++ b/src/plugins/projectexplorer/configtaskhandler.h @@ -37,7 +37,7 @@ class ConfigTaskHandler : public ITaskHandler Q_OBJECT public: - ConfigTaskHandler(const Task &pattern, Core::Id page); + ConfigTaskHandler(const Task &pattern, Utils::Id page); bool canHandle(const Task &task) const override; void handle(const Task &task) override; @@ -45,7 +45,7 @@ public: private: const Task m_pattern; - const Core::Id m_targetPage; + const Utils::Id m_targetPage; }; } // namespace Internal diff --git a/src/plugins/projectexplorer/copytaskhandler.cpp b/src/plugins/projectexplorer/copytaskhandler.cpp index 574cad4b90..6a12c5251d 100644 --- a/src/plugins/projectexplorer/copytaskhandler.cpp +++ b/src/plugins/projectexplorer/copytaskhandler.cpp @@ -57,9 +57,9 @@ void CopyTaskHandler::handle(const Task &task) + type + task.description()); } -Core::Id CopyTaskHandler::actionManagerId() const +Utils::Id CopyTaskHandler::actionManagerId() const { - return Core::Id(Core::Constants::COPY); + return Utils::Id(Core::Constants::COPY); } QAction *CopyTaskHandler::createAction(QObject *parent) const diff --git a/src/plugins/projectexplorer/copytaskhandler.h b/src/plugins/projectexplorer/copytaskhandler.h index 373cace0a1..da95a413c4 100644 --- a/src/plugins/projectexplorer/copytaskhandler.h +++ b/src/plugins/projectexplorer/copytaskhandler.h @@ -37,7 +37,7 @@ class CopyTaskHandler : public ITaskHandler public: bool canHandle(const Task &) const override { return true; } void handle(const Task &task) override; - Core::Id actionManagerId() const override; + Utils::Id actionManagerId() const override; QAction *createAction(QObject *parent) const override; }; diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp index e0de305e5f..95c8760ad0 100644 --- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp +++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp @@ -63,7 +63,7 @@ CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(Target *targe : CustomExecutableRunConfiguration(target, CUSTOM_EXECUTABLE_ID) {} -CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(Target *target, Core::Id id) +CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(Target *target, Utils::Id id) : RunConfiguration(target, id) { auto envAspect = addAspect<LocalEnvironmentAspect>(target); diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.h b/src/plugins/projectexplorer/customexecutablerunconfiguration.h index 4d3bd49eeb..090058305b 100644 --- a/src/plugins/projectexplorer/customexecutablerunconfiguration.h +++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.h @@ -34,7 +34,7 @@ class PROJECTEXPLORER_EXPORT CustomExecutableRunConfiguration : public RunConfig Q_OBJECT public: - CustomExecutableRunConfiguration(Target *target, Core::Id id); + CustomExecutableRunConfiguration(Target *target, Utils::Id id); explicit CustomExecutableRunConfiguration(Target *target); QString defaultDisplayName() const; diff --git a/src/plugins/projectexplorer/customparser.cpp b/src/plugins/projectexplorer/customparser.cpp index 03eee63c30..aaa97f703a 100644 --- a/src/plugins/projectexplorer/customparser.cpp +++ b/src/plugins/projectexplorer/customparser.cpp @@ -171,7 +171,7 @@ QVariantMap CustomParserSettings::toMap() const void CustomParserSettings::fromMap(const QVariantMap &map) { - id = Core::Id::fromSetting(map.value(idKey)); + id = Utils::Id::fromSetting(map.value(idKey)); displayName = map.value(nameKey).toString(); error.fromMap(map.value(errorKey).toMap()); warning.fromMap(map.value(warningKey).toMap()); @@ -190,7 +190,7 @@ void CustomParser::setSettings(const CustomParserSettings &settings) m_warning = settings.warning; } -CustomParser *CustomParser::createFromId(Core::Id id) +CustomParser *CustomParser::createFromId(Utils::Id id) { const Internal::CustomParserSettings parser = findOrDefault(ProjectExplorerPlugin::customParsers(), [id](const Internal::CustomParserSettings &p) { return p.id == id; }); @@ -199,9 +199,9 @@ CustomParser *CustomParser::createFromId(Core::Id id) return nullptr; } -Core::Id CustomParser::id() +Utils::Id CustomParser::id() { - return Core::Id("ProjectExplorer.OutputParser.Custom"); + return Utils::Id("ProjectExplorer.OutputParser.Custom"); } OutputLineParser::Result CustomParser::handleLine(const QString &line, OutputFormat type) @@ -273,16 +273,16 @@ public: this, &SelectionWidget::updateUi); } - void setSelectedParsers(const QList<Core::Id> &parsers) + void setSelectedParsers(const QList<Utils::Id> &parsers) { for (const auto &p : qAsConst(parserCheckBoxes)) p.first->setChecked(parsers.contains(p.second)); emit selectionChanged(); } - QList<Core::Id> selectedParsers() const + QList<Utils::Id> selectedParsers() const { - QList<Core::Id> parsers; + QList<Utils::Id> parsers; for (const auto &p : qAsConst(parserCheckBoxes)) { if (p.first->isChecked()) parsers << p.second; @@ -298,7 +298,7 @@ private: { const auto layout = qobject_cast<QVBoxLayout *>(this->layout()); QTC_ASSERT(layout, return); - const QList<Core::Id> parsers = selectedParsers(); + const QList<Utils::Id> parsers = selectedParsers(); for (const auto &p : qAsConst(parserCheckBoxes)) delete p.first; parserCheckBoxes.clear(); @@ -312,7 +312,7 @@ private: setSelectedParsers(parsers); } - QList<QPair<QCheckBox *, Core::Id>> parserCheckBoxes; + QList<QPair<QCheckBox *, Utils::Id>> parserCheckBoxes; }; } // anonymous namespace @@ -327,19 +327,19 @@ CustomParsersSelectionWidget::CustomParsersSelectionWidget(QWidget *parent) : De updateSummary(); } -void CustomParsersSelectionWidget::setSelectedParsers(const QList<Core::Id> &parsers) +void CustomParsersSelectionWidget::setSelectedParsers(const QList<Utils::Id> &parsers) { qobject_cast<SelectionWidget *>(widget())->setSelectedParsers(parsers); } -QList<Core::Id> CustomParsersSelectionWidget::selectedParsers() const +QList<Utils::Id> CustomParsersSelectionWidget::selectedParsers() const { return qobject_cast<SelectionWidget *>(widget())->selectedParsers(); } void CustomParsersSelectionWidget::updateSummary() { - const QList<Core::Id> parsers + const QList<Utils::Id> parsers = qobject_cast<SelectionWidget *>(widget())->selectedParsers(); if (parsers.isEmpty()) setSummaryText(tr("There are no custom parsers active")); @@ -364,12 +364,12 @@ CustomParsersAspect::CustomParsersAspect(Target *target) void CustomParsersAspect::fromMap(const QVariantMap &map) { - m_parsers = transform(map.value(settingsKey()).toList(), &Core::Id::fromSetting); + m_parsers = transform(map.value(settingsKey()).toList(), &Utils::Id::fromSetting); } void CustomParsersAspect::toMap(QVariantMap &map) const { - map.insert(settingsKey(), transform(m_parsers, &Core::Id::toSetting)); + map.insert(settingsKey(), transform(m_parsers, &Utils::Id::toSetting)); } } // namespace Internal diff --git a/src/plugins/projectexplorer/customparser.h b/src/plugins/projectexplorer/customparser.h index 48a88096d2..0d431487e1 100644 --- a/src/plugins/projectexplorer/customparser.h +++ b/src/plugins/projectexplorer/customparser.h @@ -89,7 +89,7 @@ public: QVariantMap toMap() const; void fromMap(const QVariantMap &map); - Core::Id id; + Utils::Id id; QString displayName; CustomParserExpression error; CustomParserExpression warning; @@ -102,8 +102,8 @@ public: void setSettings(const CustomParserSettings &settings); - static CustomParser *createFromId(Core::Id id); - static Core::Id id(); + static CustomParser *createFromId(Utils::Id id); + static Utils::Id id(); private: Result handleLine(const QString &line, Utils::OutputFormat type) override; @@ -122,8 +122,8 @@ class CustomParsersSelectionWidget : public Utils::DetailsWidget public: CustomParsersSelectionWidget(QWidget *parent = nullptr); - void setSelectedParsers(const QList<Core::Id> &parsers); - QList<Core::Id> selectedParsers() const; + void setSelectedParsers(const QList<Utils::Id> &parsers); + QList<Utils::Id> selectedParsers() const; signals: void selectionChanged(); @@ -138,14 +138,14 @@ class CustomParsersAspect : public ProjectConfigurationAspect public: CustomParsersAspect(Target *target); - void setParsers(const QList<Core::Id> &parsers) { m_parsers = parsers; } - const QList<Core::Id> parsers() const { return m_parsers; } + void setParsers(const QList<Utils::Id> &parsers) { m_parsers = parsers; } + const QList<Utils::Id> parsers() const { return m_parsers; } private: void fromMap(const QVariantMap &map) override; void toMap(QVariantMap &map) const override; - QList<Core::Id> m_parsers; + QList<Utils::Id> m_parsers; }; } // namespace Internal diff --git a/src/plugins/projectexplorer/customparserssettingspage.cpp b/src/plugins/projectexplorer/customparserssettingspage.cpp index 78163555db..dc280bf1ff 100644 --- a/src/plugins/projectexplorer/customparserssettingspage.cpp +++ b/src/plugins/projectexplorer/customparserssettingspage.cpp @@ -73,7 +73,7 @@ public: if (dlg.exec() != QDialog::Accepted) return; CustomParserSettings newParser = dlg.settings(); - newParser.id = Core::Id::fromString(QUuid::createUuid().toString()); + newParser.id = Utils::Id::fromString(QUuid::createUuid().toString()); newParser.displayName = tr("New Parser"); m_customParsers << newParser; resetListView(); diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp index 9b19eafc8e..afb824105c 100644 --- a/src/plugins/projectexplorer/customtoolchain.cpp +++ b/src/plugins/projectexplorer/customtoolchain.cpp @@ -107,7 +107,7 @@ bool CustomToolChain::isValid() const ToolChain::MacroInspectionRunner CustomToolChain::createMacroInspectionRunner() const { const Macros theMacros = m_predefinedMacros; - const Core::Id lang = language(); + const Utils::Id lang = language(); // This runner must be thread-safe! return [theMacros, lang](const QStringList &cxxflags){ @@ -306,7 +306,7 @@ bool CustomToolChain::fromMap(const QVariantMap &data) setHeaderPaths(data.value(QLatin1String(headerPathsKeyC)).toStringList()); m_cxx11Flags = data.value(QLatin1String(cxx11FlagsKeyC)).toStringList(); setMkspecs(data.value(QLatin1String(mkspecsKeyC)).toString()); - setOutputParserId(Core::Id::fromSetting(data.value(QLatin1String(outputParserKeyC)))); + setOutputParserId(Utils::Id::fromSetting(data.value(QLatin1String(outputParserKeyC)))); // Restore Pre-4.13 settings. if (outputParserId() == Internal::CustomParser::id()) { @@ -340,7 +340,7 @@ bool CustomToolChain::fromMap(const QVariantMap &data) if (!customParserSettings.error.pattern().isEmpty() || !customParserSettings.error.pattern().isEmpty()) { // Found custom parser in old settings, move to new place. - customParserSettings.id = Core::Id::fromString(QUuid::createUuid().toString()); + customParserSettings.id = Utils::Id::fromString(QUuid::createUuid().toString()); setOutputParserId(customParserSettings.id); customParserSettings.displayName = tr("Parser for toolchain %1").arg(displayName()); QList<Internal::CustomParserSettings> settings @@ -366,12 +366,12 @@ bool CustomToolChain::operator ==(const ToolChain &other) const && m_builtInHeaderPaths == customTc->m_builtInHeaderPaths; } -Core::Id CustomToolChain::outputParserId() const +Utils::Id CustomToolChain::outputParserId() const { return m_outputParserId; } -void CustomToolChain::setOutputParserId(Core::Id parserId) +void CustomToolChain::setOutputParserId(Utils::Id parserId) { if (m_outputParserId == parserId) return; @@ -557,7 +557,7 @@ void CustomToolChainConfigWidget::applyImpl() tc->setCxx11Flags(m_cxx11Flags->text().split(QLatin1Char(','))); tc->setMkspecs(m_mkspecs->text()); tc->setDisplayName(displayName); // reset display name - tc->setOutputParserId(Core::Id::fromSetting(m_errorParserComboBox->currentData())); + tc->setOutputParserId(Utils::Id::fromSetting(m_errorParserComboBox->currentData())); setFromToolchain(); // Refresh with actual data from the toolchain. This shows what e.g. the // macro parser did with the input. @@ -593,7 +593,7 @@ bool CustomToolChainConfigWidget::isDirtyImpl() const || m_headerDetails->entries() != tc->headerPathsList() || m_cxx11Flags->text().split(QLatin1Char(',')) != tc->cxx11Flags() || m_mkspecs->text() != tc->mkspecs() - || Core::Id::fromSetting(m_errorParserComboBox->currentData()) == tc->outputParserId(); + || Utils::Id::fromSetting(m_errorParserComboBox->currentData()) == tc->outputParserId(); } void CustomToolChainConfigWidget::makeReadOnlyImpl() diff --git a/src/plugins/projectexplorer/customtoolchain.h b/src/plugins/projectexplorer/customtoolchain.h index 382cb3ebca..fafa9f58c7 100644 --- a/src/plugins/projectexplorer/customtoolchain.h +++ b/src/plugins/projectexplorer/customtoolchain.h @@ -60,7 +60,7 @@ class PROJECTEXPLORER_EXPORT CustomToolChain : public ToolChain public: class Parser { public: - Core::Id parserId; ///< A unique id identifying a parser + Utils::Id parserId; ///< A unique id identifying a parser QString displayName; ///< A translateable name to show in the user interface }; @@ -105,8 +105,8 @@ public: void setMkspecs(const QString &); QString mkspecs() const; - Core::Id outputParserId() const; - void setOutputParserId(Core::Id parserId); + Utils::Id outputParserId() const; + void setOutputParserId(Utils::Id parserId); static QList<CustomToolChain::Parser> parsers(); private: @@ -123,7 +123,7 @@ private: QStringList m_cxx11Flags; QStringList m_mkspecs; - Core::Id m_outputParserId; + Utils::Id m_outputParserId; friend class Internal::CustomToolChainFactory; friend class ToolChainFactory; diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp index 538dfbfa61..f13b9dd0cf 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp @@ -148,7 +148,7 @@ void CustomWizard::setParameters(const CustomWizardParametersPtr &p) setId(p->id); setSupportedProjectTypes((p->kind == Core::IWizardFactory::FileWizard) - ? QSet<Core::Id>() : QSet<Core::Id>() << "UNKNOWN_PROJECT"); + ? QSet<Utils::Id>() : QSet<Utils::Id>() << "UNKNOWN_PROJECT"); setIcon(p->icon); setDescription(p->description); setDisplayName(p->displayName); diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp index da071f1192..f6af2ca02c 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp @@ -51,6 +51,7 @@ enum { debug = 0 }; using namespace Core; +using namespace Utils; static const char customWizardElementC[] = "wizard"; static const char iconElementC[] = "icon"; @@ -572,7 +573,7 @@ CustomWizardParameters::parse(QIODevice &device, const QString &configFileFullPa { const QString idString = attributeValue(reader, idAttributeC); if (!idString.isEmpty()) - id = Core::Id::fromString(idString); + id = Utils::Id::fromString(idString); } category = attributeValue(reader, categoryAttributeC); kind = kindAttribute(reader); diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.h b/src/plugins/projectexplorer/customwizard/customwizardparameters.h index bb697d10b0..884834a818 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardparameters.h +++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.h @@ -109,7 +109,7 @@ public: QString *errorMessage); ParseResult parse(const QString &configFileFullPath, QString *errorMessage); - Core::Id id; + Utils::Id id; QString directory; QString klass; QList<CustomWizardFile> files; @@ -129,7 +129,7 @@ public: QString displayName; QString category; QString displayCategory; - QSet<Core::Id> requiredFeatures; + QSet<Utils::Id> requiredFeatures; Core::IWizardFactory::WizardFlags flags; }; diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index e5469e9e3b..d4187da115 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/src/plugins/projectexplorer/deployconfiguration.cpp @@ -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}); } diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index 6cd85b62a3..24b68687dc 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -43,7 +43,7 @@ class PROJECTEXPLORER_EXPORT DeployConfiguration final : public ProjectConfigura private: friend class DeployConfigurationFactory; - explicit DeployConfiguration(Target *target, Core::Id id); + explicit DeployConfiguration(Target *target, Utils::Id id); public: ~DeployConfiguration() override = default; @@ -81,7 +81,7 @@ public: virtual ~DeployConfigurationFactory(); // return possible addition to a target, invalid if there is none - Core::Id creationId() const; + Utils::Id creationId() const; // the name to display to the user QString defaultDisplayName() const; @@ -91,12 +91,12 @@ public: static DeployConfiguration *restore(Target *parent, const QVariantMap &map); static DeployConfiguration *clone(Target *parent, const DeployConfiguration *dc); - void addSupportedTargetDeviceType(Core::Id id); + void addSupportedTargetDeviceType(Utils::Id id); void setDefaultDisplayName(const QString &defaultDisplayName); - void setSupportedProjectType(Core::Id id); + void setSupportedProjectType(Utils::Id id); // Step is only added if condition is not set, or returns true when called. - void addInitialStep(Core::Id stepId, const std::function<bool(Target *)> &condition = {}); + void addInitialStep(Utils::Id stepId, const std::function<bool(Target *)> &condition = {}); bool canHandle(ProjectExplorer::Target *target) const; @@ -109,13 +109,13 @@ public: protected: using DeployConfigurationCreator = std::function<DeployConfiguration *(Target *)>; - void setConfigBaseId(Core::Id deployConfigBaseId); + void setConfigBaseId(Utils::Id deployConfigBaseId); private: DeployConfiguration *createDeployConfiguration(Target *target); - Core::Id m_deployConfigBaseId; - Core::Id m_supportedProjectType; - QList<Core::Id> m_supportedTargetDeviceTypes; + Utils::Id m_deployConfigBaseId; + Utils::Id m_supportedProjectType; + QList<Utils::Id> m_supportedTargetDeviceTypes; QList<BuildStepList::StepCreationInfo> m_initialSteps; QString m_defaultDisplayName; DeployConfiguration::WidgetCreator m_configWidgetCreator; diff --git a/src/plugins/projectexplorer/desktoprunconfiguration.cpp b/src/plugins/projectexplorer/desktoprunconfiguration.cpp index 75df893db3..a37817e108 100644 --- a/src/plugins/projectexplorer/desktoprunconfiguration.cpp +++ b/src/plugins/projectexplorer/desktoprunconfiguration.cpp @@ -54,7 +54,7 @@ class DesktopRunConfiguration : public RunConfiguration protected: enum Kind { Qmake, Qbs, CMake }; // FIXME: Remove - DesktopRunConfiguration(Target *target, Core::Id id, Kind kind); + DesktopRunConfiguration(Target *target, Utils::Id id, Kind kind); private: void updateTargetInformation(); @@ -64,7 +64,7 @@ private: const Kind m_kind; }; -DesktopRunConfiguration::DesktopRunConfiguration(Target *target, Core::Id id, Kind kind) +DesktopRunConfiguration::DesktopRunConfiguration(Target *target, Utils::Id id, Kind kind) : RunConfiguration(target, id), m_kind(kind) { auto envAspect = addAspect<LocalEnvironmentAspect>(target); @@ -168,7 +168,7 @@ Utils::FilePath DesktopRunConfiguration::executableToRun(const BuildTargetInfo & class DesktopQmakeRunConfiguration final : public DesktopRunConfiguration { public: - DesktopQmakeRunConfiguration(Target *target, Core::Id id) + DesktopQmakeRunConfiguration(Target *target, Utils::Id id) : DesktopRunConfiguration(target, id, Qmake) {} }; @@ -176,7 +176,7 @@ public: class QbsRunConfiguration final : public DesktopRunConfiguration { public: - QbsRunConfiguration(Target *target, Core::Id id) + QbsRunConfiguration(Target *target, Utils::Id id) : DesktopRunConfiguration(target, id, Qbs) {} }; @@ -184,7 +184,7 @@ public: class CMakeRunConfiguration final : public DesktopRunConfiguration { public: - CMakeRunConfiguration(Target *target, Core::Id id) + CMakeRunConfiguration(Target *target, Utils::Id id) : DesktopRunConfiguration(target, id, CMake) {} }; diff --git a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp index 8d8a61d285..a5fa7c933e 100644 --- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp @@ -35,7 +35,7 @@ using namespace ProjectExplorer; -DeviceCheckBuildStep::DeviceCheckBuildStep(BuildStepList *bsl, Core::Id id) +DeviceCheckBuildStep::DeviceCheckBuildStep(BuildStepList *bsl, Utils::Id id) : BuildStep(bsl, id) { setDefaultDisplayName(displayName()); @@ -46,7 +46,7 @@ bool DeviceCheckBuildStep::init() { IDevice::ConstPtr device = DeviceKitAspect::device(target()->kit()); if (!device) { - Core::Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(target()->kit()); + Utils::Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(target()->kit()); IDeviceFactory *factory = IDeviceFactory::find(deviceTypeId); if (!factory || !factory->canCreate()) { emit addOutput(tr("No device configured."), BuildStep::OutputFormat::ErrorMessage); @@ -82,7 +82,7 @@ void DeviceCheckBuildStep::doRun() emit finished(true); } -Core::Id DeviceCheckBuildStep::stepId() +Utils::Id DeviceCheckBuildStep::stepId() { return "ProjectExplorer.DeviceCheckBuildStep"; } diff --git a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h index ff4dd8aeb8..c3ef9c213d 100644 --- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h +++ b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h @@ -35,12 +35,12 @@ class PROJECTEXPLORER_EXPORT DeviceCheckBuildStep : public BuildStep Q_OBJECT public: - DeviceCheckBuildStep(BuildStepList *bsl, Core::Id id); + DeviceCheckBuildStep(BuildStepList *bsl, Utils::Id id); bool init() override; void doRun() override; - static Core::Id stepId(); + static Utils::Id stepId(); static QString displayName(); }; diff --git a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp index 55915d3289..f2e9688df1 100644 --- a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp @@ -29,8 +29,6 @@ #include "idevice.h" #include "idevicefactory.h" -#include <coreplugin/id.h> - #include <QPushButton> namespace ProjectExplorer { @@ -73,12 +71,12 @@ void DeviceFactorySelectionDialog::handleItemDoubleClicked() accept(); } -Core::Id DeviceFactorySelectionDialog::selectedId() const +Utils::Id DeviceFactorySelectionDialog::selectedId() const { QList<QListWidgetItem *> selected = ui->listWidget->selectedItems(); if (selected.isEmpty()) - return Core::Id(); - return selected.at(0)->data(Qt::UserRole).value<Core::Id>(); + return Utils::Id(); + return selected.at(0)->data(Qt::UserRole).value<Utils::Id>(); } } // namespace Internal diff --git a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h index feda2dfc6d..4b8f40bcf9 100644 --- a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h +++ b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h @@ -25,7 +25,7 @@ #pragma once -#include <coreplugin/id.h> +#include <utils/id.h> #include <QDialog> @@ -42,7 +42,7 @@ class DeviceFactorySelectionDialog : public QDialog public: explicit DeviceFactorySelectionDialog(QWidget *parent = nullptr); ~DeviceFactorySelectionDialog() override; - Core::Id selectedId() const; + Utils::Id selectedId() const; private: void handleItemSelectionChanged(); diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp index 6b274f2a55..bbf6e4bcd8 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp @@ -61,7 +61,7 @@ class DeviceManagerPrivate public: DeviceManagerPrivate() = default; - int indexForId(Core::Id id) const + int indexForId(Utils::Id id) const { for (int i = 0; i < devices.count(); ++i) { if (devices.at(i)->id() == id) @@ -72,7 +72,7 @@ public: static DeviceManager *clonedInstance; QList<IDevice::Ptr> devices; - QHash<Core::Id, Core::Id> defaultDevices; + QHash<Utils::Id, Utils::Id> defaultDevices; Utils::PersistentSettingsWriter *writer = nullptr; }; @@ -147,7 +147,7 @@ void DeviceManager::load() Utils::PersistentSettingsReader reader; // read devices file from global settings path - QHash<Core::Id, Core::Id> defaultDevices; + QHash<Utils::Id, Utils::Id> defaultDevices; QList<IDevice::Ptr> sdkDevices; if (reader.load(systemSettingsFilePath(QLatin1String("/devices.xml")))) sdkDevices = fromMap(reader.restoreValues().value(DeviceManagerKey).toMap(), &defaultDevices); @@ -183,14 +183,14 @@ void DeviceManager::load() } QList<IDevice::Ptr> DeviceManager::fromMap(const QVariantMap &map, - QHash<Core::Id, Core::Id> *defaultDevices) + QHash<Utils::Id, Utils::Id> *defaultDevices) { QList<IDevice::Ptr> devices; if (defaultDevices) { const QVariantMap defaultDevsMap = map.value(DefaultDevicesKey).toMap(); for (auto it = defaultDevsMap.constBegin(); it != defaultDevsMap.constEnd(); ++it) - defaultDevices->insert(Core::Id::fromString(it.key()), Core::Id::fromSetting(it.value())); + defaultDevices->insert(Utils::Id::fromString(it.key()), Utils::Id::fromSetting(it.value())); } const QVariantList deviceList = map.value(QLatin1String(DeviceListKey)).toList(); foreach (const QVariant &v, deviceList) { @@ -210,7 +210,7 @@ QVariantMap DeviceManager::toMap() const { QVariantMap map; QVariantMap defaultDeviceMap; - using TypeIdHash = QHash<Core::Id, Core::Id>; + using TypeIdHash = QHash<Utils::Id, Utils::Id>; for (TypeIdHash::ConstIterator it = d->defaultDevices.constBegin(); it != d->defaultDevices.constEnd(); ++it) { defaultDeviceMap.insert(it.key().toString(), it.value().toSetting()); @@ -264,14 +264,14 @@ void DeviceManager::addDevice(const IDevice::ConstPtr &_device) emit updated(); } -void DeviceManager::removeDevice(Core::Id id) +void DeviceManager::removeDevice(Utils::Id id) { const IDevice::Ptr device = mutableDevice(id); QTC_ASSERT(device, return); QTC_ASSERT(this != instance() || device->isAutoDetected(), return); const bool wasDefault = d->defaultDevices.value(device->type()) == device->id(); - const Core::Id deviceType = device->type(); + const Utils::Id deviceType = device->type(); d->devices.removeAt(d->indexForId(id)); emit deviceRemoved(device->id()); @@ -290,7 +290,7 @@ void DeviceManager::removeDevice(Core::Id id) emit updated(); } -void DeviceManager::setDeviceState(Core::Id deviceId, IDevice::DeviceState deviceState) +void DeviceManager::setDeviceState(Utils::Id deviceId, IDevice::DeviceState deviceState) { // To see the state change in the DeviceSettingsWidget. This has to happen before // the pos check below, in case the device is only present in the cloned instance. @@ -314,7 +314,7 @@ bool DeviceManager::isLoaded() const return d->writer; } -void DeviceManager::setDefaultDevice(Core::Id id) +void DeviceManager::setDefaultDevice(Utils::Id id) { QTC_ASSERT(this != instance(), return); @@ -332,7 +332,7 @@ void DeviceManager::setDefaultDevice(Core::Id id) const IDeviceFactory *DeviceManager::restoreFactory(const QVariantMap &map) { - const Core::Id deviceType = IDevice::typeFromMap(map); + const Utils::Id deviceType = IDevice::typeFromMap(map); IDeviceFactory *factory = Utils::findOrDefault(IDeviceFactory::allDeviceFactories(), [&map, deviceType](IDeviceFactory *factory) { return factory->canRestore(map) && factory->deviceType() == deviceType; @@ -368,7 +368,7 @@ IDevice::ConstPtr DeviceManager::deviceAt(int idx) const return d->devices.at(idx); } -IDevice::Ptr DeviceManager::mutableDevice(Core::Id id) const +IDevice::Ptr DeviceManager::mutableDevice(Utils::Id id) const { const int index = d->indexForId(id); return index == -1 ? IDevice::Ptr() : d->devices.at(index); @@ -381,15 +381,15 @@ bool DeviceManager::hasDevice(const QString &name) const }); } -IDevice::ConstPtr DeviceManager::find(Core::Id id) const +IDevice::ConstPtr DeviceManager::find(Utils::Id id) const { const int index = d->indexForId(id); return index == -1 ? IDevice::ConstPtr() : deviceAt(index); } -IDevice::ConstPtr DeviceManager::defaultDevice(Core::Id deviceType) const +IDevice::ConstPtr DeviceManager::defaultDevice(Utils::Id deviceType) const { - const Core::Id id = d->defaultDevices.value(deviceType); + const Utils::Id id = d->defaultDevices.value(deviceType); return id.isValid() ? find(id) : IDevice::ConstPtr(); } @@ -409,14 +409,14 @@ class TestDevice : public IDevice public: TestDevice() { - setupId(AutoDetected, Core::Id::fromString(QUuid::createUuid().toString())); + setupId(AutoDetected, Utils::Id::fromString(QUuid::createUuid().toString())); setType(testTypeId()); setMachineType(Hardware); setOsType(HostOsInfo::hostOs()); setDisplayType("blubb"); } - static Core::Id testTypeId() { return "TestType"; } + static Utils::Id testTypeId() { return "TestType"; } private: IDeviceWidget *createWidget() override { return nullptr; } DeviceProcessSignalOperation::Ptr signalOperation() const override diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.h b/src/plugins/projectexplorer/devicesupport/devicemanager.h index 6f286845dd..0f9c036248 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanager.h +++ b/src/plugins/projectexplorer/devicesupport/devicemanager.h @@ -60,20 +60,20 @@ public: int deviceCount() const; IDevice::ConstPtr deviceAt(int index) const; - IDevice::ConstPtr find(Core::Id id) const; - IDevice::ConstPtr defaultDevice(Core::Id deviceType) const; + IDevice::ConstPtr find(Utils::Id id) const; + IDevice::ConstPtr defaultDevice(Utils::Id deviceType) const; bool hasDevice(const QString &name) const; void addDevice(const IDevice::ConstPtr &device); - void removeDevice(Core::Id id); - void setDeviceState(Core::Id deviceId, IDevice::DeviceState deviceState); + void removeDevice(Utils::Id id); + void setDeviceState(Utils::Id deviceId, IDevice::DeviceState deviceState); bool isLoaded() const; signals: - void deviceAdded(Core::Id id); - void deviceRemoved(Core::Id id); - void deviceUpdated(Core::Id id); + void deviceAdded(Utils::Id id); + void deviceRemoved(Utils::Id id); + void deviceUpdated(Utils::Id id); void deviceListReplaced(); // For bulk changes via the settings dialog. void updated(); // Emitted for all of the above. @@ -86,12 +86,12 @@ private: void load(); static const IDeviceFactory *restoreFactory(const QVariantMap &map); - QList<IDevice::Ptr> fromMap(const QVariantMap &map, QHash<Core::Id, Core::Id> *defaultDevices); + QList<IDevice::Ptr> fromMap(const QVariantMap &map, QHash<Utils::Id, Utils::Id> *defaultDevices); QVariantMap toMap() const; // For SettingsWidget. - IDevice::Ptr mutableDevice(Core::Id id) const; - void setDefaultDevice(Core::Id id); + IDevice::Ptr mutableDevice(Utils::Id id) const; + void setDefaultDevice(Utils::Id id); static DeviceManager *cloneInstance(); static void replaceInstance(); static void removeClonedInstance(); diff --git a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp index b5ff411f4f..6f01cc8749 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp @@ -38,8 +38,8 @@ class DeviceManagerModelPrivate public: const DeviceManager *deviceManager; QList<IDevice::ConstPtr> devices; - QList<Core::Id> filter; - Core::Id typeToKeep; + QList<Utils::Id> filter; + Utils::Id typeToKeep; }; } // namespace Internal @@ -60,13 +60,13 @@ DeviceManagerModel::DeviceManagerModel(const DeviceManager *deviceManager, QObje DeviceManagerModel::~DeviceManagerModel() = default; -void DeviceManagerModel::setFilter(const QList<Core::Id> &filter) +void DeviceManagerModel::setFilter(const QList<Utils::Id> &filter) { d->filter = filter; handleDeviceListChanged(); } -void DeviceManagerModel::setTypeFilter(Core::Id type) +void DeviceManagerModel::setTypeFilter(Utils::Id type) { if (d->typeToKeep == type) return; @@ -74,7 +74,7 @@ void DeviceManagerModel::setTypeFilter(Core::Id type) handleDeviceListChanged(); } -void DeviceManagerModel::updateDevice(Core::Id id) +void DeviceManagerModel::updateDevice(Utils::Id id) { handleDeviceUpdated(id); } @@ -86,10 +86,10 @@ IDevice::ConstPtr DeviceManagerModel::device(int pos) const return d->devices.at(pos); } -Core::Id DeviceManagerModel::deviceId(int pos) const +Utils::Id DeviceManagerModel::deviceId(int pos) const { IDevice::ConstPtr dev = device(pos); - return dev ? dev->id() : Core::Id(); + return dev ? dev->id() : Utils::Id(); } int DeviceManagerModel::indexOf(IDevice::ConstPtr dev) const @@ -104,7 +104,7 @@ int DeviceManagerModel::indexOf(IDevice::ConstPtr dev) const return -1; } -void DeviceManagerModel::handleDeviceAdded(Core::Id id) +void DeviceManagerModel::handleDeviceAdded(Utils::Id id) { if (d->filter.contains(id)) return; @@ -117,7 +117,7 @@ void DeviceManagerModel::handleDeviceAdded(Core::Id id) endInsertRows(); } -void DeviceManagerModel::handleDeviceRemoved(Core::Id id) +void DeviceManagerModel::handleDeviceRemoved(Utils::Id id) { const int idx = indexForId(id); QTC_ASSERT(idx != -1, return); @@ -126,7 +126,7 @@ void DeviceManagerModel::handleDeviceRemoved(Core::Id id) endRemoveRows(); } -void DeviceManagerModel::handleDeviceUpdated(Core::Id id) +void DeviceManagerModel::handleDeviceUpdated(Utils::Id id) { const int idx = indexForId(id); if (idx < 0) // This occurs when a device not matching the type filter is updated @@ -180,7 +180,7 @@ bool DeviceManagerModel::matchesTypeFilter(const IDevice::ConstPtr &dev) const return !d->typeToKeep.isValid() || dev->type() == d->typeToKeep; } -int DeviceManagerModel::indexForId(Core::Id id) const +int DeviceManagerModel::indexForId(Utils::Id id) const { for (int i = 0; i < d->devices.count(); ++i) { if (d->devices.at(i)->id() == id) diff --git a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h index c7544cdf68..3144896cda 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h +++ b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h @@ -44,21 +44,21 @@ public: explicit DeviceManagerModel(const DeviceManager *deviceManager, QObject *parent = nullptr); ~DeviceManagerModel() override; - void setFilter(const QList<Core::Id> &filter); - void setTypeFilter(Core::Id type); + void setFilter(const QList<Utils::Id> &filter); + void setTypeFilter(Utils::Id type); IDevice::ConstPtr device(int pos) const; - Core::Id deviceId(int pos) const; + Utils::Id deviceId(int pos) const; int indexOf(IDevice::ConstPtr dev) const; - int indexForId(Core::Id id) const; + int indexForId(Utils::Id id) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override; - void updateDevice(Core::Id id); + void updateDevice(Utils::Id id); private: - void handleDeviceAdded(Core::Id id); - void handleDeviceRemoved(Core::Id id); - void handleDeviceUpdated(Core::Id id); + void handleDeviceAdded(Utils::Id id); + void handleDeviceRemoved(Utils::Id id); + void handleDeviceUpdated(Utils::Id id); void handleDeviceListChanged(); QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h index 66e22c7e8f..4514d624f0 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h +++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h @@ -59,7 +59,7 @@ private: void saveSettings(); - void handleDeviceUpdated(Core::Id id); + void handleDeviceUpdated(Utils::Id id); void currentDeviceChanged(int index); void addDevice(); void removeDevice(); diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp index b1685a2791..f4c4904efb 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.cpp +++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp @@ -70,7 +70,7 @@ */ /*! - * \fn Core::Id ProjectExplorer::IDevice::invalidId() + * \fn Utils::Id ProjectExplorer::IDevice::invalidId() * A value that no device can ever have as its internal id. */ @@ -98,9 +98,9 @@ */ -static Core::Id newId() +static Utils::Id newId() { - return Core::Id::fromString(QUuid::createUuid().toString()); + return Utils::Id::fromString(QUuid::createUuid().toString()); } namespace ProjectExplorer { @@ -140,9 +140,9 @@ public: Utils::DisplayName displayName; QString displayType; - Core::Id type; + Utils::Id type; IDevice::Origin origin = IDevice::AutoDetected; - Core::Id id; + Utils::Id id; IDevice::DeviceState deviceState = IDevice::DeviceStateUnknown; IDevice::MachineType machineType = IDevice::Hardware; Utils::OsType osType = Utils::OsTypeOther; @@ -171,7 +171,7 @@ void IDevice::setOpenTerminal(const IDevice::OpenTerminal &openTerminal) d->openTerminal = openTerminal; } -void IDevice::setupId(Origin origin, Core::Id id) +void IDevice::setupId(Origin origin, Utils::Id id) { d->origin = origin; QTC_CHECK(origin == ManuallyAdded || id.isValid()); @@ -238,12 +238,12 @@ IDevice::DeviceInfo IDevice::deviceInformation() const \sa ProjectExplorer::IDeviceFactory */ -Core::Id IDevice::type() const +Utils::Id IDevice::type() const { return d->type; } -void IDevice::setType(Core::Id type) +void IDevice::setType(Utils::Id type) { d->type = type; } @@ -269,7 +269,7 @@ bool IDevice::isAutoDetected() const \sa ProjectExplorer::DeviceManager::findInactiveAutoDetectedDevice() */ -Core::Id IDevice::id() const +Utils::Id IDevice::id() const { return d->id; } @@ -340,14 +340,14 @@ void IDevice::setDeviceState(const IDevice::DeviceState state) d->deviceState = state; } -Core::Id IDevice::typeFromMap(const QVariantMap &map) +Utils::Id IDevice::typeFromMap(const QVariantMap &map) { - return Core::Id::fromSetting(map.value(QLatin1String(TypeKey))); + return Utils::Id::fromSetting(map.value(QLatin1String(TypeKey))); } -Core::Id IDevice::idFromMap(const QVariantMap &map) +Utils::Id IDevice::idFromMap(const QVariantMap &map) { - return Core::Id::fromSetting(map.value(QLatin1String(IdKey))); + return Utils::Id::fromSetting(map.value(QLatin1String(IdKey))); } /*! @@ -360,7 +360,7 @@ void IDevice::fromMap(const QVariantMap &map) { d->type = typeFromMap(map); d->displayName.fromMap(map, DisplayNameKey); - d->id = Core::Id::fromSetting(map.value(QLatin1String(IdKey))); + d->id = Utils::Id::fromSetting(map.value(QLatin1String(IdKey))); if (!d->id.isValid()) d->id = newId(); d->origin = static_cast<Origin>(map.value(QLatin1String(OriginKey), ManuallyAdded).toInt()); @@ -514,12 +514,12 @@ void IDevice::setQmlsceneCommand(const QString &path) d->qmlsceneCommand = path; } -void IDevice::setExtraData(Core::Id kind, const QVariant &data) +void IDevice::setExtraData(Utils::Id kind, const QVariant &data) { d->extraData.insert(kind.toString(), data); } -QVariant IDevice::extraData(Core::Id kind) const +QVariant IDevice::extraData(Utils::Id kind) const { return d->extraData.value(kind.toString()); } diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h index 9a59f10672..c3caaa617f 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.h +++ b/src/plugins/projectexplorer/devicesupport/idevice.h @@ -27,7 +27,7 @@ #include "../projectexplorer_export.h" -#include <coreplugin/id.h> +#include <utils/id.h> #include <utils/hostosinfo.h> #include <QAbstractSocket> @@ -147,11 +147,11 @@ public: using DeviceInfo = QList<DeviceInfoItem>; virtual DeviceInfo deviceInformation() const; - Core::Id type() const; - void setType(Core::Id type); + Utils::Id type() const; + void setType(Utils::Id type); bool isAutoDetected() const; - Core::Id id() const; + Utils::Id id() const; virtual bool isCompatibleWith(const Kit *k) const; @@ -189,8 +189,8 @@ public: virtual void fromMap(const QVariantMap &map); virtual QVariantMap toMap() const; - static Core::Id typeFromMap(const QVariantMap &map); - static Core::Id idFromMap(const QVariantMap &map); + static Utils::Id typeFromMap(const QVariantMap &map); + static Utils::Id idFromMap(const QVariantMap &map); static QString defaultPrivateKeyFilePath(); static QString defaultPublicKeyFilePath(); @@ -213,10 +213,10 @@ public: QString qmlsceneCommand() const; void setQmlsceneCommand(const QString &path); - void setExtraData(Core::Id kind, const QVariant &data); - QVariant extraData(Core::Id kind) const; + void setExtraData(Utils::Id kind, const QVariant &data); + QVariant extraData(Utils::Id kind) const; - void setupId(Origin origin, Core::Id id = Core::Id()); + void setupId(Origin origin, Utils::Id id = Utils::Id()); bool canOpenTerminal() const; void openTerminal(const Utils::Environment &env, const QString &workingDir) const; diff --git a/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp b/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp index 9f0cb7a55b..9281e8b739 100644 --- a/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp +++ b/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp @@ -86,7 +86,7 @@ IDevice::Ptr IDeviceFactory::construct() const static QList<IDeviceFactory *> g_deviceFactories; -IDeviceFactory *IDeviceFactory::find(Core::Id type) +IDeviceFactory *IDeviceFactory::find(Utils::Id type) { return Utils::findOrDefault(g_deviceFactories, [&type](IDeviceFactory *factory) { @@ -94,7 +94,7 @@ IDeviceFactory *IDeviceFactory::find(Core::Id type) }); } -IDeviceFactory::IDeviceFactory(Core::Id deviceType) +IDeviceFactory::IDeviceFactory(Utils::Id deviceType) : m_deviceType(deviceType) { g_deviceFactories.append(this); diff --git a/src/plugins/projectexplorer/devicesupport/idevicefactory.h b/src/plugins/projectexplorer/devicesupport/idevicefactory.h index 1cf49385ba..36ba7bf7d1 100644 --- a/src/plugins/projectexplorer/devicesupport/idevicefactory.h +++ b/src/plugins/projectexplorer/devicesupport/idevicefactory.h @@ -39,7 +39,7 @@ public: virtual ~IDeviceFactory(); static const QList<IDeviceFactory *> allDeviceFactories(); - Core::Id deviceType() const { return m_deviceType; } + Utils::Id deviceType() const { return m_deviceType; } QString displayName() const { return m_displayName; } QIcon icon() const { return m_icon; } bool canCreate() const; @@ -49,10 +49,10 @@ public: virtual bool canRestore(const QVariantMap &) const { return true; } - static IDeviceFactory *find(Core::Id type); + static IDeviceFactory *find(Utils::Id type); protected: - explicit IDeviceFactory(Core::Id deviceType); + explicit IDeviceFactory(Utils::Id deviceType); IDeviceFactory(const IDeviceFactory &) = delete; IDeviceFactory &operator=(const IDeviceFactory &) = delete; @@ -63,7 +63,7 @@ protected: void setConstructionFunction(const std::function<IDevice::Ptr ()> &constructor); private: - const Core::Id m_deviceType; + const Utils::Id m_deviceType; QString m_displayName; QIcon m_icon; bool m_canCreate = false; diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp index 1bb2d4f27c..50c5503c93 100644 --- a/src/plugins/projectexplorer/editorconfiguration.cpp +++ b/src/plugins/projectexplorer/editorconfiguration.cpp @@ -30,7 +30,6 @@ #include <utils/algorithm.h> -#include <coreplugin/id.h> #include <coreplugin/icore.h> #include <coreplugin/editormanager/editormanager.h> #include <texteditor/texteditor.h> @@ -79,16 +78,16 @@ struct EditorConfigurationPrivate MarginSettings m_marginSettings; QTextCodec *m_textCodec; - QMap<Core::Id, ICodeStylePreferences *> m_languageCodeStylePreferences; + QMap<Utils::Id, ICodeStylePreferences *> m_languageCodeStylePreferences; QList<BaseTextEditor *> m_editors; }; EditorConfiguration::EditorConfiguration() : d(std::make_unique<EditorConfigurationPrivate>()) { - const QMap<Core::Id, ICodeStylePreferences *> languageCodeStylePreferences = TextEditorSettings::codeStyles(); + const QMap<Utils::Id, ICodeStylePreferences *> languageCodeStylePreferences = TextEditorSettings::codeStyles(); for (auto itCodeStyle = languageCodeStylePreferences.cbegin(), end = languageCodeStylePreferences.cend(); itCodeStyle != end; ++itCodeStyle) { - Core::Id languageId = itCodeStyle.key(); + Utils::Id languageId = itCodeStyle.key(); // global prefs for language ICodeStylePreferences *originalPreferences = itCodeStyle.value(); ICodeStylePreferencesFactory *factory = TextEditorSettings::codeStyleFactory(languageId); @@ -171,12 +170,12 @@ ICodeStylePreferences *EditorConfiguration::codeStyle() const return d->m_defaultCodeStyle; } -ICodeStylePreferences *EditorConfiguration::codeStyle(Core::Id languageId) const +ICodeStylePreferences *EditorConfiguration::codeStyle(Utils::Id languageId) const { return d->m_languageCodeStylePreferences.value(languageId, codeStyle()); } -QMap<Core::Id, ICodeStylePreferences *> EditorConfiguration::codeStyles() const +QMap<Utils::Id, ICodeStylePreferences *> EditorConfiguration::codeStyles() const { return d->m_languageCodeStylePreferences; } @@ -226,7 +225,7 @@ void EditorConfiguration::fromMap(const QVariantMap &map) qWarning() << "No data for code style settings list" << i << "found!"; continue; } - Core::Id languageId = Core::Id::fromSetting(settingsIdMap.value(QLatin1String("language"))); + Utils::Id languageId = Utils::Id::fromSetting(settingsIdMap.value(QLatin1String("language"))); QVariantMap value = settingsIdMap.value(QLatin1String("value")).toMap(); ICodeStylePreferences *preferences = d->m_languageCodeStylePreferences.value(languageId); if (preferences) diff --git a/src/plugins/projectexplorer/editorconfiguration.h b/src/plugins/projectexplorer/editorconfiguration.h index 59f7c4733d..60e72dfb61 100644 --- a/src/plugins/projectexplorer/editorconfiguration.h +++ b/src/plugins/projectexplorer/editorconfiguration.h @@ -27,7 +27,7 @@ #include "projectexplorer_export.h" -#include <coreplugin/id.h> +#include <utils/id.h> #include <QObject> #include <QVariantMap> @@ -78,8 +78,8 @@ public: const TextEditor::MarginSettings &marginSettings() const; TextEditor::ICodeStylePreferences *codeStyle() const; - TextEditor::ICodeStylePreferences *codeStyle(Core::Id languageId) const; - QMap<Core::Id, TextEditor::ICodeStylePreferences *> codeStyles() const; + TextEditor::ICodeStylePreferences *codeStyle(Utils::Id languageId) const; + QMap<Utils::Id, TextEditor::ICodeStylePreferences *> codeStyles() const; void configureEditor(TextEditor::BaseTextEditor *textEditor) const; void deconfigureEditor(TextEditor::BaseTextEditor *textEditor) const; diff --git a/src/plugins/projectexplorer/filterkitaspectsdialog.cpp b/src/plugins/projectexplorer/filterkitaspectsdialog.cpp index 12bd7ccf13..976420ffd3 100644 --- a/src/plugins/projectexplorer/filterkitaspectsdialog.cpp +++ b/src/plugins/projectexplorer/filterkitaspectsdialog.cpp @@ -48,7 +48,7 @@ public: { } QString displayName() const { return m_aspect->displayName(); } - Core::Id id() const { return m_aspect->id(); } + Utils::Id id() const { return m_aspect->id(); } bool enabled() const { return m_enabled; } private: @@ -96,7 +96,7 @@ public: for (const KitAspect * const aspect : KitManager::kitAspects()) { if (kit && !aspect->isApplicableToKit(kit)) continue; - const QSet<Core::Id> irrelevantAspects = kit ? kit->irrelevantAspects() + const QSet<Utils::Id> irrelevantAspects = kit ? kit->irrelevantAspects() : KitManager::irrelevantAspects(); auto * const item = new FilterTreeItem(aspect, !irrelevantAspects.contains(aspect->id())); @@ -109,9 +109,9 @@ public: rootItem()->sortChildren(cmp); } - QSet<Core::Id> disabledItems() const + QSet<Utils::Id> disabledItems() const { - QSet<Core::Id> ids; + QSet<Utils::Id> ids; for (int i = 0; i < rootItem()->childCount(); ++i) { const FilterTreeItem * const item = static_cast<FilterTreeItem *>(rootItem()->childAt(i)); @@ -154,7 +154,7 @@ FilterKitAspectsDialog::FilterKitAspectsDialog(const Kit *kit, QWidget *parent) connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); } -QSet<Core::Id> FilterKitAspectsDialog::irrelevantAspects() const +QSet<Utils::Id> FilterKitAspectsDialog::irrelevantAspects() const { return static_cast<FilterKitAspectsModel *>(m_model)->disabledItems(); } diff --git a/src/plugins/projectexplorer/filterkitaspectsdialog.h b/src/plugins/projectexplorer/filterkitaspectsdialog.h index f59a58f683..12ba775220 100644 --- a/src/plugins/projectexplorer/filterkitaspectsdialog.h +++ b/src/plugins/projectexplorer/filterkitaspectsdialog.h @@ -25,7 +25,7 @@ #pragma once -#include <coreplugin/id.h> +#include <utils/id.h> #include <QDialog> @@ -40,7 +40,7 @@ class FilterKitAspectsDialog : public QDialog Q_OBJECT public: FilterKitAspectsDialog(const Kit *kit, QWidget *parent); - QSet<Core::Id> irrelevantAspects() const; + QSet<Utils::Id> irrelevantAspects() const; private: Utils::BaseTreeModel * const m_model; diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp index 9a55283b97..e4ea4a94cc 100644 --- a/src/plugins/projectexplorer/gccparser.cpp +++ b/src/plugins/projectexplorer/gccparser.cpp @@ -61,9 +61,9 @@ GccParser::GccParser() QTC_CHECK(m_regExpGccNames.isValid()); } -Core::Id GccParser::id() +Utils::Id GccParser::id() { - return Core::Id("ProjectExplorer.OutputParser.Gcc"); + return Utils::Id("ProjectExplorer.OutputParser.Gcc"); } QList<OutputLineParser *> GccParser::gccParserSuite() diff --git a/src/plugins/projectexplorer/gccparser.h b/src/plugins/projectexplorer/gccparser.h index 346ddd8ede..9186998cd4 100644 --- a/src/plugins/projectexplorer/gccparser.h +++ b/src/plugins/projectexplorer/gccparser.h @@ -40,7 +40,7 @@ class PROJECTEXPLORER_EXPORT GccParser : public ProjectExplorer::OutputTaskParse public: GccParser(); - static Core::Id id(); + static Utils::Id id(); static QList<OutputLineParser *> gccParserSuite(); diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index e1dd253be6..d2c4882724 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -262,7 +262,7 @@ static Utils::FilePath gccInstallDir(const FilePath &path, const QStringList &en // GccToolChain // -------------------------------------------------------------------------- -GccToolChain::GccToolChain(Core::Id typeId) : +GccToolChain::GccToolChain(Utils::Id typeId) : ToolChain(typeId) { setTypeDisplayName(tr("GCC")); @@ -448,7 +448,7 @@ ToolChain::MacroInspectionRunner GccToolChain::createMacroInspectionRunner() con OptionsReinterpreter reinterpretOptions = m_optionsReinterpreter; QTC_CHECK(reinterpretOptions); MacrosCache macroCache = predefinedMacrosCache(); - Core::Id lang = language(); + Utils::Id lang = language(); // This runner must be thread-safe! return [env, compilerCommand, platformCodeGenFlags, reinterpretOptions, macroCache, lang] @@ -567,7 +567,7 @@ WarningFlags GccToolChain::warningFlags(const QStringList &cflags) const QStringList GccToolChain::gccPrepareArguments(const QStringList &flags, const QString &sysRoot, const QStringList &platformCodeGenFlags, - Core::Id languageId, + Utils::Id languageId, OptionsReinterpreter reinterpretOptions) { QStringList arguments; @@ -595,7 +595,7 @@ HeaderPaths GccToolChain::builtInHeaderPaths(const Utils::Environment &env, const QStringList &platformCodeGenFlags, OptionsReinterpreter reinterpretOptions, HeaderPathsCache headerCache, - Core::Id languageId, + Utils::Id languageId, ExtraHeaderPathsFunction extraHeaderPathsFunction, const QStringList &flags, const QString &sysRoot, @@ -1085,8 +1085,8 @@ QList<ToolChain *> GccToolChainFactory::detectForImport(const ToolChainDescripti } QList<ToolChain *> GccToolChainFactory::autoDetectToolchains( - const QString &compilerName, DetectVariants detectVariants, Core::Id language, - const Core::Id requiredTypeId, const QList<ToolChain *> &alreadyKnown, + const QString &compilerName, DetectVariants detectVariants, Utils::Id language, + const Utils::Id requiredTypeId, const QList<ToolChain *> &alreadyKnown, const ToolchainChecker &checker) { FilePaths compilerPaths; @@ -1453,7 +1453,7 @@ ClangToolChain::ClangToolChain() : { } -ClangToolChain::ClangToolChain(Core::Id typeId) : +ClangToolChain::ClangToolChain(Utils::Id typeId) : GccToolChain(typeId) { setTypeDisplayName(tr("Clang")); diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h index 72c693ea2c..1de34ce655 100644 --- a/src/plugins/projectexplorer/gcctoolchain.h +++ b/src/plugins/projectexplorer/gcctoolchain.h @@ -52,14 +52,14 @@ class LinuxIccToolChainFactory; // GccToolChain // -------------------------------------------------------------------------- -inline const QStringList languageOption(Core::Id languageId) +inline const QStringList languageOption(Utils::Id languageId) { if (languageId == Constants::C_LANGUAGE_ID) return {"-x", "c"}; return {"-x", "c++"}; } -inline const QStringList gccPredefinedMacrosOptions(Core::Id languageId) +inline const QStringList gccPredefinedMacrosOptions(Utils::Id languageId) { return languageOption(languageId) + QStringList({"-E", "-dM"}); } @@ -69,7 +69,7 @@ class PROJECTEXPLORER_EXPORT GccToolChain : public ToolChain Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::GccToolChain) public: - GccToolChain(Core::Id typeId); + GccToolChain(Utils::Id typeId); Abi targetAbi() const override; QString originalTargetTriple() const override; @@ -156,7 +156,7 @@ protected: const QStringList &platformCodeGenFlags, OptionsReinterpreter reinterpretOptions, HeaderPathsCache headerCache, - Core::Id languageId, + Utils::Id languageId, ExtraHeaderPathsFunction extraHeaderPathsFunction, const QStringList &flags, const QString &sysRoot, @@ -184,7 +184,7 @@ private: static QStringList gccPrepareArguments(const QStringList &flags, const QString &sysRoot, const QStringList &platformCodeGenFlags, - Core::Id languageId, + Utils::Id languageId, OptionsReinterpreter reinterpretOptions); protected: @@ -218,7 +218,7 @@ class PROJECTEXPLORER_EXPORT ClangToolChain : public GccToolChain public: ClangToolChain(); - explicit ClangToolChain(Core::Id typeId); + explicit ClangToolChain(Utils::Id typeId); ~ClangToolChain() override; Utils::FilePath makeCommand(const Utils::Environment &environment) const override; diff --git a/src/plugins/projectexplorer/gcctoolchainfactories.h b/src/plugins/projectexplorer/gcctoolchainfactories.h index 9708596834..8e3350e411 100644 --- a/src/plugins/projectexplorer/gcctoolchainfactories.h +++ b/src/plugins/projectexplorer/gcctoolchainfactories.h @@ -59,8 +59,8 @@ protected: enum class DetectVariants { Yes, No }; using ToolchainChecker = std::function<bool(const ToolChain *)>; QList<ToolChain *> autoDetectToolchains( - const QString &compilerName, DetectVariants detectVariants, Core::Id language, - const Core::Id requiredTypeId, const QList<ToolChain *> &alreadyKnown, + const QString &compilerName, DetectVariants detectVariants, Utils::Id language, + const Utils::Id requiredTypeId, const QList<ToolChain *> &alreadyKnown, const ToolchainChecker &checker = {}); QList<ToolChain *> autoDetectToolChain( const ToolChainDescription &tcd, diff --git a/src/plugins/projectexplorer/itaskhandler.h b/src/plugins/projectexplorer/itaskhandler.h index 89f8eda738..199e243988 100644 --- a/src/plugins/projectexplorer/itaskhandler.h +++ b/src/plugins/projectexplorer/itaskhandler.h @@ -27,7 +27,7 @@ #include "projectexplorer_export.h" -#include <coreplugin/id.h> +#include <utils/id.h> #include <QObject> #include <QString> @@ -50,7 +50,7 @@ public: virtual bool isDefaultHandler() const { return false; } virtual bool canHandle(const Task &) const = 0; virtual void handle(const Task &) = 0; - virtual Core::Id actionManagerId() const { return Core::Id(); } + virtual Utils::Id actionManagerId() const { return Utils::Id(); } virtual QAction *createAction(QObject *parent) const = 0; }; diff --git a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp index d4ca71687b..75c2daf716 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp @@ -39,6 +39,7 @@ #include <utils/qtcassert.h> using namespace Core; +using namespace Utils; namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h index a81aa6871d..a509721ad4 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h @@ -69,7 +69,7 @@ private: QVector<ConditionalFeature> m_requiredFeatures; QVector<ConditionalFeature> m_preferredFeatures; - QSet<Core::Id> evaluate(const QVector<ConditionalFeature> &list, const QVariant &defaultSet, + QSet<Utils::Id> evaluate(const QVector<ConditionalFeature> &list, const QVariant &defaultSet, JsonWizard *wiz); }; diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp index 073432ab26..0669f9584b 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp @@ -39,6 +39,9 @@ #include <QListView> #include <functional> + +using namespace Utils; + namespace { QJsonObject createWidget(const QString &type, const QString& nameSuffix, const QJsonObject &data) { @@ -173,7 +176,7 @@ void ProjectExplorer::ProjectExplorerPlugin::testJsonWizardsCheckBox() const FactoryPtr factory(JsonWizardFactory::createWizardFactory(wizardObject.toVariantMap(), QDir(), &errorMessage)); QVERIFY2(factory, qPrintable(errorMessage)); - Utils::Wizard *wizard = factory->runWizard(QString(), &parent, Core::Id(), QVariantMap()); + Wizard *wizard = factory->runWizard(QString(), &parent, Id(), QVariantMap()); QVERIFY(!findCheckBox(wizard, "Default")->isChecked()); QCOMPARE(wizard->field("DefaultCheckBox"), QVariant(false)); @@ -205,7 +208,7 @@ void ProjectExplorer::ProjectExplorerPlugin::testJsonWizardsLineEdit() const FactoryPtr factory(JsonWizardFactory::createWizardFactory(wizardObject.toVariantMap(), QDir(), &errorMessage)); QVERIFY2(factory, qPrintable(errorMessage)); - Utils::Wizard *wizard = factory->runWizard(QString(), &parent, Core::Id(), QVariantMap()); + Wizard *wizard = factory->runWizard(QString(), &parent, Id(), QVariantMap()); QVERIFY(findLineEdit(wizard, "Default")); QVERIFY(findLineEdit(wizard, "Default")->text().isEmpty()); QCOMPARE(qPrintable(findLineEdit(wizard, "WithText")->text()), "some text"); @@ -233,7 +236,7 @@ void ProjectExplorer::ProjectExplorerPlugin::testJsonWizardsComboBox() const QJsonObject wizardObject = createGeneralWizard(pages); const FactoryPtr factory(JsonWizardFactory::createWizardFactory(wizardObject.toVariantMap(), QDir(), &errorMessage)); QVERIFY2(factory, qPrintable(errorMessage)); - Utils::Wizard *wizard = factory->runWizard(QString(), &parent, Core::Id(), QVariantMap()); + Utils::Wizard *wizard = factory->runWizard(QString(), &parent, Id(), QVariantMap()); QComboBox *defaultComboBox = findComboBox(wizard, "Default"); QVERIFY(defaultComboBox); @@ -291,7 +294,7 @@ void ProjectExplorer::ProjectExplorerPlugin::testJsonWizardsIconList() const QJsonObject wizardObject = createGeneralWizard(pages); const FactoryPtr factory(JsonWizardFactory::createWizardFactory(wizardObject.toVariantMap(), QDir(), &errorMessage)); QVERIFY2(factory, qPrintable(errorMessage)); - Utils::Wizard *wizard = factory->runWizard(QString(), &parent, Core::Id(), QVariantMap()); + Wizard *wizard = factory->runWizard(QString(), &parent, Id(), QVariantMap()); auto view = wizard->findChild<QListView *>("FancyIconList"); QCOMPARE(view->model()->rowCount(), 2); diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp index 0d46128e12..6c446201a9 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp @@ -106,7 +106,7 @@ static QString supportedTypeIds(const QList<T *> &factories) { QStringList tmp; foreach (const T*f, factories) { - foreach (Core::Id i, f->supportedIds()) + foreach (Utils::Id i, f->supportedIds()) tmp.append(i.toString()); } return tmp.join(QLatin1String("', '")); @@ -127,7 +127,7 @@ static JsonWizardFactory::Generator parseGenerator(const QVariant &value, QStrin *errorMessage = QCoreApplication::translate("ProjectExplorer::JsonWizardFactory", "Generator has no typeId set."); return gen; } - Core::Id typeId = Core::Id::fromString(QLatin1String(Constants::GENERATOR_ID_PREFIX) + strVal); + Utils::Id typeId = Utils::Id::fromString(QLatin1String(Constants::GENERATOR_ID_PREFIX) + strVal); JsonWizardGeneratorFactory *factory = Utils::findOr(s_generatorFactories, nullptr, [typeId](JsonWizardGeneratorFactory *f) { return f->canCreate(typeId); }); if (!factory) { @@ -163,7 +163,7 @@ static JsonWizardFactory::Page parsePage(const QVariant &value, QString *errorMe *errorMessage = QCoreApplication::translate("ProjectExplorer::JsonWizardFactory", "Page has no typeId set."); return p; } - Core::Id typeId = Core::Id::fromString(QLatin1String(Constants::PAGE_ID_PREFIX) + strVal); + Utils::Id typeId = Utils::Id::fromString(QLatin1String(Constants::PAGE_ID_PREFIX) + strVal); JsonWizardPageFactory *factory = Utils::findOr(s_pageFactories, nullptr, [typeId](JsonWizardPageFactory *f) { return f->canCreate(typeId); }); @@ -375,7 +375,7 @@ void JsonWizardFactory::registerGeneratorFactory(JsonWizardGeneratorFactory *fac } Utils::Wizard *JsonWizardFactory::runWizardImpl(const QString &path, QWidget *parent, - Core::Id platform, + Utils::Id platform, const QVariantMap &variables) { auto wizard = new JsonWizard(parent); @@ -383,15 +383,15 @@ Utils::Wizard *JsonWizardFactory::runWizardImpl(const QString &path, QWidget *pa wizard->setWindowTitle(displayName()); wizard->setValue(QStringLiteral("WizardDir"), m_wizardDir); - QSet<Core::Id> tmp = requiredFeatures(); + QSet<Utils::Id> tmp = requiredFeatures(); tmp.subtract(pluginFeatures()); - wizard->setValue(QStringLiteral("RequiredFeatures"), Core::Id::toStringList(tmp)); + wizard->setValue(QStringLiteral("RequiredFeatures"), Utils::Id::toStringList(tmp)); tmp = m_preferredFeatures; tmp.subtract(pluginFeatures()); - wizard->setValue(QStringLiteral("PreferredFeatures"), Core::Id::toStringList(tmp)); + wizard->setValue(QStringLiteral("PreferredFeatures"), Utils::Id::toStringList(tmp)); - wizard->setValue(QStringLiteral("Features"), Core::Id::toStringList(availableFeatures(platform))); - wizard->setValue(QStringLiteral("Plugins"), Core::Id::toStringList(pluginFeatures())); + wizard->setValue(QStringLiteral("Features"), Utils::Id::toStringList(availableFeatures(platform))); + wizard->setValue(QStringLiteral("Plugins"), Utils::Id::toStringList(pluginFeatures())); // Add data to wizard: for (auto i = variables.constBegin(); i != variables.constEnd(); ++i) @@ -504,7 +504,7 @@ QString JsonWizardFactory::localizedString(const QVariant &value) return QCoreApplication::translate("ProjectExplorer::JsonWizard", value.toByteArray()); } -bool JsonWizardFactory::isAvailable(Core::Id platformId) const +bool JsonWizardFactory::isAvailable(Utils::Id platformId) const { if (!IWizardFactory::isAvailable(platformId)) // check for required features return false; @@ -514,9 +514,9 @@ bool JsonWizardFactory::isAvailable(Core::Id platformId) const expander.registerVariable("Platform", tr("The platform selected for the wizard."), [platformId]() { return platformId.toString(); }); expander.registerVariable("Features", tr("The features available to this wizard."), - [this, e, platformId]() { return JsonWizard::stringListToArrayString(Core::Id::toStringList(availableFeatures(platformId)), e); }); + [this, e, platformId]() { return JsonWizard::stringListToArrayString(Utils::Id::toStringList(availableFeatures(platformId)), e); }); expander.registerVariable("Plugins", tr("The plugins loaded."), [this, e]() { - return JsonWizard::stringListToArrayString(Core::Id::toStringList(pluginFeatures()), e); + return JsonWizard::stringListToArrayString(Utils::Id::toStringList(pluginFeatures()), e); }); Core::JsExpander jsExpander; jsExpander.registerObject("Wizard", @@ -547,7 +547,7 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const QDir &baseDir, m_enabledExpression = data.value(QLatin1String(ENABLED_EXPRESSION_KEY), true); - QSet<Core::Id> projectTypes = Core::Id::fromStringList(data.value(QLatin1String(SUPPORTED_PROJECTS)).toStringList()); + QSet<Utils::Id> projectTypes = Utils::Id::fromStringList(data.value(QLatin1String(SUPPORTED_PROJECTS)).toStringList()); // FIXME: "kind" was relevant up to and including Qt Creator 3.6: const QString unsetKind = QUuid::createUuid().toString(); QString strVal = data.value(QLatin1String(KIND_KEY), unsetKind).toString(); @@ -572,7 +572,7 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const QDir &baseDir, *errorMessage = tr("No id set."); return false; } - setId(Core::Id::fromString(strVal)); + setId(Utils::Id::fromString(strVal)); strVal = data.value(QLatin1String(CATEGORY_KEY)).toString(); if (strVal.isEmpty()) { @@ -605,8 +605,8 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const QDir &baseDir, setDescriptionImage(strVal); } - setRequiredFeatures(Core::Id::fromStringList(data.value(QLatin1String(REQUIRED_FEATURES_KEY)).toStringList())); - m_preferredFeatures = Core::Id::fromStringList(data.value(QLatin1String(SUGGESTED_FEATURES_KEY)).toStringList()); + setRequiredFeatures(Utils::Id::fromStringList(data.value(QLatin1String(REQUIRED_FEATURES_KEY)).toStringList())); + m_preferredFeatures = Utils::Id::fromStringList(data.value(QLatin1String(SUGGESTED_FEATURES_KEY)).toStringList()); m_preferredFeatures.unite(requiredFeatures()); strVal = localizedString(data.value(QLatin1String(DISPLAY_NAME_KEY))); @@ -672,9 +672,9 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const QDir &baseDir, namespace Internal { -JsonWizardFactoryJsExtension::JsonWizardFactoryJsExtension(Core::Id platformId, - const QSet<Core::Id> &availableFeatures, - const QSet<Core::Id> &pluginFeatures) +JsonWizardFactoryJsExtension::JsonWizardFactoryJsExtension(Utils::Id platformId, + const QSet<Utils::Id> &availableFeatures, + const QSet<Utils::Id> &pluginFeatures) : m_platformId(platformId) , m_availableFeatures(availableFeatures) , m_pluginFeatures(pluginFeatures) @@ -685,9 +685,9 @@ QVariant JsonWizardFactoryJsExtension::value(const QString &name) const if (name == "Platform") return m_platformId.toString(); if (name == "Features") - return Core::Id::toStringList(m_availableFeatures); + return Utils::Id::toStringList(m_availableFeatures); if (name == "Plugins") - return Core::Id::toStringList(m_pluginFeatures); + return Utils::Id::toStringList(m_pluginFeatures); return QVariant(); } diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h index 8cb3273356..4d4ce62aa7 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h @@ -62,7 +62,7 @@ public: public: bool isValid() const { return typeId.isValid(); } - Core::Id typeId; + Utils::Id typeId; QVariant data; }; @@ -73,7 +73,7 @@ public: QString subTitle; QString shortTitle; int index = -1; // page index in the wizard - Core::Id typeId; + Utils::Id typeId; QVariant enabled; QVariant data; }; @@ -85,10 +85,10 @@ public: static QString localizedString(const QVariant &value); - bool isAvailable(Core::Id platformId) const override; + bool isAvailable(Utils::Id platformId) const override; private: - Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, Core::Id platform, + Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, Utils::Id platform, const QVariantMap &variables) override; // Create all wizards. As other plugins might register factories for derived @@ -111,7 +111,7 @@ private: QList<Page> m_pages; QList<JsonWizard::OptionDefinition> m_options; - QSet<Core::Id> m_preferredFeatures; + QSet<Utils::Id> m_preferredFeatures; static int m_verbose; @@ -125,16 +125,16 @@ class JsonWizardFactoryJsExtension : public QObject { Q_OBJECT public: - JsonWizardFactoryJsExtension(Core::Id platformId, - const QSet<Core::Id> &availableFeatures, - const QSet<Core::Id> &pluginFeatures); + JsonWizardFactoryJsExtension(Utils::Id platformId, + const QSet<Utils::Id> &availableFeatures, + const QSet<Utils::Id> &pluginFeatures); Q_INVOKABLE QVariant value(const QString &name) const; private: - Core::Id m_platformId; - QSet<Core::Id> m_availableFeatures; - QSet<Core::Id> m_pluginFeatures; + Utils::Id m_platformId; + QSet<Utils::Id> m_availableFeatures; + QSet<Utils::Id> m_pluginFeatures; }; } // namespace Internal diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp index 5d9a7e19ef..9e873e6b41 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp @@ -56,6 +56,7 @@ using namespace Core; using namespace TextEditor; +using namespace Utils; namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h index 28311711e8..37266a8e4c 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h @@ -29,7 +29,7 @@ #include "jsonwizard.h" -#include <coreplugin/id.h> +#include <utils/id.h> #include <QList> #include <QObject> @@ -69,15 +69,15 @@ class JsonWizardGeneratorFactory : public QObject Q_OBJECT public: - bool canCreate(Core::Id typeId) const { return m_typeIds.contains(typeId); } - QList<Core::Id> supportedIds() const { return m_typeIds; } + bool canCreate(Utils::Id typeId) const { return m_typeIds.contains(typeId); } + QList<Utils::Id> supportedIds() const { return m_typeIds; } - virtual JsonWizardGenerator *create(Core::Id typeId, const QVariant &data, - const QString &path, Core::Id platform, + virtual JsonWizardGenerator *create(Utils::Id typeId, const QVariant &data, + const QString &path, Utils::Id platform, const QVariantMap &variables) = 0; // Basic syntax check for the data taken from the wizard.json file: - virtual bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) = 0; + virtual bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) = 0; protected: // This will add "PE.Wizard.Generator." in front of the suffixes and set those as supported typeIds @@ -85,7 +85,7 @@ protected: void setTypeIdsSuffix(const QString &suffix); private: - QList<Core::Id> m_typeIds; + QList<Utils::Id> m_typeIds; }; namespace Internal { @@ -97,10 +97,10 @@ class FileGeneratorFactory : public JsonWizardGeneratorFactory public: FileGeneratorFactory(); - JsonWizardGenerator *create(Core::Id typeId, const QVariant &data, - const QString &path, Core::Id platform, + JsonWizardGenerator *create(Utils::Id typeId, const QVariant &data, + const QString &path, Utils::Id platform, const QVariantMap &variables) override; - bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override; + bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override; }; class ScannerGeneratorFactory : public JsonWizardGeneratorFactory @@ -110,10 +110,10 @@ class ScannerGeneratorFactory : public JsonWizardGeneratorFactory public: ScannerGeneratorFactory(); - JsonWizardGenerator *create(Core::Id typeId, const QVariant &data, - const QString &path, Core::Id platform, + JsonWizardGenerator *create(Utils::Id typeId, const QVariant &data, + const QString &path, Utils::Id platform, const QVariantMap &variables) override; - bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override; + bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override; }; } // namespace Internal diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.cpp index c2c49b61ed..93f192fa2b 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.cpp @@ -40,7 +40,7 @@ JsonWizardPageFactory::~JsonWizardPageFactory() = default; void JsonWizardPageFactory::setTypeIdsSuffixes(const QStringList &suffixes) { m_typeIds = Utils::transform(suffixes, [](const QString &suffix) { - return Core::Id::fromString(QString::fromLatin1(Constants::PAGE_ID_PREFIX) + suffix);}); + return Utils::Id::fromString(QString::fromLatin1(Constants::PAGE_ID_PREFIX) + suffix);}); } void JsonWizardPageFactory::setTypeIdsSuffix(const QString &suffix) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.h index 5752b3b4cb..81484db21b 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.h @@ -27,7 +27,7 @@ #include "../projectexplorer_export.h" -#include <coreplugin/id.h> +#include <utils/id.h> #include <QVariant> #include <QStringList> @@ -42,13 +42,13 @@ class PROJECTEXPLORER_EXPORT JsonWizardPageFactory public: virtual ~JsonWizardPageFactory(); - bool canCreate(Core::Id typeId) const { return m_typeIds.contains(typeId); } - QList<Core::Id> supportedIds() const { return m_typeIds; } + bool canCreate(Utils::Id typeId) const { return m_typeIds.contains(typeId); } + QList<Utils::Id> supportedIds() const { return m_typeIds; } - virtual Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) = 0; + virtual Utils::WizardPage *create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) = 0; // Basic syntax check for the data taken from the wizard.json file: - virtual bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) = 0; + virtual bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) = 0; protected: // This will add "PE.Wizard.Page." in front of the suffixes and set those as supported typeIds @@ -56,7 +56,7 @@ protected: void setTypeIdsSuffix(const QString &suffix); private: - QList<Core::Id> m_typeIds; + QList<Utils::Id> m_typeIds; }; } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp index 774b63376e..dad6e9539e 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp @@ -60,7 +60,7 @@ FieldPageFactory::FieldPageFactory() JsonFieldPage::registerFieldFactory(QLatin1String("IconList"), []() { return new IconListField; }); } -Utils::WizardPage *FieldPageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) +Utils::WizardPage *FieldPageFactory::create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) { Q_UNUSED(wizard) @@ -76,7 +76,7 @@ Utils::WizardPage *FieldPageFactory::create(JsonWizard *wizard, Core::Id typeId, return page; } -bool FieldPageFactory::validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) +bool FieldPageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) { QTC_ASSERT(canCreate(typeId), return false); @@ -107,7 +107,7 @@ FilePageFactory::FilePageFactory() setTypeIdsSuffix(QLatin1String("File")); } -Utils::WizardPage *FilePageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) +Utils::WizardPage *FilePageFactory::create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) { Q_UNUSED(wizard) Q_UNUSED(data) @@ -116,7 +116,7 @@ Utils::WizardPage *FilePageFactory::create(JsonWizard *wizard, Core::Id typeId, return new JsonFilePage; } -bool FilePageFactory::validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) +bool FilePageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) { QTC_ASSERT(canCreate(typeId), return false); if (!data.isNull() && (data.type() != QVariant::Map || !data.toMap().isEmpty())) { @@ -141,7 +141,7 @@ KitsPageFactory::KitsPageFactory() setTypeIdsSuffix(QLatin1String("Kits")); } -Utils::WizardPage *KitsPageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) +Utils::WizardPage *KitsPageFactory::create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) { Q_UNUSED(wizard) QTC_ASSERT(canCreate(typeId), return nullptr); @@ -168,7 +168,7 @@ static bool validateFeatureList(const QVariantMap &data, const QByteArray &key, return true; } -bool KitsPageFactory::validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) +bool KitsPageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) { QTC_ASSERT(canCreate(typeId), return false); @@ -201,7 +201,7 @@ ProjectPageFactory::ProjectPageFactory() setTypeIdsSuffix(QLatin1String("Project")); } -Utils::WizardPage *ProjectPageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) +Utils::WizardPage *ProjectPageFactory::create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) { Q_UNUSED(wizard) Q_UNUSED(data) @@ -224,7 +224,7 @@ Utils::WizardPage *ProjectPageFactory::create(JsonWizard *wizard, Core::Id typeI return page; } -bool ProjectPageFactory::validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) +bool ProjectPageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) { Q_UNUSED(errorMessage) @@ -261,7 +261,7 @@ SummaryPageFactory::SummaryPageFactory() setTypeIdsSuffix(QLatin1String("Summary")); } -Utils::WizardPage *SummaryPageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) +Utils::WizardPage *SummaryPageFactory::create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) { Q_UNUSED(wizard) Q_UNUSED(data) @@ -273,7 +273,7 @@ Utils::WizardPage *SummaryPageFactory::create(JsonWizard *wizard, Core::Id typeI return page; } -bool SummaryPageFactory::validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) +bool SummaryPageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) { QTC_ASSERT(canCreate(typeId), return false); if (!data.isNull() && (data.type() != QVariant::Map)) { diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h index 447842a889..6431a8280d 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h @@ -35,8 +35,8 @@ class FieldPageFactory : public JsonWizardPageFactory public: FieldPageFactory(); - Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) override; - bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override; + Utils::WizardPage *create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) override; + bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override; }; class FilePageFactory : public JsonWizardPageFactory @@ -44,8 +44,8 @@ class FilePageFactory : public JsonWizardPageFactory public: FilePageFactory(); - Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) override; - bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override; + Utils::WizardPage *create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) override; + bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override; }; class KitsPageFactory : public JsonWizardPageFactory @@ -53,8 +53,8 @@ class KitsPageFactory : public JsonWizardPageFactory public: KitsPageFactory(); - Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) override; - bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override; + Utils::WizardPage *create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) override; + bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override; }; class ProjectPageFactory : public JsonWizardPageFactory @@ -62,8 +62,8 @@ class ProjectPageFactory : public JsonWizardPageFactory public: ProjectPageFactory(); - Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) override; - bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override; + Utils::WizardPage *create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) override; + bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override; }; class SummaryPageFactory : public JsonWizardPageFactory @@ -71,8 +71,8 @@ class SummaryPageFactory : public JsonWizardPageFactory public: SummaryPageFactory(); - Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) override; - bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override; + Utils::WizardPage *create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) override; + bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override; }; } // namespace Internal diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index e8ff3cab48..e38c78fbc8 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/src/plugins/projectexplorer/kit.cpp @@ -372,7 +372,7 @@ int Kit::weight() const }); } -static QIcon iconForDeviceType(Core::Id deviceType) +static QIcon iconForDeviceType(Utils::Id deviceType) { const IDeviceFactory *factory = Utils::findOrDefault(IDeviceFactory::allDeviceFactories(), [&deviceType](const IDeviceFactory *factory) { @@ -391,7 +391,7 @@ QIcon Kit::icon() const return d->m_cachedIcon; } - const Core::Id deviceType = d->m_deviceTypeForIcon.isValid() + const Utils::Id deviceType = d->m_deviceTypeForIcon.isValid() ? d->m_deviceTypeForIcon : DeviceTypeKitAspect::deviceTypeId(this); const QIcon deviceTypeIcon = iconForDeviceType(deviceType); if (!deviceTypeIcon.isNull()) { diff --git a/src/plugins/projectexplorer/kit.h b/src/plugins/projectexplorer/kit.h index 871e226568..24d16b3ed9 100644 --- a/src/plugins/projectexplorer/kit.h +++ b/src/plugins/projectexplorer/kit.h @@ -61,7 +61,7 @@ public: using Predicate = std::function<bool(const Kit *)>; static Predicate defaultPredicate(); - explicit Kit(Core::Id id = Core::Id()); + explicit Kit(Utils::Id id = Utils::Id()); explicit Kit(const QVariantMap &data); ~Kit(); @@ -89,7 +89,7 @@ public: bool isAutoDetected() const; QString autoDetectionSource() const; bool isSdkProvided() const; - Core::Id id() const; + Utils::Id id() const; // The higher the weight, the more aspects have sensible values for this kit. // For instance, a kit where a matching debugger was found for the toolchain will have a @@ -101,16 +101,16 @@ public: QIcon displayIcon() const; // Error or warning or device icon. Utils::FilePath iconPath() const; void setIconPath(const Utils::FilePath &path); - void setDeviceTypeForIcon(Core::Id deviceType); + void setDeviceTypeForIcon(Utils::Id deviceType); - QList<Core::Id> allKeys() const; - QVariant value(Core::Id key, const QVariant &unset = QVariant()) const; - bool hasValue(Core::Id key) const; - void setValue(Core::Id key, const QVariant &value); - void setValueSilently(Core::Id key, const QVariant &value); - void removeKey(Core::Id key); - void removeKeySilently(Core::Id key); - bool isSticky(Core::Id id) const; + QList<Utils::Id> allKeys() const; + QVariant value(Utils::Id key, const QVariant &unset = QVariant()) const; + bool hasValue(Utils::Id key) const; + void setValue(Utils::Id key, const QVariant &value); + void setValueSilently(Utils::Id key, const QVariant &value); + void removeKey(Utils::Id key); + void removeKeySilently(Utils::Id key); + bool isSticky(Utils::Id id) const; bool isDataEqual(const Kit *other) const; bool isEqual(const Kit *other) const; @@ -126,18 +126,18 @@ public: void setAutoDetected(bool detected); void setAutoDetectionSource(const QString &autoDetectionSource); void makeSticky(); - void setSticky(Core::Id id, bool b); + void setSticky(Utils::Id id, bool b); void makeUnSticky(); - void setMutable(Core::Id id, bool b); - bool isMutable(Core::Id id) const; + void setMutable(Utils::Id id, bool b); + bool isMutable(Utils::Id id) const; - void setIrrelevantAspects(const QSet<Core::Id> &irrelevant); - QSet<Core::Id> irrelevantAspects() const; + void setIrrelevantAspects(const QSet<Utils::Id> &irrelevant); + QSet<Utils::Id> irrelevantAspects() const; - QSet<Core::Id> supportedPlatforms() const; - QSet<Core::Id> availableFeatures() const; - bool hasFeatures(const QSet<Core::Id> &features) const; + QSet<Utils::Id> supportedPlatforms() const; + QSet<Utils::Id> availableFeatures() const; + bool hasFeatures(const QSet<Utils::Id> &features) const; Utils::MacroExpander *macroExpander() const; QString newKitName(const QList<Kit *> &allKits) const; diff --git a/src/plugins/projectexplorer/kitchooser.cpp b/src/plugins/projectexplorer/kitchooser.cpp index 58f6ff62fb..469dc9cf71 100644 --- a/src/plugins/projectexplorer/kitchooser.cpp +++ b/src/plugins/projectexplorer/kitchooser.cpp @@ -40,6 +40,7 @@ #include <QSettings> using namespace Core; +using namespace Utils; namespace ProjectExplorer { @@ -157,7 +158,7 @@ Kit *KitChooser::currentKit() const return KitManager::kit(id); } -void KitChooser::setCurrentKitId(Core::Id id) +void KitChooser::setCurrentKitId(Utils::Id id) { QVariant v = id.toSetting(); for (int i = 0, n = m_chooser->count(); i != n; ++i) { @@ -168,10 +169,10 @@ void KitChooser::setCurrentKitId(Core::Id id) } } -Core::Id KitChooser::currentKitId() const +Utils::Id KitChooser::currentKitId() const { Kit *kit = currentKit(); - return kit ? kit->id() : Core::Id(); + return kit ? kit->id() : Utils::Id(); } void KitChooser::setKitPredicate(const Kit::Predicate &predicate) diff --git a/src/plugins/projectexplorer/kitchooser.h b/src/plugins/projectexplorer/kitchooser.h index 06c346f55a..5670be650b 100644 --- a/src/plugins/projectexplorer/kitchooser.h +++ b/src/plugins/projectexplorer/kitchooser.h @@ -48,8 +48,8 @@ class PROJECTEXPLORER_EXPORT KitChooser : public QWidget public: explicit KitChooser(QWidget *parent = nullptr); - void setCurrentKitId(Core::Id id); - Core::Id currentKitId() const; + void setCurrentKitId(Utils::Id id); + Utils::Id currentKitId() const; void setKitPredicate(const Kit::Predicate &predicate); void setShowIcons(bool showIcons); diff --git a/src/plugins/projectexplorer/kitfeatureprovider.h b/src/plugins/projectexplorer/kitfeatureprovider.h index 69a8feee60..bb74e7a5ea 100644 --- a/src/plugins/projectexplorer/kitfeatureprovider.h +++ b/src/plugins/projectexplorer/kitfeatureprovider.h @@ -25,7 +25,6 @@ #pragma once -#include <coreplugin/id.h> #include <coreplugin/featureprovider.h> namespace ProjectExplorer { @@ -34,9 +33,9 @@ namespace Internal { class KitFeatureProvider : public Core::IFeatureProvider { public: - QSet<Core::Id> availableFeatures(Core::Id id) const override; - QSet<Core::Id> availablePlatforms() const override; - QString displayNameForPlatform(Core::Id id) const override; + QSet<Utils::Id> availableFeatures(Utils::Id id) const override; + QSet<Utils::Id> availablePlatforms() const override; + QString displayNameForPlatform(Utils::Id id) const override; }; } // namespace Internal diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index 6dd4d8fae2..9d14a93638 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -163,7 +163,7 @@ void SysRootKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expand }); } -Core::Id SysRootKitAspect::id() +Utils::Id SysRootKitAspect::id() { return "PE.Profile.SysRoot"; } @@ -221,14 +221,14 @@ public: layout->setContentsMargins(0, 0, 0, 0); layout->setColumnStretch(1, 2); - QList<Core::Id> languageList = Utils::toList(ToolChainManager::allLanguages()); - Utils::sort(languageList, [](Core::Id l1, Core::Id l2) { + QList<Utils::Id> languageList = Utils::toList(ToolChainManager::allLanguages()); + Utils::sort(languageList, [](Utils::Id l1, Utils::Id l2) { return ToolChainManager::displayNameOfLanguageId(l1) < ToolChainManager::displayNameOfLanguageId(l2); }); QTC_ASSERT(!languageList.isEmpty(), return); int row = 0; - for (Core::Id l : qAsConst(languageList)) { + for (Utils::Id l : qAsConst(languageList)) { layout->addWidget(new QLabel(ToolChainManager::displayNameOfLanguageId(l) + ':'), row, 0); auto cb = new QComboBox; cb->setSizePolicy(QSizePolicy::Ignored, cb->sizePolicy().verticalPolicy()); @@ -263,7 +263,7 @@ private: void refresh() override { m_ignoreChanges = true; - foreach (Core::Id l, m_languageComboboxMap.keys()) { + foreach (Utils::Id l, m_languageComboboxMap.keys()) { const QList<ToolChain *> ltcList = ToolChainManager::toolChains(Utils::equal(&ToolChain::language, l)); @@ -284,7 +284,7 @@ private: void makeReadOnly() override { m_isReadOnly = true; - foreach (Core::Id l, m_languageComboboxMap.keys()) { + foreach (Utils::Id l, m_languageComboboxMap.keys()) { m_languageComboboxMap.value(l)->setEnabled(false); } } @@ -294,7 +294,7 @@ private: Core::ICore::showOptionsDialog(Constants::TOOLCHAIN_SETTINGS_PAGE_ID, buttonWidget()); } - void currentToolChainChanged(Core::Id language, int idx) + void currentToolChainChanged(Utils::Id language, int idx) { if (m_ignoreChanges || idx < 0) return; @@ -320,7 +320,7 @@ private: QWidget *m_mainWidget = nullptr; QPushButton *m_manageButton = nullptr; - QHash<Core::Id, QComboBox *> m_languageComboboxMap; + QHash<Utils::Id, QComboBox *> m_languageComboboxMap; bool m_ignoreChanges = false; bool m_isReadOnly = false; }; @@ -341,12 +341,12 @@ ToolChainKitAspect::ToolChainKitAspect() } // language id -> tool chain id -static QMap<Core::Id, QByteArray> defaultToolChainIds() +static QMap<Utils::Id, QByteArray> defaultToolChainIds() { - QMap<Core::Id, QByteArray> toolChains; + QMap<Utils::Id, QByteArray> toolChains; const Abi abi = Abi::hostAbi(); QList<ToolChain *> tcList = ToolChainManager::toolChains(Utils::equal(&ToolChain::targetAbi, abi)); - foreach (Core::Id l, ToolChainManager::allLanguages()) { + foreach (Utils::Id l, ToolChainManager::allLanguages()) { ToolChain *tc = Utils::findOrDefault(tcList, Utils::equal(&ToolChain::language, l)); toolChains.insert(l, tc ? tc->id() : QByteArray()); } @@ -355,7 +355,7 @@ static QMap<Core::Id, QByteArray> defaultToolChainIds() static QVariant defaultToolChainValue() { - const QMap<Core::Id, QByteArray> toolChains = defaultToolChainIds(); + const QMap<Utils::Id, QByteArray> toolChains = defaultToolChainIds(); QVariantMap result; auto end = toolChains.end(); for (auto it = toolChains.begin(); it != end; ++it) { @@ -390,8 +390,8 @@ void ToolChainKitAspect::upgrade(Kit *k) { QTC_ASSERT(k, return); - const Core::Id oldIdV1 = KITINFORMATION_ID_V1; - const Core::Id oldIdV2 = KITINFORMATION_ID_V2; + const Utils::Id oldIdV1 = KITINFORMATION_ID_V1; + const Utils::Id oldIdV2 = KITINFORMATION_ID_V2; // upgrade <=4.1 to 4.2 (keep old settings around for now) { @@ -406,11 +406,11 @@ void ToolChainKitAspect::upgrade(Kit *k) // Used up to 4.1: newValue.insert(Deprecated::Toolchain::languageId(Deprecated::Toolchain::Cxx), oldValue.toString()); - const Core::Id typeId = DeviceTypeKitAspect::deviceTypeId(k); + const Utils::Id typeId = DeviceTypeKitAspect::deviceTypeId(k); if (typeId == Constants::DESKTOP_DEVICE_TYPE) { // insert default C compiler which did not exist before newValue.insert(Deprecated::Toolchain::languageId(Deprecated::Toolchain::C), - defaultToolChainIds().value(Core::Id(Constants::C_LANGUAGE_ID))); + defaultToolChainIds().value(Utils::Id(Constants::C_LANGUAGE_ID))); } } k->setValue(oldIdV2, newValue); @@ -426,10 +426,10 @@ void ToolChainKitAspect::upgrade(Kit *k) QVariantMap newValue = oldValue.toMap(); QVariantMap::iterator it = newValue.find(Deprecated::Toolchain::languageId(Deprecated::Toolchain::C)); if (it != newValue.end()) - newValue.insert(Core::Id(Constants::C_LANGUAGE_ID).toString(), it.value()); + newValue.insert(Utils::Id(Constants::C_LANGUAGE_ID).toString(), it.value()); it = newValue.find(Deprecated::Toolchain::languageId(Deprecated::Toolchain::Cxx)); if (it != newValue.end()) - newValue.insert(Core::Id(Constants::CXX_LANGUAGE_ID).toString(), it.value()); + newValue.insert(Utils::Id(Constants::CXX_LANGUAGE_ID).toString(), it.value()); k->setValue(ToolChainKitAspect::id(), newValue); k->setSticky(ToolChainKitAspect::id(), k->isSticky(oldIdV2)); } @@ -453,7 +453,7 @@ void ToolChainKitAspect::upgrade(Kit *k) void ToolChainKitAspect::fix(Kit *k) { QTC_ASSERT(ToolChainManager::isLoaded(), return); - foreach (const Core::Id& l, ToolChainManager::allLanguages()) { + foreach (const Utils::Id& l, ToolChainManager::allLanguages()) { const QByteArray tcId = toolChainId(k, l); if (!tcId.isEmpty() && !ToolChainManager::findToolChain(tcId)) { qWarning("Tool chain set up in kit \"%s\" for \"%s\" not found.", @@ -464,11 +464,11 @@ void ToolChainKitAspect::fix(Kit *k) } } -static Core::Id findLanguage(const QString &ls) +static Utils::Id findLanguage(const QString &ls) { QString lsUpper = ls.toUpper(); return Utils::findOrDefault(ToolChainManager::allLanguages(), - [lsUpper](Core::Id l) { return lsUpper == l.toString().toUpper(); }); + [lsUpper](Utils::Id l) { return lsUpper == l.toString().toUpper(); }); } void ToolChainKitAspect::setup(Kit *k) @@ -481,7 +481,7 @@ void ToolChainKitAspect::setup(Kit *k) value = defaultToolChainValue().toMap(); for (auto i = value.constBegin(); i != value.constEnd(); ++i) { - Core::Id l = findLanguage(i.key()); + Utils::Id l = findLanguage(i.key()); if (!l.isValid()) continue; @@ -559,27 +559,27 @@ void ToolChainKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expa QList<Utils::OutputLineParser *> ToolChainKitAspect::createOutputParsers(const Kit *k) const { - for (const Core::Id langId : {Constants::CXX_LANGUAGE_ID, Constants::C_LANGUAGE_ID}) { + for (const Utils::Id langId : {Constants::CXX_LANGUAGE_ID, Constants::C_LANGUAGE_ID}) { if (const ToolChain * const tc = toolChain(k, langId)) return tc->createOutputParsers(); } return {}; } -QSet<Core::Id> ToolChainKitAspect::availableFeatures(const Kit *k) const +QSet<Utils::Id> ToolChainKitAspect::availableFeatures(const Kit *k) const { - QSet<Core::Id> result; + QSet<Utils::Id> result; for (ToolChain *tc : toolChains(k)) result.insert(tc->typeId().withPrefix("ToolChain.")); return result; } -Core::Id ToolChainKitAspect::id() +Utils::Id ToolChainKitAspect::id() { return KITINFORMATION_ID_V3; } -QByteArray ToolChainKitAspect::toolChainId(const Kit *k, Core::Id language) +QByteArray ToolChainKitAspect::toolChainId(const Kit *k, Utils::Id language) { QTC_ASSERT(ToolChainManager::isLoaded(), return nullptr); if (!k) @@ -588,7 +588,7 @@ QByteArray ToolChainKitAspect::toolChainId(const Kit *k, Core::Id language) return value.value(language.toString(), QByteArray()).toByteArray(); } -ToolChain *ToolChainKitAspect::toolChain(const Kit *k, Core::Id language) +ToolChain *ToolChainKitAspect::toolChain(const Kit *k, Utils::Id language) { return ToolChainManager::findToolChain(toolChainId(k, language)); } @@ -611,7 +611,7 @@ QList<ToolChain *> ToolChainKitAspect::toolChains(const Kit *k) const QVariantMap value = k->value(ToolChainKitAspect::id()).toMap(); const QList<ToolChain *> tcList = Utils::transform<QList>(ToolChainManager::allLanguages(), - [&value](Core::Id l) -> ToolChain * { + [&value](Utils::Id l) -> ToolChain * { return ToolChainManager::findToolChain(value.value(l.toString()).toByteArray()); }); return Utils::filtered(tcList, [](ToolChain *tc) { return tc; }); @@ -648,7 +648,7 @@ void ToolChainKitAspect::setAllToolChainsToMatch(Kit *k, ToolChain *tc) QVariantMap result = k->value(ToolChainKitAspect::id()).toMap(); result.insert(tc->language().toString(), tc->id()); - for (Core::Id l : ToolChainManager::allLanguages()) { + for (Utils::Id l : ToolChainManager::allLanguages()) { if (l == tc->language()) continue; @@ -676,7 +676,7 @@ void ToolChainKitAspect::setAllToolChainsToMatch(Kit *k, ToolChain *tc) k->setValue(id(), result); } -void ToolChainKitAspect::clearToolChain(Kit *k, Core::Id language) +void ToolChainKitAspect::clearToolChain(Kit *k, Utils::Id language) { QTC_ASSERT(language.isValid(), return); QTC_ASSERT(k, return); @@ -694,7 +694,7 @@ Abi ToolChainKitAspect::targetAbi(const Kit *k) QHash<Abi, int> abiCount; foreach (ToolChain *tc, tcList) { Abi ta = tc->targetAbi(); - if (tc->language() == Core::Id(Constants::CXX_LANGUAGE_ID)) + if (tc->language() == Utils::Id(Constants::CXX_LANGUAGE_ID)) cxxAbi = tc->targetAbi(); abiCount[ta] = (abiCount.contains(ta) ? abiCount[ta] + 1 : 1); } @@ -778,7 +778,7 @@ private: void refresh() override { - Core::Id devType = DeviceTypeKitAspect::deviceTypeId(m_kit); + Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(m_kit); if (!devType.isValid()) m_comboBox->setCurrentIndex(-1); for (int i = 0; i < m_comboBox->count(); ++i) { @@ -791,7 +791,7 @@ private: void currentTypeChanged(int idx) { - Core::Id type = idx < 0 ? Core::Id() : Core::Id::fromSetting(m_comboBox->itemData(idx)); + Utils::Id type = idx < 0 ? Utils::Id() : Utils::Id::fromSetting(m_comboBox->itemData(idx)); DeviceTypeKitAspect::setDeviceTypeId(m_kit, type); } @@ -830,7 +830,7 @@ KitAspectWidget *DeviceTypeKitAspect::createConfigWidget(Kit *k) const KitAspect::ItemList DeviceTypeKitAspect::toUserOutput(const Kit *k) const { QTC_ASSERT(k, return {}); - Core::Id type = deviceTypeId(k); + Utils::Id type = deviceTypeId(k); QString typeDisplayName = tr("Unknown device type"); if (type.isValid()) { if (IDeviceFactory *factory = IDeviceFactory::find(type)) @@ -839,33 +839,33 @@ KitAspect::ItemList DeviceTypeKitAspect::toUserOutput(const Kit *k) const return {{tr("Device type"), typeDisplayName}}; } -const Core::Id DeviceTypeKitAspect::id() +const Utils::Id DeviceTypeKitAspect::id() { return "PE.Profile.DeviceType"; } -const Core::Id DeviceTypeKitAspect::deviceTypeId(const Kit *k) +const Utils::Id DeviceTypeKitAspect::deviceTypeId(const Kit *k) { - return k ? Core::Id::fromSetting(k->value(DeviceTypeKitAspect::id())) : Core::Id(); + return k ? Utils::Id::fromSetting(k->value(DeviceTypeKitAspect::id())) : Utils::Id(); } -void DeviceTypeKitAspect::setDeviceTypeId(Kit *k, Core::Id type) +void DeviceTypeKitAspect::setDeviceTypeId(Kit *k, Utils::Id type) { QTC_ASSERT(k, return); k->setValue(DeviceTypeKitAspect::id(), type.toSetting()); } -QSet<Core::Id> DeviceTypeKitAspect::supportedPlatforms(const Kit *k) const +QSet<Utils::Id> DeviceTypeKitAspect::supportedPlatforms(const Kit *k) const { return {deviceTypeId(k)}; } -QSet<Core::Id> DeviceTypeKitAspect::availableFeatures(const Kit *k) const +QSet<Utils::Id> DeviceTypeKitAspect::availableFeatures(const Kit *k) const { - Core::Id id = DeviceTypeKitAspect::deviceTypeId(k); + Utils::Id id = DeviceTypeKitAspect::deviceTypeId(k); if (id.isValid()) return {id.withPrefix("DeviceType.")}; - return QSet<Core::Id>(); + return QSet<Utils::Id>(); } // -------------------------------------------------------------------------- @@ -943,7 +943,7 @@ private: QComboBox *m_comboBox; QPushButton *m_manageButton; DeviceManagerModel *m_model; - Core::Id m_selectedId; + Utils::Id m_selectedId; }; } // namespace Internal @@ -961,7 +961,7 @@ DeviceKitAspect::DeviceKitAspect() QVariant DeviceKitAspect::defaultValue(const Kit *k) const { - Core::Id type = DeviceTypeKitAspect::deviceTypeId(k); + Utils::Id type = DeviceTypeKitAspect::deviceTypeId(k); // Use default device if that is compatible: IDevice::ConstPtr dev = DeviceManager::instance()->defaultDevice(type); if (dev && dev->isCompatibleWith(k)) @@ -994,7 +994,7 @@ void DeviceKitAspect::fix(Kit *k) if (!dev.isNull() && !dev->isCompatibleWith(k)) { qWarning("Device is no longer compatible with kit \"%s\", removing it.", qPrintable(k->displayName())); - setDeviceId(k, Core::Id()); + setDeviceId(k, Utils::Id()); } } @@ -1005,7 +1005,7 @@ void DeviceKitAspect::setup(Kit *k) if (!dev.isNull() && dev->isCompatibleWith(k)) return; - setDeviceId(k, Core::Id::fromSetting(defaultValue(k))); + setDeviceId(k, Utils::Id::fromSetting(defaultValue(k))); } KitAspectWidget *DeviceKitAspect::createConfigWidget(Kit *k) const @@ -1056,7 +1056,7 @@ void DeviceKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expande }); } -Core::Id DeviceKitAspect::id() +Utils::Id DeviceKitAspect::id() { return "PE.Profile.Device"; } @@ -1067,17 +1067,17 @@ IDevice::ConstPtr DeviceKitAspect::device(const Kit *k) return DeviceManager::instance()->find(deviceId(k)); } -Core::Id DeviceKitAspect::deviceId(const Kit *k) +Utils::Id DeviceKitAspect::deviceId(const Kit *k) { - return k ? Core::Id::fromSetting(k->value(DeviceKitAspect::id())) : Core::Id(); + return k ? Utils::Id::fromSetting(k->value(DeviceKitAspect::id())) : Utils::Id(); } void DeviceKitAspect::setDevice(Kit *k, IDevice::ConstPtr dev) { - setDeviceId(k, dev ? dev->id() : Core::Id()); + setDeviceId(k, dev ? dev->id() : Utils::Id()); } -void DeviceKitAspect::setDeviceId(Kit *k, Core::Id id) +void DeviceKitAspect::setDeviceId(Kit *k, Utils::Id id) { QTC_ASSERT(k, return); k->setValue(DeviceKitAspect::id(), id.toSetting()); @@ -1100,7 +1100,7 @@ void DeviceKitAspect::kitsWereLoaded() this, &DeviceKitAspect::kitUpdated); } -void DeviceKitAspect::deviceUpdated(Core::Id id) +void DeviceKitAspect::deviceUpdated(Utils::Id id) { foreach (Kit *k, KitManager::kits()) { if (deviceId(k) == id) @@ -1274,7 +1274,7 @@ KitAspect::ItemList EnvironmentKitAspect::toUserOutput(const Kit *k) const Utils::EnvironmentItem::toStringList(environmentChanges(k)).join("<br>")) }; } -Core::Id EnvironmentKitAspect::id() +Utils::Id EnvironmentKitAspect::id() { return "PE.Profile.Environment"; } diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h index d8558b8861..4e5708eeca 100644 --- a/src/plugins/projectexplorer/kitinformation.h +++ b/src/plugins/projectexplorer/kitinformation.h @@ -56,7 +56,7 @@ public: ItemList toUserOutput(const Kit *k) const override; void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const override; - static Core::Id id(); + static Utils::Id id(); static Utils::FilePath sysRoot(const Kit *k); static void setSysRoot(Kit *k, const Utils::FilePath &v); }; @@ -86,17 +86,17 @@ public: void addToEnvironment(const Kit *k, Utils::Environment &env) const override; void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const override; QList<Utils::OutputLineParser *> createOutputParsers(const Kit *k) const override; - QSet<Core::Id> availableFeatures(const Kit *k) const override; + QSet<Utils::Id> availableFeatures(const Kit *k) const override; - static Core::Id id(); - static QByteArray toolChainId(const Kit *k, Core::Id language); - static ToolChain *toolChain(const Kit *k, Core::Id language); + static Utils::Id id(); + static QByteArray toolChainId(const Kit *k, Utils::Id language); + static ToolChain *toolChain(const Kit *k, Utils::Id language); static ToolChain *cToolChain(const Kit *k); static ToolChain *cxxToolChain(const Kit *k); static QList<ToolChain *> toolChains(const Kit *k); static void setToolChain(Kit *k, ToolChain *tc); static void setAllToolChainsToMatch(Kit *k, ToolChain *tc); - static void clearToolChain(Kit *k, Core::Id language); + static void clearToolChain(Kit *k, Utils::Id language); static Abi targetAbi(const Kit *k); static QString msgNoToolChainInTarget(); @@ -123,12 +123,12 @@ public: KitAspectWidget *createConfigWidget(Kit *k) const override; ItemList toUserOutput(const Kit *k) const override; - static const Core::Id id(); - static const Core::Id deviceTypeId(const Kit *k); - static void setDeviceTypeId(Kit *k, Core::Id type); + static const Utils::Id id(); + static const Utils::Id deviceTypeId(const Kit *k); + static void setDeviceTypeId(Kit *k, Utils::Id type); - QSet<Core::Id> supportedPlatforms(const Kit *k) const override; - QSet<Core::Id> availableFeatures(const Kit *k) const override; + QSet<Utils::Id> supportedPlatforms(const Kit *k) const override; + QSet<Utils::Id> availableFeatures(const Kit *k) const override; }; // -------------------------------------------------------------------------- @@ -154,17 +154,17 @@ public: void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override; - static Core::Id id(); + static Utils::Id id(); static IDevice::ConstPtr device(const Kit *k); - static Core::Id deviceId(const Kit *k); + static Utils::Id deviceId(const Kit *k); static void setDevice(Kit *k, IDevice::ConstPtr dev); - static void setDeviceId(Kit *k, Core::Id dataId); + static void setDeviceId(Kit *k, Utils::Id dataId); private: QVariant defaultValue(const Kit *k) const; void kitsWereLoaded(); - void deviceUpdated(Core::Id dataId); + void deviceUpdated(Utils::Id dataId); void devicesChanged(); void kitUpdated(ProjectExplorer::Kit *k); }; @@ -188,7 +188,7 @@ public: ItemList toUserOutput(const Kit *k) const override; - static Core::Id id(); + static Utils::Id id(); static Utils::EnvironmentItems environmentChanges(const Kit *k); static void setEnvironmentChanges(Kit *k, const Utils::EnvironmentItems &changes); }; diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp index 79f4654caa..14288d7bb2 100644 --- a/src/plugins/projectexplorer/kitmanager.cpp +++ b/src/plugins/projectexplorer/kitmanager.cpp @@ -62,7 +62,7 @@ namespace ProjectExplorer { class KitList { public: - Core::Id defaultKit; + Utils::Id defaultKit; std::vector<std::unique_ptr<Kit>> kits; }; @@ -175,7 +175,7 @@ void KitManager::restoreKits() std::vector<std::unique_ptr<Kit>> resultList; // read all kits from user file - Core::Id defaultUserKit; + Utils::Id defaultUserKit; std::vector<std::unique_ptr<Kit>> kitsToCheck; { KitList userKits = restoreKitsHelper(settingsFileName()); @@ -262,7 +262,7 @@ void KitManager::restoreKits() if (resultList.empty() || !haveKitForBinary) { // No kits exist yet, so let's try to autoconfigure some from the toolchains we know. - QHash<Abi, QHash<Core::Id, ToolChain *>> uniqueToolchains; + QHash<Abi, QHash<Utils::Id, ToolChain *>> uniqueToolchains; // On Linux systems, we usually detect a plethora of same-ish toolchains. The following // algorithm gives precedence to icecc and ccache and otherwise simply chooses the one with @@ -594,7 +594,7 @@ void KitManager::notifyAboutUpdate(Kit *k) emit m_instance->unmanagedKitUpdated(k); } -Kit *KitManager::registerKit(const std::function<void (Kit *)> &init, Core::Id id) +Kit *KitManager::registerKit(const std::function<void (Kit *)> &init, Utils::Id id) { QTC_ASSERT(isLoaded(), return nullptr); @@ -717,7 +717,7 @@ KitAspectWidget::KitAspectWidget(Kit *kit, const KitAspect *ki) : m_kit(kit), m_kitInformation(ki), m_isSticky(kit->isSticky(ki->id())) { } -Core::Id KitAspectWidget::kitInformationId() const +Utils::Id KitAspectWidget::kitInformationId() const { return m_kitInformation->id(); } diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h index f55380c573..ecf542e851 100644 --- a/src/plugins/projectexplorer/kitmanager.h +++ b/src/plugins/projectexplorer/kitmanager.h @@ -30,7 +30,6 @@ #include "kit.h" #include <coreplugin/featureprovider.h> -#include <coreplugin/id.h> #include <QObject> #include <QPair> @@ -69,7 +68,7 @@ public: using Item = QPair<QString, QString>; using ItemList = QList<Item>; - Core::Id id() const { return m_id; } + Utils::Id id() const { return m_id; } int priority() const { return m_priority; } QString displayName() const { return m_displayName; } QString description() const { return m_description; } @@ -95,8 +94,8 @@ public: virtual QString displayNamePostfix(const Kit *k) const; - virtual QSet<Core::Id> supportedPlatforms(const Kit *k) const; - virtual QSet<Core::Id> availableFeatures(const Kit *k) const; + virtual QSet<Utils::Id> supportedPlatforms(const Kit *k) const; + virtual QSet<Utils::Id> availableFeatures(const Kit *k) const; virtual void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const; @@ -106,7 +105,7 @@ protected: KitAspect(); ~KitAspect(); - void setId(Core::Id id) { m_id = id; } + void setId(Utils::Id id) { m_id = id; } void setDisplayName(const QString &name) { m_displayName = name; } void setDescription(const QString &desc) { m_description = desc; } void makeEssential() { m_essential = true; } @@ -116,7 +115,7 @@ protected: private: QString m_displayName; QString m_description; - Core::Id m_id; + Utils::Id m_id; int m_priority = 0; // The higher the closer to the top. bool m_essential = false; }; @@ -128,7 +127,7 @@ class PROJECTEXPLORER_EXPORT KitAspectWidget : public QObject public: KitAspectWidget(Kit *kit, const KitAspect *ki); - Core::Id kitInformationId() const; + Utils::Id kitInformationId() const; virtual void makeReadOnly() = 0; virtual void refresh() = 0; @@ -162,14 +161,14 @@ public: static const QList<Kit *> kits(); static Kit *kit(const Kit::Predicate &predicate); - static Kit *kit(Core::Id id); + static Kit *kit(Utils::Id id); static Kit *defaultKit(); static const QList<KitAspect *> kitAspects(); - static const QSet<Core::Id> irrelevantAspects(); - static void setIrrelevantAspects(const QSet<Core::Id> &aspects); + static const QSet<Utils::Id> irrelevantAspects(); + static void setIrrelevantAspects(const QSet<Utils::Id> &aspects); - static Kit *registerKit(const std::function<void(Kit *)> &init, Core::Id id = {}); + static Kit *registerKit(const std::function<void(Kit *)> &init, Utils::Id id = {}); static void deregisterKit(Kit *k); static void setDefaultKit(Kit *k); diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp index 9862fab3d1..5dfda59f93 100644 --- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp @@ -67,7 +67,7 @@ KitManagerConfigWidget::KitManagerConfigWidget(Kit *k) : m_nameEdit(new QLineEdit), m_fileSystemFriendlyNameLineEdit(new QLineEdit), m_kit(k), - m_modifiedKit(std::make_unique<Kit>(Core::Id(WORKING_COPY_KIT_ID))) + m_modifiedKit(std::make_unique<Kit>(Utils::Id(WORKING_COPY_KIT_ID))) { static auto alignment = static_cast<const Qt::Alignment>(style()->styleHint(QStyle::SH_FormLayoutLabelAlignment)); @@ -146,7 +146,7 @@ KitManagerConfigWidget::~KitManagerConfigWidget() // Make sure our workingCopy did not get registered somehow: QTC_CHECK(!Utils::contains(KitManager::kits(), - Utils::equal(&Kit::id, Core::Id(WORKING_COPY_KIT_ID)))); + Utils::equal(&Kit::id, Utils::Id(WORKING_COPY_KIT_ID)))); } QString KitManagerConfigWidget::displayName() const @@ -316,7 +316,7 @@ void KitManagerConfigWidget::removeKit() void KitManagerConfigWidget::setIcon() { - const Core::Id deviceType = DeviceTypeKitAspect::deviceTypeId(m_modifiedKit.get()); + const Utils::Id deviceType = DeviceTypeKitAspect::deviceTypeId(m_modifiedKit.get()); QList<IDeviceFactory *> allDeviceFactories = IDeviceFactory::allDeviceFactories(); if (deviceType.isValid()) { const auto less = [deviceType](const IDeviceFactory *f1, const IDeviceFactory *f2) { diff --git a/src/plugins/projectexplorer/linuxiccparser.cpp b/src/plugins/projectexplorer/linuxiccparser.cpp index 59f149c26f..82799fecd6 100644 --- a/src/plugins/projectexplorer/linuxiccparser.cpp +++ b/src/plugins/projectexplorer/linuxiccparser.cpp @@ -110,9 +110,9 @@ OutputLineParser::Result LinuxIccParser::handleLine(const QString &line, OutputF return Status::NotHandled; } -Core::Id LinuxIccParser::id() +Utils::Id LinuxIccParser::id() { - return Core::Id("ProjectExplorer.OutputParser.Icc"); + return Utils::Id("ProjectExplorer.OutputParser.Icc"); } QList<OutputLineParser *> LinuxIccParser::iccParserSuite() diff --git a/src/plugins/projectexplorer/linuxiccparser.h b/src/plugins/projectexplorer/linuxiccparser.h index 2075ecfbbf..f6aaca4f9a 100644 --- a/src/plugins/projectexplorer/linuxiccparser.h +++ b/src/plugins/projectexplorer/linuxiccparser.h @@ -39,7 +39,7 @@ class LinuxIccParser : public ProjectExplorer::OutputTaskParser public: LinuxIccParser(); - static Core::Id id(); + static Utils::Id id(); static QList<Utils::OutputLineParser *> iccParserSuite(); diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp index ec5cafe662..fef7acd52d 100644 --- a/src/plugins/projectexplorer/makestep.cpp +++ b/src/plugins/projectexplorer/makestep.cpp @@ -36,7 +36,6 @@ #include "target.h" #include "toolchain.h" -#include <coreplugin/id.h> #include <coreplugin/variablechooser.h> #include <utils/environment.h> #include <utils/hostosinfo.h> @@ -60,7 +59,7 @@ const char MAKEFLAGS[] = "MAKEFLAGS"; namespace ProjectExplorer { -MakeStep::MakeStep(BuildStepList *parent, Core::Id id) +MakeStep::MakeStep(BuildStepList *parent, Utils::Id id) : AbstractProcessStep(parent, id), m_userJobCount(defaultJobCount()) { diff --git a/src/plugins/projectexplorer/makestep.h b/src/plugins/projectexplorer/makestep.h index decc0b0fcc..8c58748e61 100644 --- a/src/plugins/projectexplorer/makestep.h +++ b/src/plugins/projectexplorer/makestep.h @@ -48,7 +48,7 @@ public: Display, Execution }; - explicit MakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id); + explicit MakeStep(ProjectExplorer::BuildStepList *parent, Utils::Id id); void setBuildTarget(const QString &buildTarget); void setAvailableBuildTargets(const QStringList &buildTargets); diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index 38187fd128..f83fc077e5 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -611,10 +611,10 @@ private: return; bool addedMutables = false; - QList<Core::Id> knownIdList = Utils::transform(m_widgets, &KitAspectWidget::kitInformationId); + QList<Utils::Id> knownIdList = Utils::transform(m_widgets, &KitAspectWidget::kitInformationId); for (KitAspect *aspect : KitManager::kitAspects()) { - const Core::Id currentId = aspect->id(); + const Utils::Id currentId = aspect->id(); if (m_kit->isMutable(currentId) && !knownIdList.removeOne(currentId)) { addedMutables = true; break; diff --git a/src/plugins/projectexplorer/msvcparser.cpp b/src/plugins/projectexplorer/msvcparser.cpp index 8cd6c447bd..cd0dd41fc2 100644 --- a/src/plugins/projectexplorer/msvcparser.cpp +++ b/src/plugins/projectexplorer/msvcparser.cpp @@ -100,9 +100,9 @@ MsvcParser::MsvcParser() QTC_CHECK(m_additionalInfoRegExp.isValid()); } -Core::Id MsvcParser::id() +Utils::Id MsvcParser::id() { - return Core::Id("ProjectExplorer.OutputParser.Msvc"); + return Utils::Id("ProjectExplorer.OutputParser.Msvc"); } OutputLineParser::Result MsvcParser::handleLine(const QString &line, OutputFormat type) diff --git a/src/plugins/projectexplorer/msvcparser.h b/src/plugins/projectexplorer/msvcparser.h index f2b8d47d97..c1007fa4b9 100644 --- a/src/plugins/projectexplorer/msvcparser.h +++ b/src/plugins/projectexplorer/msvcparser.h @@ -40,7 +40,7 @@ class PROJECTEXPLORER_EXPORT MsvcParser : public ProjectExplorer::OutputTaskPar public: MsvcParser(); - static Core::Id id(); + static Utils::Id id(); private: Result handleLine(const QString &line, Utils::OutputFormat type) override; diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 4b2027896f..2b46aaff67 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -652,7 +652,7 @@ Macros MsvcToolChain::msvcPredefinedMacros(const QStringList &cxxflags, // For _MSV_VER values, see https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=vs-2017. // Utils::LanguageVersion MsvcToolChain::msvcLanguageVersion(const QStringList & /*cxxflags*/, - const Core::Id &language, + const Utils::Id &language, const Macros ¯os) const { using Utils::LanguageVersion; @@ -808,7 +808,7 @@ static void addToAvailableMsvcToolchains(const MsvcToolChain *toolchain) g_availableMsvcToolchains.push_back(toolchain); } -MsvcToolChain::MsvcToolChain(Core::Id typeId) +MsvcToolChain::MsvcToolChain(Utils::Id typeId) : ToolChain(typeId) { setDisplayName("Microsoft Visual C++ Compiler"); @@ -981,7 +981,7 @@ ToolChain::MacroInspectionRunner MsvcToolChain::createMacroInspectionRunner() co Utils::Environment env(m_lastEnvironment); addToEnvironment(env); MacrosCache macroCache = predefinedMacrosCache(); - const Core::Id lang = language(); + const Utils::Id lang = language(); // This runner must be thread-safe! return [this, env, macroCache, lang](const QStringList &cxxflags) { @@ -1728,7 +1728,7 @@ Macros ClangClToolChain::msvcPredefinedMacros(const QStringList &cxxflags, } Utils::LanguageVersion ClangClToolChain::msvcLanguageVersion(const QStringList &cxxflags, - const Core::Id &language, + const Utils::Id &language, const Macros ¯os) const { if (cxxflags.contains("--driver-mode=g++")) diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h index 7731598cb1..149e5d37b8 100644 --- a/src/plugins/projectexplorer/msvctoolchain.h +++ b/src/plugins/projectexplorer/msvctoolchain.h @@ -59,7 +59,7 @@ public: enum Type { WindowsSDK, VS }; enum Platform { x86, amd64, x86_amd64, ia64, x86_ia64, arm, x86_arm, amd64_arm, amd64_x86 }; - explicit MsvcToolChain(Core::Id typeId); + explicit MsvcToolChain(Utils::Id typeId); ~MsvcToolChain() override; Abi targetAbi() const override; @@ -127,7 +127,7 @@ protected: virtual Macros msvcPredefinedMacros(const QStringList &cxxflags, const Utils::Environment &env) const; virtual Utils::LanguageVersion msvcLanguageVersion(const QStringList &cxxflags, - const Core::Id &language, + const Utils::Id &language, const Macros ¯os) const; struct GenerateEnvResult @@ -188,7 +188,7 @@ public: Macros msvcPredefinedMacros(const QStringList &cxxflags, const Utils::Environment &env) const override; Utils::LanguageVersion msvcLanguageVersion(const QStringList &cxxflags, - const Core::Id &language, + const Utils::Id &language, const Macros ¯os) const override; bool operator==(const ToolChain &) const override; diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp index 035b816ff0..08a784f28e 100644 --- a/src/plugins/projectexplorer/processstep.cpp +++ b/src/plugins/projectexplorer/processstep.cpp @@ -51,7 +51,7 @@ class ProcessStep final : public AbstractProcessStep Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::ProcessStep) public: - ProcessStep(BuildStepList *bsl, Core::Id id); + ProcessStep(BuildStepList *bsl, Utils::Id id); bool init() final; void setupOutputFormatter(Utils::OutputFormatter *formatter); @@ -62,7 +62,7 @@ public: BaseStringAspect *m_workingDirectory; }; -ProcessStep::ProcessStep(BuildStepList *bsl, Core::Id id) +ProcessStep::ProcessStep(BuildStepList *bsl, Utils::Id id) : AbstractProcessStep(bsl, id) { //: Default ProcessStep display name diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index fafa0cc010..d808ca8d7f 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -181,7 +181,7 @@ class ProjectPrivate public: ~ProjectPrivate(); - Core::Id m_id; + Utils::Id m_id; bool m_needsInitialExpansion = false; bool m_canBuildProducts = false; bool m_knowsAllBuildExecutables = true; @@ -241,7 +241,7 @@ QString Project::displayName() const return d->m_displayName; } -Core::Id Project::id() const +Utils::Id Project::id() const { QTC_CHECK(d->m_id.isValid()); return d->m_id; @@ -377,7 +377,7 @@ void Project::setExtraProjectFiles(const QSet<Utils::FilePath> &projectDocumentP } } -Target *Project::target(Core::Id id) const +Target *Project::target(Utils::Id id) const { return Utils::findOrDefault(d->m_targets, Utils::equal(&Target::id, id)); } @@ -529,7 +529,7 @@ void Project::setDisplayName(const QString &name) emit displayNameChanged(); } -void Project::setId(Core::Id id) +void Project::setId(Utils::Id id) { QTC_ASSERT(!d->m_id.isValid(), return); // Id may not change ever! d->m_id = id; @@ -751,7 +751,7 @@ void Project::createTargetFromMap(const QVariantMap &map, int index) const QVariantMap targetMap = map.value(key).toMap(); - Core::Id id = idFromMap(targetMap); + Utils::Id id = idFromMap(targetMap); if (target(id)) { qWarning("Warning: Duplicated target id found, not restoring second target with id '%s'. Continuing.", qPrintable(id.toString())); @@ -760,7 +760,7 @@ void Project::createTargetFromMap(const QVariantMap &map, int index) Kit *k = KitManager::kit(id); if (!k) { - Core::Id deviceTypeId = Core::Id::fromSetting(targetMap.value(Target::deviceTypeKey())); + Utils::Id deviceTypeId = Utils::Id::fromSetting(targetMap.value(Target::deviceTypeKey())); if (!deviceTypeId.isValid()) deviceTypeId = Constants::DESKTOP_DEVICE_TYPE; const QString formerKitName = targetMap.value(Target::displayNameKey()).toString(); @@ -810,7 +810,7 @@ void Project::setProjectLanguages(Core::Context language) emit projectLanguagesUpdated(); } -void Project::addProjectLanguage(Core::Id id) +void Project::addProjectLanguage(Utils::Id id) { Core::Context lang = projectLanguages(); int pos = lang.indexOf(id); @@ -819,7 +819,7 @@ void Project::addProjectLanguage(Core::Id id) setProjectLanguages(lang); } -void Project::removeProjectLanguage(Core::Id id) +void Project::removeProjectLanguage(Utils::Id id) { Core::Context lang = projectLanguages(); int pos = lang.indexOf(id); @@ -828,7 +828,7 @@ void Project::removeProjectLanguage(Core::Id id) setProjectLanguages(lang); } -void Project::setProjectLanguage(Core::Id id, bool enabled) +void Project::setProjectLanguage(Utils::Id id, bool enabled) { if (enabled) addProjectLanguage(id); @@ -858,7 +858,7 @@ void Project::setNeedsDeployConfigurations(bool value) Task Project::createProjectTask(Task::TaskType type, const QString &description) { - return Task(type, description, Utils::FilePath(), -1, Core::Id()); + return Task(type, description, Utils::FilePath(), -1, Utils::Id()); } void Project::setBuildSystemCreator(const std::function<BuildSystem *(Target *)> &creator) @@ -1077,7 +1077,7 @@ void ProjectExplorerPlugin::testProject_setup() QCOMPARE(project.files(Project::AllFiles), {TEST_PROJECT_PATH}); QCOMPARE(project.files(Project::GeneratedFiles), {}); - QCOMPARE(project.id(), Core::Id(TEST_PROJECT_ID)); + QCOMPARE(project.id(), Utils::Id(TEST_PROJECT_ID)); QVERIFY(!project.target->buildSystem()->isParsing()); QVERIFY(!project.target->buildSystem()->hasParsingData()); diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h index 534d75e65b..f03fe6c7c9 100644 --- a/src/plugins/projectexplorer/project.h +++ b/src/plugins/projectexplorer/project.h @@ -30,7 +30,6 @@ #include "deploymentdata.h" #include "kit.h" -#include <coreplugin/id.h> #include <coreplugin/idocument.h> #include <utils/environmentfwd.h> @@ -78,7 +77,7 @@ public: ~Project() override; QString displayName() const; - Core::Id id() const; + Utils::Id id() const; QString mimeType() const; bool canBuildProducts() const; @@ -107,7 +106,7 @@ public: const QList<Target *> targets() const; // Note: activeTarget can be 0 (if no targets are defined). Target *activeTarget() const; - Target *target(Core::Id id) const; + Target *target(Utils::Id id) const; Target *target(Kit *k) const; virtual Tasks projectIssues(const Kit *k) const; @@ -165,8 +164,8 @@ public: void setExtraProjectFiles(const QSet<Utils::FilePath> &projectDocumentPaths); void setDisplayName(const QString &name); - void setProjectLanguage(Core::Id id, bool enabled); - void addProjectLanguage(Core::Id id); + void setProjectLanguage(Utils::Id id, bool enabled); + void addProjectLanguage(Utils::Id id); void setExtraData(const QString &key, const QVariant &data); QVariant extraData(const QString &key) const; @@ -202,9 +201,9 @@ protected: void setCanBuildProducts(); - void setId(Core::Id id); + void setId(Utils::Id id); void setProjectLanguages(Core::Context language); - void removeProjectLanguage(Core::Id id); + void removeProjectLanguage(Utils::Id id); void setHasMakeInstallEquivalent(bool enabled); void setKnowsAllBuildExecutables(bool value); diff --git a/src/plugins/projectexplorer/projectconfiguration.cpp b/src/plugins/projectexplorer/projectconfiguration.cpp index 2d8ea701c7..490d9f4ffe 100644 --- a/src/plugins/projectexplorer/projectconfiguration.cpp +++ b/src/plugins/projectexplorer/projectconfiguration.cpp @@ -151,7 +151,7 @@ ProjectConfigurationAspects::~ProjectConfigurationAspects() qDeleteAll(base()); } -ProjectConfigurationAspect *ProjectConfigurationAspects::aspect(Core::Id id) const +ProjectConfigurationAspect *ProjectConfigurationAspects::aspect(Utils::Id id) const { return Utils::findOrDefault(base(), Utils::equal(&ProjectConfigurationAspect::id, id)); } @@ -171,7 +171,7 @@ void ProjectConfigurationAspects::toMap(QVariantMap &map) const // ProjectConfiguration -ProjectConfiguration::ProjectConfiguration(QObject *parent, Core::Id id) +ProjectConfiguration::ProjectConfiguration(QObject *parent, Utils::Id id) : QObject(parent) , m_id(id) { @@ -194,7 +194,7 @@ Project *ProjectConfiguration::project() const return m_target->project(); } -Core::Id ProjectConfiguration::id() const +Utils::Id ProjectConfiguration::id() const { return m_id; } @@ -246,7 +246,7 @@ Target *ProjectConfiguration::target() const bool ProjectConfiguration::fromMap(const QVariantMap &map) { - Core::Id id = Core::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY))); + Utils::Id id = Utils::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY))); // Note: This is only "startsWith", not ==, as RunConfigurations currently still // mangle in their build keys. QTC_ASSERT(id.toString().startsWith(m_id.toString()), return false); @@ -256,7 +256,7 @@ bool ProjectConfiguration::fromMap(const QVariantMap &map) return true; } -ProjectConfigurationAspect *ProjectConfiguration::aspect(Core::Id id) const +ProjectConfigurationAspect *ProjectConfiguration::aspect(Utils::Id id) const { return m_aspects.aspect(id); } @@ -267,7 +267,7 @@ void ProjectConfiguration::acquaintAspects() aspect->acquaintSiblings(m_aspects); } -Core::Id ProjectExplorer::idFromMap(const QVariantMap &map) +Utils::Id ProjectExplorer::idFromMap(const QVariantMap &map) { - return Core::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY))); + return Utils::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY))); } diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h index 0aa0e9f85e..8c8ab9bf2b 100644 --- a/src/plugins/projectexplorer/projectconfiguration.h +++ b/src/plugins/projectexplorer/projectconfiguration.h @@ -27,8 +27,8 @@ #include "projectexplorer_export.h" -#include <coreplugin/id.h> #include <utils/displayname.h> +#include <utils/id.h> #include <QObject> #include <QPointer> @@ -86,11 +86,11 @@ public: ProjectConfigurationAspect(); ~ProjectConfigurationAspect() override; - void setId(Core::Id id) { m_id = id; } + void setId(Utils::Id id) { m_id = id; } void setDisplayName(const QString &displayName) { m_displayName = displayName; } void setSettingsKey(const QString &settingsKey) { m_settingsKey = settingsKey; } - Core::Id id() const { return m_id; } + Utils::Id id() const { return m_id; } QString displayName() const { return m_displayName; } QString settingsKey() const { return m_settingsKey; } @@ -113,7 +113,7 @@ signals: protected: virtual void setVisibleDynamic(bool visible) { Q_UNUSED(visible) } // TODO: Better name? Merge with setVisible() somehow? - Core::Id m_id; + Utils::Id m_id; QString m_displayName; QString m_settingsKey; // Name of data in settings. bool m_visible = true; @@ -139,7 +139,7 @@ public: return aspect; } - ProjectConfigurationAspect *aspect(Core::Id id) const; + ProjectConfigurationAspect *aspect(Utils::Id id) const; template <typename T> T *aspect() const { @@ -166,12 +166,12 @@ class PROJECTEXPLORER_EXPORT ProjectConfiguration : public QObject Q_OBJECT protected: - explicit ProjectConfiguration(QObject *parent, Core::Id id); + explicit ProjectConfiguration(QObject *parent, Utils::Id id); public: ~ProjectConfiguration() override; - Core::Id id() const; + Utils::Id id() const; QString displayName() const { return m_displayName.value(); } bool usesDefaultDisplayName() const { return m_displayName.usesDefaultValue(); } @@ -200,7 +200,7 @@ public: const ProjectConfigurationAspects &aspects() const { return m_aspects; } - ProjectConfigurationAspect *aspect(Core::Id id) const; + ProjectConfigurationAspect *aspect(Utils::Id id) const; template <typename T> T *aspect() const { return m_aspects.aspect<T>(); } void acquaintAspects(); @@ -214,12 +214,12 @@ protected: private: QPointer<Target> m_target; - const Core::Id m_id; + const Utils::Id m_id; Utils::DisplayName m_displayName; QString m_toolTip; }; // helper function: -PROJECTEXPLORER_EXPORT Core::Id idFromMap(const QVariantMap &map); +PROJECTEXPLORER_EXPORT Utils::Id idFromMap(const QVariantMap &map); } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 3bc5ce49e1..9ea02a152f 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -119,7 +119,6 @@ #include <coreplugin/fileutils.h> #include <coreplugin/findplaceholder.h> #include <coreplugin/icore.h> -#include <coreplugin/id.h> #include <coreplugin/idocument.h> #include <coreplugin/idocumentfactory.h> #include <coreplugin/imode.h> @@ -184,6 +183,7 @@ using namespace Core; using namespace ProjectExplorer::Internal; +using namespace Utils; namespace ProjectExplorer { @@ -395,7 +395,7 @@ public: void updateContextMenuActions(); void updateLocationSubMenus(); - void executeRunConfiguration(RunConfiguration *, Core::Id mode); + void executeRunConfiguration(RunConfiguration *, Utils::Id mode); QPair<bool, QString> buildSettingsEnabledForSession(); QPair<bool, QString> buildSettingsEnabled(const Project *pro); @@ -457,7 +457,7 @@ public: void doUpdateRunActions(); - void currentModeChanged(Core::Id mode, Core::Id oldMode); + void currentModeChanged(Utils::Id mode, Utils::Id oldMode); void updateWelcomePage(); @@ -558,7 +558,7 @@ public: QList<Internal::CustomParserSettings> m_customParsers; bool m_shouldHaveRunConfiguration = false; bool m_shuttingDown = false; - Core::Id m_runMode = Constants::NO_RUN_MODE; + Utils::Id m_runMode = Constants::NO_RUN_MODE; ToolChainManager *m_toolChainManager = nullptr; QStringList m_arguments; @@ -940,7 +940,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er ActionManager::createMenu(ProjectExplorer::Constants::M_OPENTERMINALCONTEXT); openTerminal->setOnAllDisabledBehavior(ActionContainer::Show); dd->m_openTerminalMenu = openTerminal->menu(); - dd->m_openTerminalMenu->setTitle(FileUtils::msgTerminalWithAction()); + dd->m_openTerminalMenu->setTitle(Core::FileUtils::msgTerminalWithAction()); // "open with" submenu ActionContainer * const openWith = @@ -994,7 +994,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er projectTreeContext); mfileContextMenu->addAction(cmd, Constants::G_FILE_OPEN); - dd->m_searchOnFileSystem = new QAction(FileUtils::msgFindInDirectory(), this); + dd->m_searchOnFileSystem = new QAction(Core::FileUtils::msgFindInDirectory(), this); cmd = ActionManager::registerAction(dd->m_searchOnFileSystem, Constants::SEARCHONFILESYSTEM, projectTreeContext); mfileContextMenu->addAction(cmd, Constants::G_FILE_OTHER); @@ -1002,14 +1002,14 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er msubProjectContextMenu->addAction(cmd, Constants::G_PROJECT_LAST); mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_LAST); - dd->m_showInGraphicalShell = new QAction(FileUtils::msgGraphicalShellAction(), this); + dd->m_showInGraphicalShell = new QAction(Core::FileUtils::msgGraphicalShellAction(), this); cmd = ActionManager::registerAction(dd->m_showInGraphicalShell, Constants::SHOWINGRAPHICALSHELL, projectTreeContext); mfileContextMenu->addAction(cmd, Constants::G_FILE_OPEN); mfolderContextMenu->addAction(cmd, Constants::G_FOLDER_FILES); // Open Terminal Here menu - dd->m_openTerminalHere = new QAction(FileUtils::msgTerminalHereAction(), this); + dd->m_openTerminalHere = new QAction(Core::FileUtils::msgTerminalHereAction(), this); cmd = ActionManager::registerAction(dd->m_openTerminalHere, Constants::OPENTERMINALHERE, projectTreeContext); @@ -2454,7 +2454,7 @@ void ProjectExplorerPluginPrivate::restoreSession() updateActions(); } -void ProjectExplorerPluginPrivate::executeRunConfiguration(RunConfiguration *runConfiguration, Core::Id runMode) +void ProjectExplorerPluginPrivate::executeRunConfiguration(RunConfiguration *runConfiguration, Utils::Id runMode) { const Tasks runConfigIssues = runConfiguration->checkForIssues(); if (!runConfigIssues.isEmpty()) { @@ -2493,7 +2493,7 @@ void ProjectExplorerPluginPrivate::startRunControl(RunControl *runControl) m_outputPane.createNewOutputWindow(runControl); m_outputPane.flash(); // one flash for starting m_outputPane.showTabFor(runControl); - Core::Id runMode = runControl->runMode(); + Utils::Id runMode = runControl->runMode(); const auto popupMode = runMode == Constants::NORMAL_RUN_MODE ? m_outputPane.settings().runOutputMode : runMode == Constants::DEBUG_RUN_MODE @@ -2873,7 +2873,7 @@ static bool hasDeploySettings(Project *pro) }); } -void ProjectExplorerPlugin::runProject(Project *pro, Core::Id mode, const bool forceSkipDeploy) +void ProjectExplorerPlugin::runProject(Project *pro, Utils::Id mode, const bool forceSkipDeploy) { if (!pro) return; @@ -2883,13 +2883,13 @@ void ProjectExplorerPlugin::runProject(Project *pro, Core::Id mode, const bool f runRunConfiguration(rc, mode, forceSkipDeploy); } -void ProjectExplorerPlugin::runStartupProject(Core::Id runMode, bool forceSkipDeploy) +void ProjectExplorerPlugin::runStartupProject(Utils::Id runMode, bool forceSkipDeploy) { runProject(SessionManager::startupProject(), runMode, forceSkipDeploy); } void ProjectExplorerPlugin::runRunConfiguration(RunConfiguration *rc, - Core::Id runMode, + Utils::Id runMode, const bool forceSkipDeploy) { if (!rc->isEnabled()) @@ -2999,7 +2999,7 @@ void ProjectExplorerPluginPrivate::updateDeployActions() doUpdateRunActions(); } -bool ProjectExplorerPlugin::canRunStartupProject(Core::Id runMode, QString *whyNot) +bool ProjectExplorerPlugin::canRunStartupProject(Utils::Id runMode, QString *whyNot) { Project *project = SessionManager::startupProject(); if (!project) { @@ -3427,7 +3427,7 @@ void ProjectExplorerPluginPrivate::addNewSubproject() QVariantMap map; map.insert(QLatin1String(Constants::PREFERRED_PROJECT_NODE), QVariant::fromValue(currentNode)); Project *project = ProjectTree::currentProject(); - Core::Id projectType; + Utils::Id projectType; if (project) { const QStringList profileIds = Utils::transform(ProjectTree::currentProject()->targets(), [](const Target *t) { @@ -3574,7 +3574,7 @@ void ProjectExplorerPluginPrivate::showInGraphicalShell() { Node *currentNode = ProjectTree::currentNode(); QTC_ASSERT(currentNode, return); - FileUtils::showInGraphicalShell(ICore::dialogParent(), currentNode->path()); + Core::FileUtils::showInGraphicalShell(ICore::dialogParent(), currentNode->path()); } void ProjectExplorerPluginPrivate::openTerminalHere(const EnvironmentGetter &env) @@ -3586,7 +3586,7 @@ void ProjectExplorerPluginPrivate::openTerminalHere(const EnvironmentGetter &env if (!environment) return; - FileUtils::openTerminal(currentNode->directory(), environment.value()); + Core::FileUtils::openTerminal(currentNode->directory(), environment.value()); } void ProjectExplorerPluginPrivate::openTerminalHereWithRunEnv() @@ -3666,7 +3666,7 @@ void ProjectExplorerPluginPrivate::removeFile() continue; } FileChangeBlocker changeGuard(filePath.toString()); - FileUtils::removeFile(filePath.toString(), deleteFile); + Core::FileUtils::removeFile(filePath.toString(), deleteFile); } } @@ -3779,13 +3779,13 @@ void ProjectExplorerPlugin::renameFile(Node *node, const QString &newFilePath) .arg(QDir::toNativeSeparators(oldFilePath)) .arg(QDir::toNativeSeparators(newFilePath))); if (res == QMessageBox::Yes) { - QTC_CHECK(FileUtils::renameFile(oldFilePath, newFilePath)); + QTC_CHECK(Core::FileUtils::renameFile(oldFilePath, newFilePath)); } }); return; } - if (FileUtils::renameFile(oldFilePath, newFilePath)) { + if (Core::FileUtils::renameFile(oldFilePath, newFilePath)) { // Tell the project plugin about rename if (!folderNode->renameFile(oldFilePath, newFilePath)) { const QString renameFileError @@ -3953,7 +3953,7 @@ void ProjectExplorerPlugin::updateActions() dd->updateActions(); } -void ProjectExplorerPlugin::activateProjectPanel(Core::Id panelId) +void ProjectExplorerPlugin::activateProjectPanel(Utils::Id panelId) { Core::ModeManager::activateMode(Constants::MODE_SESSION); dd->m_proWindow->activateProjectPanel(panelId); diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h index f5b300ed48..a8eef60e43 100644 --- a/src/plugins/projectexplorer/projectexplorer.h +++ b/src/plugins/projectexplorer/projectexplorer.h @@ -153,10 +153,10 @@ public: static bool isProjectFile(const Utils::FilePath &filePath); static QList<QPair<QString, QString> > recentProjects(); - static bool canRunStartupProject(Core::Id runMode, QString *whyNot = nullptr); - static void runProject(Project *pro, Core::Id, const bool forceSkipDeploy = false); - static void runStartupProject(Core::Id runMode, bool forceSkipDeploy = false); - static void runRunConfiguration(RunConfiguration *rc, Core::Id runMode, + static bool canRunStartupProject(Utils::Id runMode, QString *whyNot = nullptr); + static void runProject(Project *pro, Utils::Id, const bool forceSkipDeploy = false); + static void runStartupProject(Utils::Id runMode, bool forceSkipDeploy = false); + static void runRunConfiguration(RunConfiguration *rc, Utils::Id runMode, const bool forceSkipDeploy = false); static QList<QPair<Runnable, Utils::ProcessHandle>> runningRunControlProcesses(); static QList<RunControl *> allRunControls(); @@ -179,7 +179,7 @@ public: static void updateActions(); - static void activateProjectPanel(Core::Id panelId); + static void activateProjectPanel(Utils::Id panelId); static void clearRecentProjects(); static void removeFromRecentProjects(const QString &fileName, const QString &displayName); diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp index 1edde713de..54b011ee81 100644 --- a/src/plugins/projectexplorer/projectfilewizardextension.cpp +++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp @@ -45,7 +45,7 @@ #include <texteditor/texteditorsettings.h> #include <texteditor/textindenter.h> #include <utils/mimetypes/mimedatabase.h> -# + #include <QPointer> #include <QDebug> #include <QFileInfo> @@ -55,6 +55,7 @@ using namespace TextEditor; using namespace Core; +using namespace Utils; /*! \class ProjectExplorer::Internal::ProjectFileWizardExtension diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp index d2c065585d..73fe4d1c0b 100644 --- a/src/plugins/projectexplorer/projectimporter.cpp +++ b/src/plugins/projectexplorer/projectimporter.cpp @@ -46,22 +46,22 @@ namespace ProjectExplorer { -static const Core::Id KIT_IS_TEMPORARY("PE.tmp.isTemporary"); -static const Core::Id KIT_TEMPORARY_NAME("PE.tmp.Name"); -static const Core::Id KIT_FINAL_NAME("PE.tmp.FinalName"); -static const Core::Id TEMPORARY_OF_PROJECTS("PE.tmp.ForProjects"); +static const Utils::Id KIT_IS_TEMPORARY("PE.tmp.isTemporary"); +static const Utils::Id KIT_TEMPORARY_NAME("PE.tmp.Name"); +static const Utils::Id KIT_FINAL_NAME("PE.tmp.FinalName"); +static const Utils::Id TEMPORARY_OF_PROJECTS("PE.tmp.ForProjects"); -static Core::Id fullId(Core::Id id) +static Utils::Id fullId(Utils::Id id) { const QString prefix = "PE.tmp."; const QString idStr = id.toString(); - QTC_ASSERT(!idStr.startsWith(prefix), return Core::Id::fromString(idStr)); + QTC_ASSERT(!idStr.startsWith(prefix), return Utils::Id::fromString(idStr)); - return Core::Id::fromString(prefix + idStr); + return Utils::Id::fromString(prefix + idStr); } -static bool hasOtherUsers(Core::Id id, const QVariant &v, Kit *k) +static bool hasOtherUsers(Utils::Id id, const QVariant &v, Kit *k) { return Utils::contains(KitManager::kits(), [id, v, k](Kit *in) -> bool { if (in == k) @@ -217,7 +217,7 @@ void ProjectImporter::makePersistent(Kit *k) const k->removeKey(KIT_FINAL_NAME); foreach (const TemporaryInformationHandler &tih, m_temporaryHandlers) { - const Core::Id fid = fullId(tih.id); + const Utils::Id fid = fullId(tih.id); const QVariantList temporaryValues = k->value(fid).toList(); // Mark permanent in all other kits: @@ -241,7 +241,7 @@ void ProjectImporter::cleanupKit(Kit *k) const { QTC_ASSERT(k, return); foreach (const TemporaryInformationHandler &tih, m_temporaryHandlers) { - const Core::Id fid = fullId(tih.id); + const Utils::Id fid = fullId(tih.id); const QVariantList temporaryValues = Utils::filtered(k->value(fid).toList(), [fid, k](const QVariant &v) { return !hasOtherUsers(fid, v, k); @@ -309,7 +309,7 @@ Kit *ProjectImporter::createTemporaryKit(const KitSetupFunction &setup) const return KitManager::registerKit(init); // potentially adds kits to other targetsetuppages } -bool ProjectImporter::findTemporaryHandler(Core::Id id) const +bool ProjectImporter::findTemporaryHandler(Utils::Id id) const { return Utils::contains(m_temporaryHandlers, [id](const TemporaryInformationHandler &ch) { return ch.id == id; }); } @@ -341,7 +341,7 @@ void ProjectImporter::persistTemporaryToolChains(Kit *k, const QVariantList &vl) } } -void ProjectImporter::useTemporaryKitAspect(Core::Id id, +void ProjectImporter::useTemporaryKitAspect(Utils::Id id, ProjectImporter::CleanupFunction cleanup, ProjectImporter::PersistFunction persist) { @@ -349,11 +349,11 @@ void ProjectImporter::useTemporaryKitAspect(Core::Id id, m_temporaryHandlers.append({id, cleanup, persist}); } -void ProjectImporter::addTemporaryData(Core::Id id, const QVariant &cleanupData, Kit *k) const +void ProjectImporter::addTemporaryData(Utils::Id id, const QVariant &cleanupData, Kit *k) const { QTC_ASSERT(k, return); QTC_ASSERT(findTemporaryHandler(id), return); - const Core::Id fid = fullId(id); + const Utils::Id fid = fullId(id); KitGuard guard(k); QVariantList tmp = k->value(fid).toList(); @@ -362,9 +362,9 @@ void ProjectImporter::addTemporaryData(Core::Id id, const QVariant &cleanupData, k->setValue(fid, tmp); } -bool ProjectImporter::hasKitWithTemporaryData(Core::Id id, const QVariant &data) const +bool ProjectImporter::hasKitWithTemporaryData(Utils::Id id, const QVariant &data) const { - Core::Id fid = fullId(id); + Utils::Id fid = fullId(id); return Utils::contains(KitManager::kits(), [data, fid](Kit *k) { return k->value(fid).toList().contains(data); }); diff --git a/src/plugins/projectexplorer/projectimporter.h b/src/plugins/projectexplorer/projectimporter.h index 62851c95b4..8460361120 100644 --- a/src/plugins/projectexplorer/projectimporter.h +++ b/src/plugins/projectexplorer/projectimporter.h @@ -102,17 +102,17 @@ protected: // Handle temporary additions to Kits (Qt Versions, ToolChains, etc.) using CleanupFunction = std::function<void(Kit *, const QVariantList &)>; using PersistFunction = std::function<void(Kit *, const QVariantList &)>; - void useTemporaryKitAspect(Core::Id id, + void useTemporaryKitAspect(Utils::Id id, CleanupFunction cleanup, PersistFunction persist); - void addTemporaryData(Core::Id id, const QVariant &cleanupData, Kit *k) const; + void addTemporaryData(Utils::Id id, const QVariant &cleanupData, Kit *k) const; // Does *any* kit feature the requested data yet? - bool hasKitWithTemporaryData(Core::Id id, const QVariant &data) const; + bool hasKitWithTemporaryData(Utils::Id id, const QVariant &data) const; ToolChainData findOrCreateToolChains(const ToolChainDescription &tcd) const; private: void markKitAsTemporary(Kit *k) const; - bool findTemporaryHandler(Core::Id id) const; + bool findTemporaryHandler(Utils::Id id) const; void cleanupTemporaryToolChains(ProjectExplorer::Kit *k, const QVariantList &vl); void persistTemporaryToolChains(ProjectExplorer::Kit *k, const QVariantList &vl); @@ -122,7 +122,7 @@ private: class TemporaryInformationHandler { public: - Core::Id id; + Utils::Id id; CleanupFunction cleanup; PersistFunction persist; }; diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp index 173f4bb8fa..b1fcb5104f 100644 --- a/src/plugins/projectexplorer/projectnodes.cpp +++ b/src/plugins/projectexplorer/projectnodes.cpp @@ -970,19 +970,19 @@ ProjectNode *ProjectNode::projectNode(const Utils::FilePath &file) const return nullptr; } -QVariant ProjectNode::data(Core::Id role) const +QVariant ProjectNode::data(Utils::Id role) const { return m_fallbackData.value(role); } -bool ProjectNode::setData(Core::Id role, const QVariant &value) const +bool ProjectNode::setData(Utils::Id role, const QVariant &value) const { Q_UNUSED(role) Q_UNUSED(value) return false; } -void ProjectNode::setFallbackData(Core::Id key, const QVariant &value) +void ProjectNode::setFallbackData(Utils::Id key, const QVariant &value) { m_fallbackData.insert(key, value); } diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h index 02697324f6..c5eea63374 100644 --- a/src/plugins/projectexplorer/projectnodes.h +++ b/src/plugins/projectexplorer/projectnodes.h @@ -31,9 +31,8 @@ #include <QIcon> #include <QStringList> -#include <coreplugin/id.h> - #include <utils/fileutils.h> +#include <utils/id.h> #include <utils/optional.h> #include <functional> @@ -381,8 +380,8 @@ public: virtual bool parseInProgress() const { return false; } virtual bool validParse() const { return false; } - virtual QVariant data(Core::Id role) const; - virtual bool setData(Core::Id role, const QVariant &value) const; + virtual QVariant data(Utils::Id role) const; + virtual bool setData(Utils::Id role, const QVariant &value) const; bool isProduct() const { return m_productType != ProductType::None; } ProductType productType() const { return m_productType; } @@ -394,7 +393,7 @@ public: // "build single file" case. virtual void build() {} - void setFallbackData(Core::Id key, const QVariant &value); + void setFallbackData(Utils::Id key, const QVariant &value); protected: void setProductType(ProductType type) { m_productType = type; } @@ -404,7 +403,7 @@ protected: private: BuildSystem *buildSystem() const; - QHash<Core::Id, QVariant> m_fallbackData; // Used in data(), unless overridden. + QHash<Utils::Id, QVariant> m_fallbackData; // Used in data(), unless overridden. ProductType m_productType = ProductType::None; }; diff --git a/src/plugins/projectexplorer/projectpanelfactory.cpp b/src/plugins/projectexplorer/projectpanelfactory.cpp index c4eaef05b4..376cd7acd1 100644 --- a/src/plugins/projectexplorer/projectpanelfactory.cpp +++ b/src/plugins/projectexplorer/projectpanelfactory.cpp @@ -80,12 +80,12 @@ void ProjectPanelFactory::destroyFactories() s_factories.clear(); } -Core::Id ProjectPanelFactory::id() const +Utils::Id ProjectPanelFactory::id() const { return m_id; } -void ProjectPanelFactory::setId(Core::Id id) +void ProjectPanelFactory::setId(Utils::Id id) { m_id = id; } diff --git a/src/plugins/projectexplorer/projectpanelfactory.h b/src/plugins/projectexplorer/projectpanelfactory.h index 6d03125398..3a6adfc0f1 100644 --- a/src/plugins/projectexplorer/projectpanelfactory.h +++ b/src/plugins/projectexplorer/projectpanelfactory.h @@ -30,8 +30,7 @@ #include "panelswidget.h" #include "projectwindow.h" -#include <coreplugin/id.h> - +#include <utils/id.h> #include <utils/treemodel.h> #include <functional> @@ -46,8 +45,8 @@ class PROJECTEXPLORER_EXPORT ProjectPanelFactory public: ProjectPanelFactory(); - Core::Id id() const; - void setId(Core::Id id); + Utils::Id id() const; + void setId(Utils::Id id); // simple properties QString displayName() const; @@ -83,7 +82,7 @@ private: friend class ProjectExplorerPlugin; static void destroyFactories(); - Core::Id m_id; + Utils::Id m_id; int m_priority = 0; QString m_displayName; SupportsFunction m_supportsFunction; diff --git a/src/plugins/projectexplorer/projecttree.cpp b/src/plugins/projectexplorer/projecttree.cpp index f17e02ac8b..01cb2f0ca6 100644 --- a/src/plugins/projectexplorer/projecttree.cpp +++ b/src/plugins/projectexplorer/projecttree.cpp @@ -315,7 +315,7 @@ void ProjectTree::updateExternalFileWarning() if (!document || document->filePath().isEmpty()) return; Utils::InfoBar *infoBar = document->infoBar(); - Core::Id externalFileId(EXTERNAL_FILE_WARNING); + Utils::Id externalFileId(EXTERNAL_FILE_WARNING); if (!document->isModified()) { infoBar->removeInfo(externalFileId); return; diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp index 5c9d6a1815..9858cb48f3 100644 --- a/src/plugins/projectexplorer/projectwelcomepage.cpp +++ b/src/plugins/projectexplorer/projectwelcomepage.cpp @@ -144,7 +144,7 @@ ProjectWelcomePage::ProjectWelcomePage() } } -Core::Id ProjectWelcomePage::id() const +Utils::Id ProjectWelcomePage::id() const { return "Develop"; } diff --git a/src/plugins/projectexplorer/projectwelcomepage.h b/src/plugins/projectexplorer/projectwelcomepage.h index 68f2ca3a0a..a24d833328 100644 --- a/src/plugins/projectexplorer/projectwelcomepage.h +++ b/src/plugins/projectexplorer/projectwelcomepage.h @@ -59,7 +59,7 @@ public: QString title() const override { return tr("Projects"); } int priority() const override { return 20; } - Core::Id id() const override; + Utils::Id id() const override; QWidget *createWidget() const override; void reloadWelcomeScreenData() const; diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index e5ddfc4233..ce7a2db229 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -288,7 +288,7 @@ public: return activeItem ? activeItem->index() : QModelIndex(); } - TreeItem *itemForProjectPanel(Core::Id panelId) + TreeItem *itemForProjectPanel(Utils::Id panelId) { return m_miscItem->findChildAtLevel(1, [panelId](const TreeItem *item){ return static_cast<const MiscSettingsPanelItem *>(item)->factory()->id() == panelId; @@ -539,7 +539,7 @@ public: item->setData(0, QVariant(), ItemActivatedDirectlyRole); } - void activateProjectPanel(Core::Id panelId) + void activateProjectPanel(Utils::Id panelId) { if (ProjectItem *projectItem = m_projectsModel.rootItem()->childAt(0)) { if (TreeItem *item = projectItem->itemForProjectPanel(panelId)) @@ -656,7 +656,7 @@ ProjectWindow::ProjectWindow() setContextMenuPolicy(Qt::CustomContextMenu); } -void ProjectWindow::activateProjectPanel(Core::Id panelId) +void ProjectWindow::activateProjectPanel(Utils::Id panelId) { d->activateProjectPanel(panelId); } diff --git a/src/plugins/projectexplorer/projectwindow.h b/src/plugins/projectexplorer/projectwindow.h index 00c5e0a6c9..09c242034c 100644 --- a/src/plugins/projectexplorer/projectwindow.h +++ b/src/plugins/projectexplorer/projectwindow.h @@ -27,9 +27,8 @@ #include "projectexplorer_export.h" -#include <coreplugin/id.h> - #include <utils/fancymainwindow.h> +#include <utils/id.h> #include <memory> @@ -62,7 +61,7 @@ public: ProjectWindow(); ~ProjectWindow() override; - void activateProjectPanel(Core::Id panelId); + void activateProjectPanel(Utils::Id panelId); private: const std::unique_ptr<ProjectWindowPrivate> d; diff --git a/src/plugins/projectexplorer/rawprojectpart.h b/src/plugins/projectexplorer/rawprojectpart.h index 95f18a7583..ee79b91952 100644 --- a/src/plugins/projectexplorer/rawprojectpart.h +++ b/src/plugins/projectexplorer/rawprojectpart.h @@ -148,7 +148,7 @@ public: bool isValid() const { return type.isValid(); } public: - Core::Id type; + Utils::Id type; bool isMsvc2015ToolChain = false; unsigned wordWidth = 0; QString targetTriple; diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 43cfbaf2c6..596852d4bd 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -164,7 +164,7 @@ void GlobalOrProjectAspect::resetProjectToGlobalSettings() static std::vector<RunConfiguration::AspectFactory> theAspectFactories; -RunConfiguration::RunConfiguration(Target *target, Core::Id id) +RunConfiguration::RunConfiguration(Target *target, Utils::Id id) : ProjectConfiguration(target, id) { QTC_CHECK(target && target == this->target()); @@ -242,9 +242,9 @@ void RunConfiguration::addAspectFactory(const AspectFactory &aspectFactory) theAspectFactories.push_back(aspectFactory); } -QMap<Core::Id, QVariantMap> RunConfiguration::aspectData() const +QMap<Utils::Id, QVariantMap> RunConfiguration::aspectData() const { - QMap<Core::Id, QVariantMap> data; + QMap<Utils::Id, QVariantMap> data; for (ProjectConfigurationAspect *aspect : m_aspects) aspect->toMap(data[aspect->id()]); return data; @@ -273,7 +273,7 @@ QVariantMap RunConfiguration::toMap() const // FIXME: Remove this id mangling, e.g. by using a separate entry for the build key. if (!m_buildKey.isEmpty()) { - const Core::Id mangled = id().withSuffix(m_buildKey); + const Utils::Id mangled = id().withSuffix(m_buildKey); map.insert(settingsIdKey(), mangled.toSetting()); } @@ -325,7 +325,7 @@ bool RunConfiguration::fromMap(const QVariantMap &map) m_buildKey = map.value(BUILD_KEY).toString(); if (m_buildKey.isEmpty()) { - const Core::Id mangledId = Core::Id::fromSetting(map.value(settingsIdKey())); + const Utils::Id mangledId = Utils::Id::fromSetting(map.value(settingsIdKey())); m_buildKey = mangledId.suffixAfter(id()); // Hack for cmake projects 4.10 -> 4.11. @@ -435,7 +435,7 @@ QString RunConfigurationFactory::decoratedTargetName(const QString &targetName, QString displayName; if (!targetName.isEmpty()) displayName = QFileInfo(targetName).completeBaseName(); - Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target->kit()); + Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(target->kit()); if (devType != Constants::DESKTOP_DEVICE_TYPE) { if (IDevice::ConstPtr dev = DeviceKitAspect::device(target->kit())) { if (displayName.isEmpty()) { @@ -489,7 +489,7 @@ RunConfigurationFactory::availableCreators(Target *target) const \sa addSupportedProjectType() */ -void RunConfigurationFactory::addSupportedTargetDeviceType(Core::Id id) +void RunConfigurationFactory::addSupportedTargetDeviceType(Utils::Id id) { m_supportedTargetDeviceTypes.append(id); } @@ -511,7 +511,7 @@ void RunConfigurationFactory::setDecorateDisplayNames(bool on) \sa addSupportedTargetDeviceType() */ -void RunConfigurationFactory::addSupportedProjectType(Core::Id id) +void RunConfigurationFactory::addSupportedProjectType(Utils::Id id) { m_supportedProjectTypes.append(id); } @@ -569,7 +569,7 @@ RunConfiguration *RunConfigurationFactory::restore(Target *parent, const QVarian { for (RunConfigurationFactory *factory : g_runConfigurationFactories) { if (factory->canHandle(parent)) { - const Core::Id id = idFromMap(map); + const Utils::Id id = idFromMap(map); if (id.name().startsWith(factory->m_runConfigurationId.name())) { RunConfiguration *rc = factory->create(parent); if (rc->fromMap(map)) { diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 20fa04b647..8e906e1d02 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -150,7 +150,7 @@ public: ProjectExplorer::ProjectNode *productNode() const; - template <class T = ISettingsAspect> T *currentSettings(Core::Id id) const + template <class T = ISettingsAspect> T *currentSettings(Utils::Id id) const { if (auto a = qobject_cast<GlobalOrProjectAspect *>(aspect(id))) return qobject_cast<T *>(a->currentSettings()); @@ -163,7 +163,7 @@ public: addAspectFactory([](Target *target) { return new T(target); }); } - QMap<Core::Id, QVariantMap> aspectData() const; + QMap<Utils::Id, QVariantMap> aspectData() const; void update(); @@ -173,7 +173,7 @@ signals: void enabledChanged(); protected: - RunConfiguration(Target *target, Core::Id id); + RunConfiguration(Target *target, Utils::Id id); /// convenience function to get current build system. Try to avoid. BuildSystem *activeBuildSystem() const; @@ -227,7 +227,7 @@ public: static RunConfiguration *clone(Target *parent, RunConfiguration *source); static const QList<RunConfigurationCreationInfo> creatorsForTarget(Target *parent); - Core::Id runConfigurationId() const { return m_runConfigurationId; } + Utils::Id runConfigurationId() const { return m_runConfigurationId; } static QString decoratedTargetName(const QString &targetName, Target *kit); @@ -237,7 +237,7 @@ protected: using RunConfigurationCreator = std::function<RunConfiguration *(Target *)>; template <class RunConfig> - void registerRunConfiguration(Core::Id runConfigurationId) + void registerRunConfiguration(Utils::Id runConfigurationId) { m_creator = [runConfigurationId](Target *t) -> RunConfiguration * { return new RunConfig(t, runConfigurationId); @@ -245,8 +245,8 @@ protected: m_runConfigurationId = runConfigurationId; } - void addSupportedProjectType(Core::Id projectTypeId); - void addSupportedTargetDeviceType(Core::Id deviceTypeId); + void addSupportedProjectType(Utils::Id projectTypeId); + void addSupportedTargetDeviceType(Utils::Id deviceTypeId); void setDecorateDisplayNames(bool on); private: @@ -255,9 +255,9 @@ private: friend class RunConfigurationCreationInfo; RunConfigurationCreator m_creator; - Core::Id m_runConfigurationId; - QList<Core::Id> m_supportedProjectTypes; - QList<Core::Id> m_supportedTargetDeviceTypes; + Utils::Id m_runConfigurationId; + QList<Utils::Id> m_supportedProjectTypes; + QList<Utils::Id> m_supportedTargetDeviceTypes; bool m_decorateDisplayNames = false; }; diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp index c5c57e7011..a7d3a075fa 100644 --- a/src/plugins/projectexplorer/runcontrol.cpp +++ b/src/plugins/projectexplorer/runcontrol.cpp @@ -74,13 +74,13 @@ namespace ProjectExplorer { static QList<RunWorkerFactory *> g_runWorkerFactories; -static QSet<Core::Id> g_runModes; -static QSet<Core::Id> g_runConfigs; +static QSet<Utils::Id> g_runModes; +static QSet<Utils::Id> g_runConfigs; RunWorkerFactory::RunWorkerFactory(const WorkerCreator &producer, - const QList<Core::Id> &runModes, - const QList<Core::Id> &runConfigs, - const QList<Core::Id> &deviceTypes) + const QList<Utils::Id> &runModes, + const QList<Utils::Id> &runConfigs, + const QList<Utils::Id> &deviceTypes) : m_producer(producer), m_supportedRunModes(runModes), m_supportedRunConfigurations(runConfigs), @@ -89,9 +89,9 @@ RunWorkerFactory::RunWorkerFactory(const WorkerCreator &producer, g_runWorkerFactories.append(this); // Debugging only. - for (Core::Id runMode : runModes) + for (Utils::Id runMode : runModes) g_runModes.insert(runMode); - for (Core::Id runConfig : runConfigs) + for (Utils::Id runConfig : runConfigs) g_runConfigs.insert(runConfig); } @@ -100,8 +100,8 @@ RunWorkerFactory::~RunWorkerFactory() g_runWorkerFactories.removeOne(this); } -bool RunWorkerFactory::canRun(Core::Id runMode, - Core::Id deviceType, +bool RunWorkerFactory::canRun(Utils::Id runMode, + Utils::Id deviceType, const QString &runConfigId) const { if (!m_supportedRunModes.contains(runMode)) @@ -112,7 +112,7 @@ bool RunWorkerFactory::canRun(Core::Id runMode, //if (!m_supportedRunConfigurations.contains(runConfigId) // return false; bool ok = false; - for (const Core::Id &id : m_supportedRunConfigurations) { + for (const Utils::Id &id : m_supportedRunConfigurations) { if (runConfigId.startsWith(id.toString())) { ok = true; break; @@ -131,13 +131,13 @@ bool RunWorkerFactory::canRun(Core::Id runMode, void RunWorkerFactory::dumpAll() { - const QList<Core::Id> devices = + const QList<Utils::Id> devices = Utils::transform(IDeviceFactory::allDeviceFactories(), &IDeviceFactory::deviceType); - for (Core::Id runMode : qAsConst(g_runModes)) { + for (Utils::Id runMode : qAsConst(g_runModes)) { qDebug() << ""; - for (Core::Id device : devices) { - for (Core::Id runConfig : qAsConst(g_runConfigs)) { + for (Utils::Id device : devices) { + for (Utils::Id runConfig : qAsConst(g_runConfigs)) { const auto check = std::bind(&RunWorkerFactory::canRun, std::placeholders::_1, runMode, @@ -276,7 +276,7 @@ static QString stateName(RunControlState s) class RunControlPrivate : public QObject { public: - RunControlPrivate(RunControl *parent, Core::Id mode) + RunControlPrivate(RunControl *parent, Utils::Id mode) : q(parent), runMode(mode) { icon = Icons::RUN_SMALL_TOOLBAR; @@ -319,13 +319,13 @@ public: QString displayName; Runnable runnable; IDevice::ConstPtr device; - Core::Id runMode; + Utils::Id runMode; Utils::Icon icon; const MacroExpander *macroExpander; QPointer<RunConfiguration> runConfiguration; // Not owned. Avoid use. QString buildKey; - QMap<Core::Id, QVariantMap> settingsData; - Core::Id runConfigId; + QMap<Utils::Id, QVariantMap> settingsData; + Utils::Id runConfigId; BuildTargetInfo buildTargetInfo; BuildConfiguration::BuildType buildType = BuildConfiguration::Unknown; FilePath buildDirectory; @@ -348,7 +348,7 @@ public: using namespace Internal; -RunControl::RunControl(Core::Id mode) : +RunControl::RunControl(Utils::Id mode) : d(std::make_unique<RunControlPrivate>(this, mode)) { } @@ -459,7 +459,7 @@ void RunControl::initiateFinish() QTimer::singleShot(0, d.get(), &RunControlPrivate::initiateFinish); } -RunWorker *RunControl::createWorker(Core::Id workerId) +RunWorker *RunControl::createWorker(Utils::Id workerId) { const auto check = std::bind(&RunWorkerFactory::canRun, std::placeholders::_1, @@ -489,7 +489,7 @@ bool RunControl::createMainWorker() return candidates.front()->producer()(this) != nullptr; } -bool RunControl::canRun(Core::Id runMode, Core::Id deviceType, Core::Id runConfigId) +bool RunControl::canRun(Utils::Id runMode, Utils::Id deviceType, Utils::Id runConfigId) { const auto check = std::bind(&RunWorkerFactory::canRun, std::placeholders::_1, @@ -829,7 +829,7 @@ QList<Utils::OutputLineParser *> RunControl::createOutputParsers() const QList<Utils::OutputLineParser *> parsers = OutputFormatterFactory::createFormatters(target()); if (const auto customParsersAspect = (runConfiguration() ? runConfiguration()->aspect<CustomParsersAspect>() : nullptr)) { - for (const Core::Id id : customParsersAspect->parsers()) { + for (const Utils::Id id : customParsersAspect->parsers()) { if (CustomParser * const parser = CustomParser::createFromId(id)) parsers << parser; } @@ -837,7 +837,7 @@ QList<Utils::OutputLineParser *> RunControl::createOutputParsers() const return parsers; } -Core::Id RunControl::runMode() const +Utils::Id RunControl::runMode() const { return d->runMode; } @@ -902,12 +902,12 @@ const MacroExpander *RunControl::macroExpander() const return d->macroExpander; } -ProjectConfigurationAspect *RunControl::aspect(Core::Id id) const +ProjectConfigurationAspect *RunControl::aspect(Utils::Id id) const { return d->runConfiguration ? d->runConfiguration->aspect(id) : nullptr; } -QVariantMap RunControl::settingsData(Core::Id id) const +QVariantMap RunControl::settingsData(Utils::Id id) const { return d->settingsData.value(id); } diff --git a/src/plugins/projectexplorer/runcontrol.h b/src/plugins/projectexplorer/runcontrol.h index 242f3b3b15..6926ec4c58 100644 --- a/src/plugins/projectexplorer/runcontrol.h +++ b/src/plugins/projectexplorer/runcontrol.h @@ -74,7 +74,7 @@ public: QString workingDirectory; Utils::Environment environment; IDevice::ConstPtr device; // Override the kit's device. Keep unset by default. - QHash<Core::Id, QVariant> extraData; + QHash<Utils::Id, QVariant> extraData; // FIXME: Not necessarily a display name QString displayName() const { return executable.toString(); } @@ -146,13 +146,13 @@ public: using WorkerCreator = std::function<RunWorker *(RunControl *)>; RunWorkerFactory(const WorkerCreator &producer, - const QList<Core::Id> &runModes, - const QList<Core::Id> &runConfigs = {}, - const QList<Core::Id> &deviceTypes = {}); + const QList<Utils::Id> &runModes, + const QList<Utils::Id> &runConfigs = {}, + const QList<Utils::Id> &deviceTypes = {}); ~RunWorkerFactory(); - bool canRun(Core::Id runMode, Core::Id deviceType, const QString &runConfigId) const; + bool canRun(Utils::Id runMode, Utils::Id deviceType, const QString &runConfigId) const; WorkerCreator producer() const { return m_producer; } template <typename Worker> @@ -166,9 +166,9 @@ public: private: WorkerCreator m_producer; - QList<Core::Id> m_supportedRunModes; - QList<Core::Id> m_supportedRunConfigurations; - QList<Core::Id> m_supportedDeviceTypes; + QList<Utils::Id> m_supportedRunModes; + QList<Utils::Id> m_supportedRunConfigurations; + QList<Utils::Id> m_supportedDeviceTypes; }; /** @@ -184,7 +184,7 @@ class PROJECTEXPLORER_EXPORT RunControl : public QObject Q_OBJECT public: - explicit RunControl(Core::Id mode); + explicit RunControl(Utils::Id mode); ~RunControl() override; void setRunConfiguration(RunConfiguration *runConfig); @@ -223,7 +223,7 @@ public: Project *project() const; Kit *kit() const; const Utils::MacroExpander *macroExpander() const; - ProjectConfigurationAspect *aspect(Core::Id id) const; + ProjectConfigurationAspect *aspect(Utils::Id id) const; template <typename T> T *aspect() const { return runConfiguration() ? runConfiguration()->aspect<T>() : nullptr; } @@ -233,13 +233,13 @@ public: Utils::FilePath buildDirectory() const; Utils::Environment buildEnvironment() const; - QVariantMap settingsData(Core::Id id) const; + QVariantMap settingsData(Utils::Id id) const; Utils::FilePath targetFilePath() const; Utils::FilePath projectFilePath() const; QList<Utils::OutputLineParser *> createOutputParsers() const; - Core::Id runMode() const; + Utils::Id runMode() const; const Runnable &runnable() const; void setRunnable(const Runnable &runnable); @@ -249,10 +249,10 @@ public: const QString &cancelButtonText = QString(), bool *prompt = nullptr); - RunWorker *createWorker(Core::Id workerId); + RunWorker *createWorker(Utils::Id workerId); bool createMainWorker(); - static bool canRun(Core::Id runMode, Core::Id deviceType, Core::Id runConfigId); + static bool canRun(Utils::Id runMode, Utils::Id deviceType, Utils::Id runConfigId); signals: void appendMessage(const QString &msg, Utils::OutputFormat format); diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index 542912e1de..be1cf2c1e7 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -294,7 +294,7 @@ void SessionManager::setActiveTarget(Project *project, Target *target, SetActive if (cascade != SetActive::Cascade || !d->m_casadeSetActive) return; - Core::Id kitId = target->kit()->id(); + Utils::Id kitId = target->kit()->id(); for (Project *otherProject : SessionManager::projects()) { if (otherProject == project) continue; @@ -314,7 +314,7 @@ void SessionManager::setActiveBuildConfiguration(Target *target, BuildConfigurat if (cascade != SetActive::Cascade || !d->m_casadeSetActive) return; - Core::Id kitId = target->kit()->id(); + Utils::Id kitId = target->kit()->id(); QString name = bc->displayName(); // We match on displayname for (Project *otherProject : SessionManager::projects()) { if (otherProject == target->project()) @@ -342,7 +342,7 @@ void SessionManager::setActiveDeployConfiguration(Target *target, DeployConfigur if (cascade != SetActive::Cascade || !d->m_casadeSetActive) return; - Core::Id kitId = target->kit()->id(); + Utils::Id kitId = target->kit()->id(); QString name = dc->displayName(); // We match on displayname for (Project *otherProject : SessionManager::projects()) { if (otherProject == target->project()) diff --git a/src/plugins/projectexplorer/session.h b/src/plugins/projectexplorer/session.h index 290946f9d7..b05f090005 100644 --- a/src/plugins/projectexplorer/session.h +++ b/src/plugins/projectexplorer/session.h @@ -27,8 +27,7 @@ #include "projectexplorer_export.h" -#include <coreplugin/id.h> - +#include <utils/id.h> #include <utils/persistentsettings.h> #include <QDateTime> @@ -145,7 +144,7 @@ signals: // for tests only void projectFinishedParsing(ProjectExplorer::Project *project); private: - static void saveActiveMode(Core::Id mode); + static void saveActiveMode(Utils::Id mode); static void configureEditor(Core::IEditor *editor, const QString &fileName); static void markSessionFileDirty(); static void configureEditors(Project *project); diff --git a/src/plugins/projectexplorer/sessionmodel.cpp b/src/plugins/projectexplorer/sessionmodel.cpp index 5ba79dbf80..b0d847e7df 100644 --- a/src/plugins/projectexplorer/sessionmodel.cpp +++ b/src/plugins/projectexplorer/sessionmodel.cpp @@ -29,7 +29,6 @@ #include "sessiondialog.h" #include <coreplugin/actionmanager/actionmanager.h> -#include <coreplugin/id.h> #include <utils/algorithm.h> #include <utils/fileutils.h> @@ -39,6 +38,7 @@ #include <QDir> using namespace Core; +using namespace Utils; namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp index c7d07b0238..6f898598d6 100644 --- a/src/plugins/projectexplorer/target.cpp +++ b/src/plugins/projectexplorer/target.cpp @@ -247,7 +247,7 @@ QString Target::activeBuildKey() const return d->m_activeRunConfiguration->buildKey(); } -Core::Id Target::id() const +Utils::Id Target::id() const { return d->m_kit->id(); } @@ -568,12 +568,12 @@ void Target::updateDefaultDeployConfigurations() return; } - QList<Core::Id> dcIds; + QList<Utils::Id> dcIds; foreach (DeployConfigurationFactory *dcFactory, dcFactories) dcIds.append(dcFactory->creationId()); QList<DeployConfiguration *> dcList = deployConfigurations(); - QList<Core::Id> toCreate = dcIds; + QList<Utils::Id> toCreate = dcIds; foreach (DeployConfiguration *dc, dcList) { if (dcIds.contains(dc->id())) @@ -582,7 +582,7 @@ void Target::updateDefaultDeployConfigurations() removeDeployConfiguration(dc); } - foreach (Core::Id id, toCreate) { + foreach (Utils::Id id, toCreate) { foreach (DeployConfigurationFactory *dcFactory, dcFactories) { if (dcFactory->creationId() == id) { DeployConfiguration *dc = dcFactory->create(this); @@ -736,7 +736,7 @@ void Target::setNamedSettings(const QString &name, const QVariant &value) d->m_pluginSettings.insert(name, value); } -QVariant Target::additionalData(Core::Id id) const +QVariant Target::additionalData(Utils::Id id) const { return buildSystem()->additionalData(id); } @@ -848,7 +848,7 @@ bool Target::fromMap(const QVariantMap &map) QVariantMap valueMap = map.value(key).toMap(); DeployConfiguration *dc = DeployConfigurationFactory::restore(this, valueMap); if (!dc) { - Core::Id id = idFromMap(valueMap); + Utils::Id id = idFromMap(valueMap); qWarning("No factory found to restore deployment configuration of id '%s'!", id.isValid() ? qPrintable(id.toString()) : "UNKNOWN"); continue; @@ -878,7 +878,7 @@ bool Target::fromMap(const QVariantMap &map) RunConfiguration *rc = RunConfigurationFactory::restore(this, valueMap); if (!rc) continue; - const Core::Id theIdFromMap = ProjectExplorer::idFromMap(valueMap); + const Utils::Id theIdFromMap = ProjectExplorer::idFromMap(valueMap); if (!theIdFromMap.toString().contains("///::///")) { // Hack for cmake 4.10 -> 4.11 QTC_CHECK(rc->id().withSuffix(rc->buildKey()) == theIdFromMap); } diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h index 26be1fb988..8de1d9168d 100644 --- a/src/plugins/projectexplorer/target.h +++ b/src/plugins/projectexplorer/target.h @@ -65,7 +65,7 @@ public: Kit *kit() const; BuildSystem *buildSystem() const; - Core::Id id() const; + Utils::Id id() const; QString displayName() const; QString toolTip() const; @@ -108,7 +108,7 @@ public: QVariant namedSettings(const QString &name) const; void setNamedSettings(const QString &name, const QVariant &value); - QVariant additionalData(Core::Id id) const; + QVariant additionalData(Utils::Id id) const; MakeInstallCommand makeInstallCommand(const QString &installRoot) const; Utils::MacroExpander *macroExpander() const; diff --git a/src/plugins/projectexplorer/targetsettingspanel.h b/src/plugins/projectexplorer/targetsettingspanel.h index 2a6cb04461..1cdc92852c 100644 --- a/src/plugins/projectexplorer/targetsettingspanel.h +++ b/src/plugins/projectexplorer/targetsettingspanel.h @@ -27,8 +27,6 @@ #include "projectpanelfactory.h" -#include <coreplugin/id.h> - #include <QCoreApplication> #include <memory> diff --git a/src/plugins/projectexplorer/targetsetuppage.cpp b/src/plugins/projectexplorer/targetsetuppage.cpp index 20297313ac..b0735c9677 100644 --- a/src/plugins/projectexplorer/targetsetuppage.cpp +++ b/src/plugins/projectexplorer/targetsetuppage.cpp @@ -239,9 +239,9 @@ void TargetSetupPage::setTasksGenerator(const TasksGenerator &tasksGenerator) m_tasksGenerator = defaultTasksGenerator(tasksGenerator); } -QList<Core::Id> TargetSetupPage::selectedKits() const +QList<Utils::Id> TargetSetupPage::selectedKits() const { - QList<Core::Id> result; + QList<Utils::Id> result; for (TargetSetupWidget *w : m_widgets) { if (w->isKitSelected()) result.append(w->kit()->id()); @@ -303,7 +303,7 @@ void TargetSetupPage::reset() m_ui->allKitsCheckBox->setChecked(false); } -TargetSetupWidget *TargetSetupPage::widget(const Core::Id kitId, +TargetSetupWidget *TargetSetupPage::widget(const Utils::Id kitId, TargetSetupWidget *fallback) const { return findOr(m_widgets, fallback, [kitId](const TargetSetupWidget *w) { @@ -515,7 +515,7 @@ void TargetSetupPage::kitFilterChanged(const QString &filterText) // Remember selected kits: const std::vector<TargetSetupWidget *> selectedWidgets = filtered(m_widgets, &TargetSetupWidget::isKitSelected); - const QVector<Core::Id> selectedKitIds = transform<QVector>(selectedWidgets, + const QVector<Utils::Id> selectedKitIds = transform<QVector>(selectedWidgets, [](const TargetSetupWidget *w) { return w->kit()->id(); }); diff --git a/src/plugins/projectexplorer/targetsetuppage.h b/src/plugins/projectexplorer/targetsetuppage.h index f5baa14ed3..e962d8fde3 100644 --- a/src/plugins/projectexplorer/targetsetuppage.h +++ b/src/plugins/projectexplorer/targetsetuppage.h @@ -78,7 +78,7 @@ public: bool isComplete() const override; bool setupProject(Project *project); - QList<Core::Id> selectedKits() const; + QList<Utils::Id> selectedKits() const; void openOptions(); void changeAllKitsSelections(); @@ -121,7 +121,7 @@ private: { return k ? widget(k->id(), fallback) : fallback; } - Internal::TargetSetupWidget *widget(const Core::Id kitId, + Internal::TargetSetupWidget *widget(const Utils::Id kitId, Internal::TargetSetupWidget *fallback = nullptr) const; TasksGenerator m_tasksGenerator; diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp index 1e68e747d3..045e461d43 100644 --- a/src/plugins/projectexplorer/task.cpp +++ b/src/plugins/projectexplorer/task.cpp @@ -63,7 +63,7 @@ unsigned int Task::s_nextId = 1; */ Task::Task(TaskType type_, const QString &description, - const Utils::FilePath &file_, int line_, Core::Id category_, + const Utils::FilePath &file_, int line_, Utils::Id category_, const QIcon &icon, Options options) : taskId(s_nextId), type(type_), options(options), summary(description), line(line_), movedLine(line_), category(category_), @@ -107,7 +107,7 @@ void Task::clear() file = Utils::FilePath(); line = -1; movedLine = -1; - category = Core::Id(); + category = Utils::Id(); icon = QIcon(); formats.clear(); m_mark.clear(); diff --git a/src/plugins/projectexplorer/task.h b/src/plugins/projectexplorer/task.h index d609a13584..9c99117977 100644 --- a/src/plugins/projectexplorer/task.h +++ b/src/plugins/projectexplorer/task.h @@ -27,7 +27,7 @@ #include "projectexplorer_export.h" -#include <coreplugin/id.h> +#include <utils/id.h> #include <utils/fileutils.h> #include <QIcon> @@ -64,7 +64,7 @@ public: Task() = default; Task(TaskType type, const QString &description, - const Utils::FilePath &file, int line, Core::Id category, + const Utils::FilePath &file, int line, Utils::Id category, const QIcon &icon = QIcon(), Options options = AddTextMark | FlashWorthy); @@ -84,7 +84,7 @@ public: Utils::FilePaths fileCandidates; int line = -1; int movedLine = -1; // contains a line number if the line was moved in the editor - Core::Id category; + Utils::Id category; QIcon icon; // Having a container of QTextLayout::FormatRange in Task isn't that great diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp index cb41d8fafe..d2528d955c 100644 --- a/src/plugins/projectexplorer/taskhub.cpp +++ b/src/plugins/projectexplorer/taskhub.cpp @@ -44,9 +44,9 @@ const char TASK_MARK_WARNING[] = "Task.Mark.Warning"; const char TASK_MARK_ERROR[] = "Task.Mark.Error"; static TaskHub *m_instance = nullptr; -QVector<Core::Id> TaskHub::m_registeredCategories; +QVector<Utils::Id> TaskHub::m_registeredCategories; -static Core::Id categoryForType(Task::TaskType type) +static Utils::Id categoryForType(Task::TaskType type) { switch (type) { case Task::Error: @@ -54,7 +54,7 @@ static Core::Id categoryForType(Task::TaskType type) case Task::Warning: return TASK_MARK_WARNING; default: - return Core::Id(); + return Utils::Id(); } } @@ -131,7 +131,7 @@ TaskHub::~TaskHub() m_instance = nullptr; } -void TaskHub::addCategory(Core::Id categoryId, const QString &displayName, bool visible) +void TaskHub::addCategory(Utils::Id categoryId, const QString &displayName, bool visible) { QTC_CHECK(!displayName.isEmpty()); QTC_ASSERT(!m_registeredCategories.contains(categoryId), return); @@ -144,7 +144,7 @@ TaskHub *TaskHub::instance() return m_instance; } -void TaskHub::addTask(Task::TaskType type, const QString &description, Core::Id category) +void TaskHub::addTask(Task::TaskType type, const QString &description, Utils::Id category) { addTask(Task(type, description, {}, -1, category)); } @@ -165,7 +165,7 @@ void TaskHub::addTask(Task task) emit m_instance->taskAdded(task); } -void TaskHub::clearTasks(Core::Id categoryId) +void TaskHub::clearTasks(Utils::Id categoryId) { QTC_ASSERT(!categoryId.isValid() || m_registeredCategories.contains(categoryId), return); emit m_instance->tasksCleared(categoryId); @@ -196,7 +196,7 @@ void TaskHub::showTaskInEditor(unsigned int id) emit m_instance->openTask(id); } -void TaskHub::setCategoryVisibility(Core::Id categoryId, bool visible) +void TaskHub::setCategoryVisibility(Utils::Id categoryId, bool visible) { QTC_ASSERT(m_registeredCategories.contains(categoryId), return); emit m_instance->categoryVisibilityChanged(categoryId, visible); diff --git a/src/plugins/projectexplorer/taskhub.h b/src/plugins/projectexplorer/taskhub.h index d98d4010d0..b6696fa511 100644 --- a/src/plugins/projectexplorer/taskhub.h +++ b/src/plugins/projectexplorer/taskhub.h @@ -42,31 +42,31 @@ public: // Convenience overload static void addTask(Task::TaskType type, const QString &description, - Core::Id category); + Utils::Id category); public slots: static void addTask(ProjectExplorer::Task task); - static void clearTasks(Core::Id categoryId = Core::Id()); + static void clearTasks(Utils::Id categoryId = Utils::Id()); static void removeTask(const ProjectExplorer::Task &task); public: - static void addCategory(Core::Id categoryId, const QString &displayName, bool visible = true); + static void addCategory(Utils::Id categoryId, const QString &displayName, bool visible = true); static void updateTaskFileName(unsigned int id, const QString &fileName); static void updateTaskLineNumber(unsigned int id, int line); static void taskMarkClicked(unsigned int id); static void showTaskInEditor(unsigned int id); - static void setCategoryVisibility(Core::Id categoryId, bool visible); + static void setCategoryVisibility(Utils::Id categoryId, bool visible); static void requestPopup(); signals: - void categoryAdded(Core::Id categoryId, const QString &displayName, bool visible); + void categoryAdded(Utils::Id categoryId, const QString &displayName, bool visible); void taskAdded(const ProjectExplorer::Task &task); void taskRemoved(const ProjectExplorer::Task &task); - void tasksCleared(Core::Id categoryId); + void tasksCleared(Utils::Id categoryId); void taskFileNameUpdated(unsigned int id, const QString &fileName); void taskLineNumberUpdated(unsigned int id, int line); - void categoryVisibilityChanged(Core::Id categoryId, bool visible); + void categoryVisibilityChanged(Utils::Id categoryId, bool visible); void popupRequested(int); void showTask(unsigned int id); void openTask(unsigned int id); @@ -75,7 +75,7 @@ private: TaskHub(); ~TaskHub() override; - static QVector<Core::Id> m_registeredCategories; + static QVector<Utils::Id> m_registeredCategories; friend class ProjectExplorerPluginPrivate; }; diff --git a/src/plugins/projectexplorer/taskmodel.cpp b/src/plugins/projectexplorer/taskmodel.cpp index abcbc6732b..7dc9f66b53 100644 --- a/src/plugins/projectexplorer/taskmodel.cpp +++ b/src/plugins/projectexplorer/taskmodel.cpp @@ -45,25 +45,25 @@ namespace Internal { TaskModel::TaskModel(QObject *parent) : QAbstractItemModel(parent) { - m_categories.insert(Core::Id(), CategoryData()); + m_categories.insert(Utils::Id(), CategoryData()); } -int TaskModel::taskCount(Core::Id categoryId) +int TaskModel::taskCount(Utils::Id categoryId) { return m_categories.value(categoryId).count; } -int TaskModel::errorTaskCount(Core::Id categoryId) +int TaskModel::errorTaskCount(Utils::Id categoryId) { return m_categories.value(categoryId).errors; } -int TaskModel::warningTaskCount(Core::Id categoryId) +int TaskModel::warningTaskCount(Utils::Id categoryId) { return m_categories.value(categoryId).warnings; } -int TaskModel::unknownTaskCount(Core::Id categoryId) +int TaskModel::unknownTaskCount(Utils::Id categoryId) { return m_categories.value(categoryId).count - m_categories.value(categoryId).errors @@ -78,7 +78,7 @@ bool TaskModel::hasFile(const QModelIndex &index) const return !m_tasks.at(row).file.isEmpty(); } -void TaskModel::addCategory(Core::Id categoryId, const QString &categoryName) +void TaskModel::addCategory(Utils::Id categoryId, const QString &categoryName) { QTC_ASSERT(categoryId.isValid(), return); CategoryData data; @@ -86,7 +86,7 @@ void TaskModel::addCategory(Core::Id categoryId, const QString &categoryName) m_categories.insert(categoryId, data); } -Tasks TaskModel::tasks(Core::Id categoryId) const +Tasks TaskModel::tasks(Utils::Id categoryId) const { if (!categoryId.isValid()) return m_tasks; @@ -108,7 +108,7 @@ void TaskModel::addTask(const Task &task) { Q_ASSERT(m_categories.keys().contains(task.category)); CategoryData &data = m_categories[task.category]; - CategoryData &global = m_categories[Core::Id()]; + CategoryData &global = m_categories[Utils::Id()]; auto it = std::lower_bound(m_tasks.begin(), m_tasks.end(),task.taskId, sortById); int i = it - m_tasks.begin(); @@ -127,7 +127,7 @@ void TaskModel::removeTask(unsigned int id) const Task &t = m_tasks.at(index); beginRemoveRows(QModelIndex(), index, index); m_categories[t.category].removeTask(t); - m_categories[Core::Id()].removeTask(t); + m_categories[Utils::Id()].removeTask(t); m_tasks.removeAt(index); endRemoveRows(); break; @@ -164,9 +164,9 @@ void TaskModel::updateTaskLineNumber(unsigned int id, int line) } } -void TaskModel::clearTasks(Core::Id categoryId) +void TaskModel::clearTasks(Utils::Id categoryId) { - using IdCategoryConstIt = QHash<Core::Id,CategoryData>::ConstIterator; + using IdCategoryConstIt = QHash<Utils::Id,CategoryData>::ConstIterator; if (!categoryId.isValid()) { if (m_tasks.isEmpty()) @@ -180,7 +180,7 @@ void TaskModel::clearTasks(Core::Id categoryId) } else { int index = 0; int start = 0; - CategoryData &global = m_categories[Core::Id()]; + CategoryData &global = m_categories[Utils::Id()]; CategoryData &cat = m_categories[categoryId]; while (index < m_tasks.count()) { @@ -269,14 +269,14 @@ Task TaskModel::task(const QModelIndex &index) const return m_tasks.at(row); } -QList<Core::Id> TaskModel::categoryIds() const +QList<Utils::Id> TaskModel::categoryIds() const { - QList<Core::Id> categories = m_categories.keys(); - categories.removeAll(Core::Id()); // remove global category we added for bookkeeping + QList<Utils::Id> categories = m_categories.keys(); + categories.removeAll(Utils::Id()); // remove global category we added for bookkeeping return categories; } -QString TaskModel::categoryDisplayName(Core::Id categoryId) const +QString TaskModel::categoryDisplayName(Utils::Id categoryId) const { return m_categories.value(categoryId).displayName; } diff --git a/src/plugins/projectexplorer/taskmodel.h b/src/plugins/projectexplorer/taskmodel.h index b027532e2b..bb3cb2c2a4 100644 --- a/src/plugins/projectexplorer/taskmodel.h +++ b/src/plugins/projectexplorer/taskmodel.h @@ -50,14 +50,14 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; Task task(const QModelIndex &index) const; - QList<Core::Id> categoryIds() const; - QString categoryDisplayName(Core::Id categoryId) const; - void addCategory(Core::Id categoryId, const QString &categoryName); + QList<Utils::Id> categoryIds() const; + QString categoryDisplayName(Utils::Id categoryId) const; + void addCategory(Utils::Id categoryId, const QString &categoryName); - Tasks tasks(Core::Id categoryId = Core::Id()) const; + Tasks tasks(Utils::Id categoryId = Utils::Id()) const; void addTask(const Task &t); void removeTask(unsigned int id); - void clearTasks(Core::Id categoryId = Core::Id()); + void clearTasks(Utils::Id categoryId = Utils::Id()); void updateTaskFileName(unsigned int id, const QString &fileName); void updateTaskLineNumber(unsigned int id, int line); @@ -67,10 +67,10 @@ public: enum Roles { File = Qt::UserRole, Line, MovedLine, Description, FileNotFound, Type, Category, Icon, Task_t }; - int taskCount(Core::Id categoryId); - int errorTaskCount(Core::Id categoryId); - int warningTaskCount(Core::Id categoryId); - int unknownTaskCount(Core::Id categoryId); + int taskCount(Utils::Id categoryId); + int errorTaskCount(Utils::Id categoryId); + int warningTaskCount(Utils::Id categoryId); + int unknownTaskCount(Utils::Id categoryId); bool hasFile(const QModelIndex &index) const; @@ -110,7 +110,7 @@ private: int errors = 0; }; - QHash<Core::Id,CategoryData> m_categories; // category id to data + QHash<Utils::Id,CategoryData> m_categories; // category id to data Tasks m_tasks; // all tasks (in order of id) QHash<QString,bool> m_fileNotFound; @@ -136,8 +136,8 @@ public: bool filterIncludesErrors() const { return m_includeErrors; } void setFilterIncludesErrors(bool b) { m_includeErrors = b; invalidateFilter(); } - QList<Core::Id> filteredCategories() const { return m_categoryIds; } - void setFilteredCategories(const QList<Core::Id> &categoryIds) { m_categoryIds = categoryIds; invalidateFilter(); } + QList<Utils::Id> filteredCategories() const { return m_categoryIds; } + void setFilteredCategories(const QList<Utils::Id> &categoryIds) { m_categoryIds = categoryIds; invalidateFilter(); } Task task(const QModelIndex &index) const { return taskModel()->task(mapToSource(index)); } int issuesCount(int startRow, int endRow) const; @@ -162,7 +162,7 @@ private: bool m_filterStringIsRegexp = false; bool m_filterIsInverted = false; Qt::CaseSensitivity m_filterCaseSensitivity = Qt::CaseInsensitive; - QList<Core::Id> m_categoryIds; + QList<Utils::Id> m_categoryIds; QString m_filterText; QRegularExpression m_filterRegexp; }; diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 64ccf82754..22c19dd304 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -419,7 +419,7 @@ void TaskWindow::delayedInitialization() connect(action, &QAction::triggered, this, &TaskWindow::actionTriggered); d->m_actions << action; - Core::Id id = h->actionManagerId(); + Utils::Id id = h->actionManagerId(); if (id.isValid()) { Core::Command *cmd = Core::ActionManager::registerAction(action, id, d->m_taskWindowContext->context(), true); @@ -442,7 +442,7 @@ QWidget *TaskWindow::outputWidget(QWidget *) return d->m_listview; } -void TaskWindow::clearTasks(Core::Id categoryId) +void TaskWindow::clearTasks(Utils::Id categoryId) { d->m_model->clearTasks(categoryId); @@ -450,12 +450,12 @@ void TaskWindow::clearTasks(Core::Id categoryId) navigateStateChanged(); } -void TaskWindow::setCategoryVisibility(Core::Id categoryId, bool visible) +void TaskWindow::setCategoryVisibility(Utils::Id categoryId, bool visible) { if (!categoryId.isValid()) return; - QList<Core::Id> categories = d->m_filter->filteredCategories(); + QList<Utils::Id> categories = d->m_filter->filteredCategories(); if (visible) categories.removeOne(categoryId); @@ -476,7 +476,7 @@ void TaskWindow::currentChanged(const QModelIndex &index) void TaskWindow::saveSettings() { - QStringList categories = Utils::transform(d->m_filter->filteredCategories(), &Core::Id::toString); + QStringList categories = Utils::transform(d->m_filter->filteredCategories(), &Utils::Id::toString); SessionManager::setValue(QLatin1String(SESSION_FILTER_CATEGORIES), categories); SessionManager::setValue(QLatin1String(SESSION_FILTER_WARNINGS), d->m_filter->filterIncludesWarnings()); } @@ -485,8 +485,8 @@ void TaskWindow::loadSettings() { QVariant value = SessionManager::value(QLatin1String(SESSION_FILTER_CATEGORIES)); if (value.isValid()) { - QList<Core::Id> categories - = Utils::transform(value.toStringList(), &Core::Id::fromString); + QList<Utils::Id> categories + = Utils::transform(value.toStringList(), &Utils::Id::fromString); d->m_filter->setFilteredCategories(categories); } value = SessionManager::value(QLatin1String(SESSION_FILTER_WARNINGS)); @@ -503,11 +503,11 @@ void TaskWindow::visibilityChanged(bool visible) delayedInitialization(); } -void TaskWindow::addCategory(Core::Id categoryId, const QString &displayName, bool visible) +void TaskWindow::addCategory(Utils::Id categoryId, const QString &displayName, bool visible) { d->m_model->addCategory(categoryId, displayName); if (!visible) { - QList<Core::Id> filters = d->m_filter->filteredCategories(); + QList<Utils::Id> filters = d->m_filter->filteredCategories(); filters += categoryId; d->m_filter->setFilteredCategories(filters); } @@ -615,20 +615,20 @@ void TaskWindow::setShowWarnings(bool show) void TaskWindow::updateCategoriesMenu() { - using NameToIdsConstIt = QMap<QString, Core::Id>::ConstIterator; + using NameToIdsConstIt = QMap<QString, Utils::Id>::ConstIterator; d->m_categoriesMenu->clear(); - const QList<Core::Id> filteredCategories = d->m_filter->filteredCategories(); + const QList<Utils::Id> filteredCategories = d->m_filter->filteredCategories(); - QMap<QString, Core::Id> nameToIds; - foreach (Core::Id categoryId, d->m_model->categoryIds()) + QMap<QString, Utils::Id> nameToIds; + foreach (Utils::Id categoryId, d->m_model->categoryIds()) nameToIds.insert(d->m_model->categoryDisplayName(categoryId), categoryId); const NameToIdsConstIt cend = nameToIds.constEnd(); for (NameToIdsConstIt it = nameToIds.constBegin(); it != cend; ++it) { const QString &displayName = it.key(); - const Core::Id categoryId = it.value(); + const Utils::Id categoryId = it.value(); auto action = new QAction(d->m_categoriesMenu); action->setCheckable(true); action->setText(displayName); @@ -640,17 +640,17 @@ void TaskWindow::updateCategoriesMenu() } } -int TaskWindow::taskCount(Core::Id category) const +int TaskWindow::taskCount(Utils::Id category) const { return d->m_model->taskCount(category); } -int TaskWindow::errorTaskCount(Core::Id category) const +int TaskWindow::errorTaskCount(Utils::Id category) const { return d->m_model->errorTaskCount(category); } -int TaskWindow::warningTaskCount(Core::Id category) const +int TaskWindow::warningTaskCount(Utils::Id category) const { return d->m_model->warningTaskCount(category); } diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h index 7f11ca1fb1..9887715795 100644 --- a/src/plugins/projectexplorer/taskwindow.h +++ b/src/plugins/projectexplorer/taskwindow.h @@ -25,7 +25,6 @@ #pragma once -#include <coreplugin/id.h> #include <coreplugin/ioutputpane.h> #include <memory> @@ -54,9 +53,9 @@ public: void delayedInitialization(); - int taskCount(Core::Id category = Core::Id()) const; - int warningTaskCount(Core::Id category = Core::Id()) const; - int errorTaskCount(Core::Id category = Core::Id()) const; + int taskCount(Utils::Id category = Utils::Id()) const; + int warningTaskCount(Utils::Id category = Utils::Id()) const; + int errorTaskCount(Utils::Id category = Utils::Id()) const; // IOutputPane QWidget *outputWidget(QWidget *) override; @@ -83,15 +82,15 @@ signals: private: void updateFilter() override; - void addCategory(Core::Id categoryId, const QString &displayName, bool visible); + void addCategory(Utils::Id categoryId, const QString &displayName, bool visible); void addTask(const ProjectExplorer::Task &task); void removeTask(const ProjectExplorer::Task &task); void updatedTaskFileName(unsigned int id, const QString &fileName); void updatedTaskLineNumber(unsigned int id, int line); void showTask(unsigned int id); void openTask(unsigned int id); - void clearTasks(Core::Id categoryId); - void setCategoryVisibility(Core::Id categoryId, bool visible); + void clearTasks(Utils::Id categoryId); + void setCategoryVisibility(Utils::Id categoryId, bool visible); void currentChanged(const QModelIndex &index); void saveSettings(); void loadSettings(); diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index 2728df11c7..54bf8bf40a 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -57,7 +57,7 @@ class ToolChainPrivate public: using Detection = ToolChain::Detection; - explicit ToolChainPrivate(Core::Id typeId) : + explicit ToolChainPrivate(Utils::Id typeId) : m_id(QUuid::createUuid().toByteArray()), m_typeId(typeId), m_predefinedMacrosCache(new ToolChain::MacrosCache::element_type()), @@ -68,11 +68,11 @@ public: } QByteArray m_id; - QSet<Core::Id> m_supportedLanguages; + QSet<Utils::Id> m_supportedLanguages; mutable QString m_displayName; QString m_typeDisplayName; - Core::Id m_typeId; - Core::Id m_language; + Utils::Id m_typeId; + Utils::Id m_language; Detection m_detection = ToolChain::UninitializedDetection; ToolChain::MacrosCache m_predefinedMacrosCache; @@ -82,17 +82,17 @@ public: // Deprecated used from QtCreator <= 4.2 -Core::Id fromLanguageV1(int language) +Utils::Id fromLanguageV1(int language) { switch (language) { case Deprecated::Toolchain::C : - return Core::Id(Constants::C_LANGUAGE_ID); + return Utils::Id(Constants::C_LANGUAGE_ID); case Deprecated::Toolchain::Cxx: - return Core::Id(Constants::CXX_LANGUAGE_ID); + return Utils::Id(Constants::CXX_LANGUAGE_ID); case Deprecated::Toolchain::None: default: - return Core::Id(); + return Utils::Id(); } } @@ -123,12 +123,12 @@ QString languageId(Language l) // -------------------------------------------------------------------------- -ToolChain::ToolChain(Core::Id typeId) : +ToolChain::ToolChain(Utils::Id typeId) : d(std::make_unique<Internal::ToolChainPrivate>(typeId)) { } -void ToolChain::setLanguage(Core::Id language) +void ToolChain::setLanguage(Utils::Id language) { QTC_ASSERT(!d->m_language.isValid() || isAutoDetected(), return); QTC_ASSERT(language.isValid(), return); @@ -170,7 +170,7 @@ QStringList ToolChain::suggestedMkspecList() const return {}; } -Core::Id ToolChain::typeId() const +Utils::Id ToolChain::typeId() const { return d->m_typeId; } @@ -180,7 +180,7 @@ Abis ToolChain::supportedAbis() const return {targetAbi()}; } -Core::Id ToolChain::language() const +Utils::Id ToolChain::language() const { return d->m_language; } @@ -282,7 +282,7 @@ bool ToolChain::fromMap(const QVariantMap &data) const QString id = data.value(QLatin1String(ID_KEY)).toString(); int pos = id.indexOf(QLatin1Char(':')); QTC_ASSERT(pos > 0, return false); - d->m_typeId = Core::Id::fromString(id.left(pos)); + d->m_typeId = Utils::Id::fromString(id.left(pos)); d->m_id = id.mid(pos + 1).toUtf8(); const bool autoDetect = data.value(QLatin1String(AUTODETECT_KEY), false).toBool(); @@ -294,15 +294,15 @@ bool ToolChain::fromMap(const QVariantMap &data) const QString langId = data.value(QLatin1String(LANGUAGE_KEY_V2)).toString(); const int pos = langId.lastIndexOf('.'); if (pos >= 0) - d->m_language = Core::Id::fromString(langId.mid(pos + 1)); + d->m_language = Utils::Id::fromString(langId.mid(pos + 1)); else - d->m_language = Core::Id::fromString(langId); + d->m_language = Utils::Id::fromString(langId); } else if (data.contains(LANGUAGE_KEY_V1)) { // Import from old settings d->m_language = Internal::fromLanguageV1(data.value(QLatin1String(LANGUAGE_KEY_V1)).toInt()); } if (!d->m_language.isValid()) - d->m_language = Core::Id(Constants::CXX_LANGUAGE_ID); + d->m_language = Utils::Id(Constants::CXX_LANGUAGE_ID); return true; } @@ -345,7 +345,7 @@ Utils::LanguageVersion ToolChain::cxxLanguageVersion(const QByteArray &cplusplus return LanguageVersion::CXX03; } -Utils::LanguageVersion ToolChain::languageVersion(const Core::Id &language, const Macros ¯os) +Utils::LanguageVersion ToolChain::languageVersion(const Utils::Id &language, const Macros ¯os) { using Utils::LanguageVersion; @@ -486,9 +486,9 @@ QByteArray ToolChainFactory::idFromMap(const QVariantMap &data) return rawIdData(data).second.toUtf8(); } -Core::Id ToolChainFactory::typeIdFromMap(const QVariantMap &data) +Utils::Id ToolChainFactory::typeIdFromMap(const QVariantMap &data) { - return Core::Id::fromString(rawIdData(data).first); + return Utils::Id::fromString(rawIdData(data).first); } void ToolChainFactory::autoDetectionToMap(QVariantMap &data, bool detected) @@ -496,7 +496,7 @@ void ToolChainFactory::autoDetectionToMap(QVariantMap &data, bool detected) data.insert(QLatin1String(AUTODETECT_KEY), detected); } -ToolChain *ToolChainFactory::createToolChain(Core::Id toolChainType) +ToolChain *ToolChainFactory::createToolChain(Utils::Id toolChainType) { for (ToolChainFactory *factory : qAsConst(Internal::g_toolChainFactories)) { if (factory->m_supportedToolChainType == toolChainType) { @@ -509,22 +509,22 @@ ToolChain *ToolChainFactory::createToolChain(Core::Id toolChainType) return nullptr; } -QSet<Core::Id> ToolChainFactory::supportedLanguages() const +QSet<Utils::Id> ToolChainFactory::supportedLanguages() const { return m_supportsAllLanguages ? ToolChainManager::allLanguages() : m_supportedLanguages; } -Core::Id ToolChainFactory::supportedToolChainType() const +Utils::Id ToolChainFactory::supportedToolChainType() const { return m_supportedToolChainType; } -void ToolChainFactory::setSupportedToolChainType(const Core::Id &supportedToolChain) +void ToolChainFactory::setSupportedToolChainType(const Utils::Id &supportedToolChain) { m_supportedToolChainType = supportedToolChain; } -void ToolChainFactory::setSupportedLanguages(const QSet<Core::Id> &supportedLanguages) +void ToolChainFactory::setSupportedLanguages(const QSet<Utils::Id> &supportedLanguages) { m_supportedLanguages = supportedLanguages; } diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h index b2dbc7ca9a..e4ca6f9dde 100644 --- a/src/plugins/projectexplorer/toolchain.h +++ b/src/plugins/projectexplorer/toolchain.h @@ -33,11 +33,10 @@ #include "task.h" #include "toolchaincache.h" -#include <coreplugin/id.h> - #include <utils/cpplanguage_details.h> #include <utils/environment.h> #include <utils/fileutils.h> +#include <utils/id.h> #include <QObject> #include <QSet> @@ -76,7 +75,7 @@ class PROJECTEXPLORER_EXPORT ToolChainDescription { public: Utils::FilePath compilerPath; - Core::Id language; + Utils::Id language; }; // -------------------------------------------------------------------------- @@ -107,7 +106,7 @@ public: virtual QStringList suggestedMkspecList() const; - Core::Id typeId() const; + Utils::Id typeId() const; QString typeDisplayName() const; virtual Abi targetAbi() const = 0; @@ -148,7 +147,7 @@ public: virtual void addToEnvironment(Utils::Environment &env) const = 0; virtual Utils::FilePath makeCommand(const Utils::Environment &env) const = 0; - Core::Id language() const; + Utils::Id language() const; virtual Utils::FilePath compilerCommand() const = 0; virtual QList<Utils::OutputLineParser *> createOutputParsers() const = 0; @@ -165,14 +164,14 @@ public: virtual bool isJobCountSupported() const { return true; } - void setLanguage(Core::Id language); + void setLanguage(Utils::Id language); void setDetection(Detection d); static Utils::LanguageVersion cxxLanguageVersion(const QByteArray &cplusplusMacroValue); - static Utils::LanguageVersion languageVersion(const Core::Id &language, const Macros ¯os); + static Utils::LanguageVersion languageVersion(const Utils::Id &language, const Macros ¯os); protected: - explicit ToolChain(Core::Id typeId); + explicit ToolChain(Utils::Id typeId); void setTypeDisplayName(const QString &typeName); @@ -206,7 +205,7 @@ public: static const QList<ToolChainFactory *> allToolChainFactories(); QString displayName() const { return m_displayName; } - Core::Id supportedToolChainType() const; + Utils::Id supportedToolChainType() const; virtual QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown); virtual QList<ToolChain *> detectForImport(const ToolChainDescription &tcd); @@ -217,19 +216,19 @@ public: ToolChain *restore(const QVariantMap &data); static QByteArray idFromMap(const QVariantMap &data); - static Core::Id typeIdFromMap(const QVariantMap &data); + static Utils::Id typeIdFromMap(const QVariantMap &data); static void autoDetectionToMap(QVariantMap &data, bool detected); - static ToolChain *createToolChain(Core::Id toolChainType); + static ToolChain *createToolChain(Utils::Id toolChainType); - QSet<Core::Id> supportedLanguages() const; + QSet<Utils::Id> supportedLanguages() const; void setUserCreatable(bool userCreatable); protected: void setDisplayName(const QString &name) { m_displayName = name; } - void setSupportedToolChainType(const Core::Id &supportedToolChainType); - void setSupportedLanguages(const QSet<Core::Id> &supportedLanguages); + void setSupportedToolChainType(const Utils::Id &supportedToolChainType); + void setSupportedLanguages(const QSet<Utils::Id> &supportedLanguages); void setSupportsAllLanguages(bool supportsAllLanguages); void setToolchainConstructor(const std::function<ToolChain *()> &constructor); @@ -248,8 +247,8 @@ protected: private: QString m_displayName; - Core::Id m_supportedToolChainType; - QSet<Core::Id> m_supportedLanguages; + Utils::Id m_supportedToolChainType; + QSet<Utils::Id> m_supportedLanguages; bool m_supportsAllLanguages = false; bool m_userCreatable = false; std::function<ToolChain *()> m_toolchainConstructor; diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp index b3ac697bb2..0a2936fc4b 100644 --- a/src/plugins/projectexplorer/toolchainmanager.cpp +++ b/src/plugins/projectexplorer/toolchainmanager.cpp @@ -54,7 +54,7 @@ namespace Internal { struct LanguageDisplayPair { - Core::Id id; + Utils::Id id; QString displayName; }; @@ -225,12 +225,12 @@ void ToolChainManager::deregisterToolChain(ToolChain *tc) delete tc; } -QSet<Core::Id> ToolChainManager::allLanguages() +QSet<Utils::Id> ToolChainManager::allLanguages() { return Utils::transform<QSet>(d->m_languages, &LanguageDisplayPair::id); } -bool ToolChainManager::registerLanguage(const Core::Id &language, const QString &displayName) +bool ToolChainManager::registerLanguage(const Utils::Id &language, const QString &displayName) { QTC_ASSERT(language.isValid(), return false); QTC_ASSERT(!isLanguageSupported(language), return false); @@ -239,7 +239,7 @@ bool ToolChainManager::registerLanguage(const Core::Id &language, const QString return true; } -QString ToolChainManager::displayNameOfLanguageId(const Core::Id &id) +QString ToolChainManager::displayNameOfLanguageId(const Utils::Id &id) { QTC_ASSERT(id.isValid(), return tr("None")); auto entry = Utils::findOrDefault(d->m_languages, Utils::equal(&LanguageDisplayPair::id, id)); @@ -247,7 +247,7 @@ QString ToolChainManager::displayNameOfLanguageId(const Core::Id &id) return entry.displayName; } -bool ToolChainManager::isLanguageSupported(const Core::Id &id) +bool ToolChainManager::isLanguageSupported(const Utils::Id &id) { return Utils::contains(d->m_languages, Utils::equal(&LanguageDisplayPair::id, id)); } diff --git a/src/plugins/projectexplorer/toolchainmanager.h b/src/plugins/projectexplorer/toolchainmanager.h index 894ec71da2..aa875092bb 100644 --- a/src/plugins/projectexplorer/toolchainmanager.h +++ b/src/plugins/projectexplorer/toolchainmanager.h @@ -29,8 +29,6 @@ #include "toolchain.h" -#include <coreplugin/id.h> - #include <QList> #include <QObject> #include <QSet> @@ -73,10 +71,10 @@ public: static bool registerToolChain(ToolChain *tc); static void deregisterToolChain(ToolChain *tc); - static QSet<Core::Id> allLanguages(); - static bool registerLanguage(const Core::Id &language, const QString &displayName); - static QString displayNameOfLanguageId(const Core::Id &id); - static bool isLanguageSupported(const Core::Id &id); + static QSet<Utils::Id> allLanguages(); + static bool registerLanguage(const Utils::Id &language, const QString &displayName); + static QString displayNameOfLanguageId(const Utils::Id &id); + static bool isLanguageSupported(const Utils::Id &id); static void aboutToShutdown(); diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index b2f2b2764b..8557c1106a 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -163,7 +163,7 @@ public: auto autoRoot = new StaticTreeItem(ToolChainOptionsPage::tr("Auto-detected")); auto manualRoot = new StaticTreeItem(ToolChainOptionsPage::tr("Manual")); - foreach (const Core::Id &l, ToolChainManager::allLanguages()) { + foreach (const Utils::Id &l, ToolChainManager::allLanguages()) { const QString dn = ToolChainManager::displayNameOfLanguageId(l); auto autoNode = new StaticTreeItem(dn); auto manualNode = new StaticTreeItem(dn); @@ -190,18 +190,18 @@ public: m_addButton = new QPushButton(ToolChainOptionsPage::tr("Add"), this); auto addMenu = new QMenu; foreach (ToolChainFactory *factory, m_factories) { - QList<Core::Id> languages = Utils::toList(factory->supportedLanguages()); + QList<Utils::Id> languages = Utils::toList(factory->supportedLanguages()); if (languages.isEmpty()) continue; if (languages.count() == 1) { addMenu->addAction(createAction(factory->displayName(), factory, languages.at(0))); } else { - Utils::sort(languages, [](const Core::Id &l1, const Core::Id &l2) { + Utils::sort(languages, [](const Utils::Id &l1, const Utils::Id &l2) { return ToolChainManager::displayNameOfLanguageId(l1) < ToolChainManager::displayNameOfLanguageId(l2); }); auto subMenu = addMenu->addMenu(factory->displayName()); - foreach (const Core::Id &l, languages) + foreach (const Utils::Id &l, languages) subMenu->addAction(createAction(ToolChainManager::displayNameOfLanguageId(l), factory, l)); } } @@ -289,7 +289,7 @@ public: void toolChainSelectionChanged(); void updateState(); - void createToolChain(ToolChainFactory *factory, const Core::Id &language); + void createToolChain(ToolChainFactory *factory, const Utils::Id &language); void cloneToolChain(); ToolChainTreeItem *currentTreeItem(); @@ -299,7 +299,7 @@ public: void removeToolChain(ProjectExplorer::ToolChain *); StaticTreeItem *parentForToolChain(ToolChain *tc); - QAction *createAction(const QString &name, ToolChainFactory *factory, Core::Id language) + QAction *createAction(const QString &name, ToolChainFactory *factory, Utils::Id language) { auto action = new QAction(name, nullptr); connect(action, &QAction::triggered, [this, factory, language] { createToolChain(factory, language); }); @@ -323,7 +323,7 @@ public: QPushButton *m_redetectButton; QPushButton *m_detectionSettingsButton; - QHash<Core::Id, QPair<StaticTreeItem *, StaticTreeItem *>> m_languageMap; + QHash<Utils::Id, QPair<StaticTreeItem *, StaticTreeItem *>> m_languageMap; QList<ToolChainTreeItem *> m_toAddList; QList<ToolChainTreeItem *> m_toRemoveList; @@ -458,7 +458,7 @@ void ToolChainOptionsWidget::apply() Q_ASSERT(m_toRemoveList.isEmpty()); // Update tool chains: - foreach (const Core::Id &l, m_languageMap.keys()) { + foreach (const Utils::Id &l, m_languageMap.keys()) { const QPair<StaticTreeItem *, StaticTreeItem *> autoAndManual = m_languageMap.value(l); for (StaticTreeItem *parent : {autoAndManual.first, autoAndManual.second}) { for (TreeItem *item : *parent) { @@ -504,7 +504,7 @@ void ToolChainOptionsWidget::apply() ToolChainManager::setDetectionSettings(m_detectionSettings); } -void ToolChainOptionsWidget::createToolChain(ToolChainFactory *factory, const Core::Id &language) +void ToolChainOptionsWidget::createToolChain(ToolChainFactory *factory, const Utils::Id &language) { QTC_ASSERT(factory, return); QTC_ASSERT(factory->canCreate(), return); diff --git a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp b/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp index dd6e540b1a..da8851a9c2 100644 --- a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp +++ b/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp @@ -253,7 +253,7 @@ QList<ToolChain *> ToolChainSettingsAccessor::toolChains(const QVariantMap &data const QVariantMap tcMap = data.value(key).toMap(); bool restored = false; - const Core::Id tcType = ToolChainFactory::typeIdFromMap(tcMap); + const Utils::Id tcType = ToolChainFactory::typeIdFromMap(tcMap); if (tcType.isValid()) { for (ToolChainFactory *f : factories) { if (f->supportedToolChainType() == tcType) { diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp index 273f079feb..b136fa6174 100644 --- a/src/plugins/projectexplorer/userfileaccessor.cpp +++ b/src/plugins/projectexplorer/userfileaccessor.cpp @@ -589,7 +589,7 @@ QVariantMap UserFileVersion16Upgrader::insertSteps(QVariantMap buildConfiguratio QString defaultDisplayName = oldStepMap.androidPackageInstall.value(defaultDisplayNameKey).toString(); bool enabled = oldStepMap.androidPackageInstall.value(enabledKey).toBool(); - androidPackageInstallStep.insert(idKey, Core::Id("Qt4ProjectManager.AndroidPackageInstallationStep").toSetting()); + androidPackageInstallStep.insert(idKey, Utils::Id("Qt4ProjectManager.AndroidPackageInstallationStep").toSetting()); androidPackageInstallStep.insert(displayNameKey, displayName); androidPackageInstallStep.insert(defaultDisplayNameKey, defaultDisplayName); androidPackageInstallStep.insert(enabledKey, enabled); @@ -598,7 +598,7 @@ QVariantMap UserFileVersion16Upgrader::insertSteps(QVariantMap buildConfiguratio defaultDisplayName = oldStepMap.androidDeployQt.value(defaultDisplayNameKey).toString(); enabled = oldStepMap.androidDeployQt.value(enabledKey).toBool(); - androidBuildApkStep.insert(idKey, Core::Id("QmakeProjectManager.AndroidBuildApkStep").toSetting()); + androidBuildApkStep.insert(idKey, Utils::Id("QmakeProjectManager.AndroidBuildApkStep").toSetting()); androidBuildApkStep.insert(displayNameKey, displayName); androidBuildApkStep.insert(defaultDisplayNameKey, defaultDisplayName); androidBuildApkStep.insert(enabledKey, enabled); |