diff options
author | hjk <hjk@qt.io> | 2019-01-29 08:55:52 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-01-29 11:38:31 +0000 |
commit | 070e0efdccd51f5678319422ed763f71ee1d0fa0 (patch) | |
tree | e586aca1993481b00974eab492753a6b6f80d4e8 /src/plugins/projectexplorer | |
parent | 075e1da67e0ce5c276612e9eeb4ab6ffb83118e1 (diff) |
ProjectExplorer: Rename IBuildConfigurationFactory
... to BuildConfigurationFactory. It hasn't been an Interface for a
while and the new name matches Run- and DeployConfigurationFactory
Change-Id: I923c6a27e18a99628251b69e0270e910836e7b2a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer')
-rw-r--r-- | src/plugins/projectexplorer/buildconfiguration.cpp | 44 | ||||
-rw-r--r-- | src/plugins/projectexplorer/buildconfiguration.h | 12 | ||||
-rw-r--r-- | src/plugins/projectexplorer/buildinfo.h | 10 | ||||
-rw-r--r-- | src/plugins/projectexplorer/buildsettingspropertiespage.cpp | 6 | ||||
-rw-r--r-- | src/plugins/projectexplorer/project.cpp | 4 | ||||
-rw-r--r-- | src/plugins/projectexplorer/target.cpp | 6 | ||||
-rw-r--r-- | src/plugins/projectexplorer/target.h | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/targetsetupwidget.cpp | 4 |
8 files changed, 44 insertions, 44 deletions
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index b646f599d5..d44c92bb0f 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -321,31 +321,31 @@ void BuildConfiguration::prependCompilerPathToEnvironment(Kit *k, Utils::Environ // IBuildConfigurationFactory /// -static QList<IBuildConfigurationFactory *> g_buildConfigurationFactories; +static QList<BuildConfigurationFactory *> g_buildConfigurationFactories; -IBuildConfigurationFactory::IBuildConfigurationFactory() +BuildConfigurationFactory::BuildConfigurationFactory() { g_buildConfigurationFactories.append(this); } -IBuildConfigurationFactory::~IBuildConfigurationFactory() +BuildConfigurationFactory::~BuildConfigurationFactory() { g_buildConfigurationFactories.removeOne(this); } -int IBuildConfigurationFactory::priority(const Target *parent) const +int BuildConfigurationFactory::priority(const Target *parent) const { return canHandle(parent) ? m_basePriority : -1; } -bool IBuildConfigurationFactory::supportsTargetDeviceType(Core::Id id) const +bool BuildConfigurationFactory::supportsTargetDeviceType(Core::Id id) const { if (m_supportedTargetDeviceTypes.isEmpty()) return true; return m_supportedTargetDeviceTypes.contains(id); } -int IBuildConfigurationFactory::priority(const Kit *k, const QString &projectPath) const +int BuildConfigurationFactory::priority(const Kit *k, const QString &projectPath) const { QTC_ASSERT(!m_supportedProjectMimeTypeName.isEmpty(), return -1); if (k && Utils::mimeTypeForFile(projectPath).matchesName(m_supportedProjectMimeTypeName) @@ -356,11 +356,11 @@ int IBuildConfigurationFactory::priority(const Kit *k, const QString &projectPat } // setup -IBuildConfigurationFactory *IBuildConfigurationFactory::find(const Kit *k, const QString &projectPath) +BuildConfigurationFactory *BuildConfigurationFactory::find(const Kit *k, const QString &projectPath) { - IBuildConfigurationFactory *factory = nullptr; + BuildConfigurationFactory *factory = nullptr; int priority = -1; - for (IBuildConfigurationFactory *i : g_buildConfigurationFactories) { + for (BuildConfigurationFactory *i : g_buildConfigurationFactories) { int iPriority = i->priority(k, projectPath); if (iPriority > priority) { factory = i; @@ -371,11 +371,11 @@ IBuildConfigurationFactory *IBuildConfigurationFactory::find(const Kit *k, const } // create -IBuildConfigurationFactory * IBuildConfigurationFactory::find(Target *parent) +BuildConfigurationFactory * BuildConfigurationFactory::find(Target *parent) { - IBuildConfigurationFactory *factory = nullptr; + BuildConfigurationFactory *factory = nullptr; int priority = -1; - for (IBuildConfigurationFactory *i : g_buildConfigurationFactories) { + for (BuildConfigurationFactory *i : g_buildConfigurationFactories) { int iPriority = i->priority(parent); if (iPriority > priority) { factory = i; @@ -385,27 +385,27 @@ IBuildConfigurationFactory * IBuildConfigurationFactory::find(Target *parent) return factory; } -void IBuildConfigurationFactory::setSupportedProjectType(Core::Id id) +void BuildConfigurationFactory::setSupportedProjectType(Core::Id id) { m_supportedProjectType = id; } -void IBuildConfigurationFactory::setSupportedProjectMimeTypeName(const QString &mimeTypeName) +void BuildConfigurationFactory::setSupportedProjectMimeTypeName(const QString &mimeTypeName) { m_supportedProjectMimeTypeName = mimeTypeName; } -void IBuildConfigurationFactory::setSupportedTargetDeviceTypes(const QList<Core::Id> &ids) +void BuildConfigurationFactory::setSupportedTargetDeviceTypes(const QList<Core::Id> &ids) { m_supportedTargetDeviceTypes = ids; } -void IBuildConfigurationFactory::setBasePriority(int basePriority) +void BuildConfigurationFactory::setBasePriority(int basePriority) { m_basePriority = basePriority; } -bool IBuildConfigurationFactory::canHandle(const Target *target) const +bool BuildConfigurationFactory::canHandle(const Target *target) const { if (m_supportedProjectType.isValid() && m_supportedProjectType != target->project()->id()) return false; @@ -419,7 +419,7 @@ bool IBuildConfigurationFactory::canHandle(const Target *target) const return true; } -BuildConfiguration *IBuildConfigurationFactory::create(Target *parent, const BuildInfo *info) const +BuildConfiguration *BuildConfigurationFactory::create(Target *parent, const BuildInfo *info) const { if (!canHandle(parent)) return nullptr; @@ -431,11 +431,11 @@ BuildConfiguration *IBuildConfigurationFactory::create(Target *parent, const Bui return bc; } -BuildConfiguration *IBuildConfigurationFactory::restore(Target *parent, const QVariantMap &map) +BuildConfiguration *BuildConfigurationFactory::restore(Target *parent, const QVariantMap &map) { - IBuildConfigurationFactory *factory = nullptr; + BuildConfigurationFactory *factory = nullptr; int priority = -1; - for (IBuildConfigurationFactory *i : g_buildConfigurationFactories) { + for (BuildConfigurationFactory *i : g_buildConfigurationFactories) { if (!i->canHandle(parent)) continue; const Core::Id id = idFromMap(map); @@ -461,7 +461,7 @@ BuildConfiguration *IBuildConfigurationFactory::restore(Target *parent, const QV return bc; } -BuildConfiguration *IBuildConfigurationFactory::clone(Target *parent, +BuildConfiguration *BuildConfigurationFactory::clone(Target *parent, const BuildConfiguration *source) { return restore(parent, source->toMap()); diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index 95161bd6d7..1c2961c773 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -46,7 +46,7 @@ class PROJECTEXPLORER_EXPORT BuildConfiguration : public ProjectConfiguration Q_OBJECT protected: - friend class IBuildConfigurationFactory; + friend class BuildConfigurationFactory; explicit BuildConfiguration(Target *target, Core::Id id); public: @@ -118,13 +118,13 @@ private: mutable Utils::Environment m_cachedEnvironment; }; -class PROJECTEXPLORER_EXPORT IBuildConfigurationFactory : public QObject +class PROJECTEXPLORER_EXPORT BuildConfigurationFactory : public QObject { Q_OBJECT protected: - IBuildConfigurationFactory(); - ~IBuildConfigurationFactory() override; + BuildConfigurationFactory(); + ~BuildConfigurationFactory() override; public: // The priority is negative if this factory cannot create anything for the target. @@ -144,8 +144,8 @@ public: static BuildConfiguration *restore(Target *parent, const QVariantMap &map); static BuildConfiguration *clone(Target *parent, const BuildConfiguration *source); - static IBuildConfigurationFactory *find(const Kit *k, const QString &projectPath); - static IBuildConfigurationFactory *find(Target *parent); + static BuildConfigurationFactory *find(const Kit *k, const QString &projectPath); + static BuildConfigurationFactory *find(Target *parent); protected: bool supportsTargetDeviceType(Core::Id id) const; diff --git a/src/plugins/projectexplorer/buildinfo.h b/src/plugins/projectexplorer/buildinfo.h index e2163097e6..6eed9c2277 100644 --- a/src/plugins/projectexplorer/buildinfo.h +++ b/src/plugins/projectexplorer/buildinfo.h @@ -35,15 +35,15 @@ namespace ProjectExplorer { -class IBuildConfigurationFactory; +class BuildConfigurationFactory; class PROJECTEXPLORER_EXPORT BuildInfo { public: - BuildInfo(const IBuildConfigurationFactory *f) : m_factory(f) { } + BuildInfo(const BuildConfigurationFactory *f) : m_factory(f) { } virtual ~BuildInfo(); - const IBuildConfigurationFactory *factory() const { return m_factory; } + const BuildConfigurationFactory *factory() const { return m_factory; } QString displayName; QString typeName; @@ -68,9 +68,9 @@ public: } private: - const IBuildConfigurationFactory *m_factory; + const BuildConfigurationFactory *m_factory; - friend class IBuildConfigurationFactory; + friend class BuildConfigurationFactory; }; } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp index 07f1fa3a13..715ae977d7 100644 --- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp @@ -68,7 +68,7 @@ BuildSettingsWidget::BuildSettingsWidget(Target *target) : auto vbox = new QVBoxLayout(this); vbox->setContentsMargins(0, 0, 0, 0); - if (!IBuildConfigurationFactory::find(m_target)) { + if (!BuildConfigurationFactory::find(m_target)) { auto noSettingsLabel = new QLabel(this); noSettingsLabel->setText(tr("No build settings available")); QFont f = noSettingsLabel->font(); @@ -180,7 +180,7 @@ void BuildSettingsWidget::updateAddButtonMenu() m_buildInfoList.clear(); if (m_target) { - IBuildConfigurationFactory *factory = IBuildConfigurationFactory::find(m_target); + BuildConfigurationFactory *factory = BuildConfigurationFactory::find(m_target); if (!factory) return; m_buildInfoList = factory->availableBuilds(m_target); @@ -301,7 +301,7 @@ void BuildSettingsWidget::renameConfiguration() void BuildSettingsWidget::cloneConfiguration() { QTC_ASSERT(m_buildConfiguration, return); - IBuildConfigurationFactory *factory = IBuildConfigurationFactory::find(m_target); + BuildConfigurationFactory *factory = BuildConfigurationFactory::find(m_target); if (!factory) return; diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 155bb760b9..1be86777d9 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -237,7 +237,7 @@ Utils::FileName Project::projectFilePath() const bool Project::hasActiveBuildSettings() const { - return activeTarget() && IBuildConfigurationFactory::find(activeTarget()); + return activeTarget() && BuildConfigurationFactory::find(activeTarget()); } void Project::addTarget(std::unique_ptr<Target> &&t) @@ -355,7 +355,7 @@ bool Project::copySteps(Target *sourceTarget, Target *newTarget) QStringList runconfigurationError; foreach (BuildConfiguration *sourceBc, sourceTarget->buildConfigurations()) { - BuildConfiguration *newBc = IBuildConfigurationFactory::clone(newTarget, sourceBc); + BuildConfiguration *newBc = BuildConfigurationFactory::clone(newTarget, sourceBc); if (!newBc) { buildconfigurationError << sourceBc->displayName(); continue; diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp index b42ed99d0a..f8a3efaca9 100644 --- a/src/plugins/projectexplorer/target.cpp +++ b/src/plugins/projectexplorer/target.cpp @@ -488,7 +488,7 @@ QVariantMap Target::toMap() const void Target::updateDefaultBuildConfigurations() { - IBuildConfigurationFactory *bcFactory = IBuildConfigurationFactory::find(this); + BuildConfigurationFactory *bcFactory = BuildConfigurationFactory::find(this); if (!bcFactory) { qWarning("No build configuration factory found for target id '%s'.", qPrintable(id().toString())); return; @@ -752,7 +752,7 @@ bool Target::fromMap(const QVariantMap &map) if (!map.contains(key)) return false; const QVariantMap valueMap = map.value(key).toMap(); - BuildConfiguration *bc = IBuildConfigurationFactory::restore(this, valueMap); + BuildConfiguration *bc = BuildConfigurationFactory::restore(this, valueMap); if (!bc) { qWarning("No factory found to restore build configuration!"); continue; @@ -762,7 +762,7 @@ bool Target::fromMap(const QVariantMap &map) if (i == activeConfiguration) setActiveBuildConfiguration(bc); } - if (buildConfigurations().isEmpty() && IBuildConfigurationFactory::find(this)) + if (buildConfigurations().isEmpty() && BuildConfigurationFactory::find(this)) return false; int dcCount = map.value(QLatin1String(DC_COUNT_KEY), 0).toInt(&ok); diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h index 56b4d0237a..18eb92d273 100644 --- a/src/plugins/projectexplorer/target.h +++ b/src/plugins/projectexplorer/target.h @@ -42,7 +42,7 @@ class BuildTargetInfoList; class DeployConfiguration; class DeployConfigurationFactory; class DeploymentData; -class IBuildConfigurationFactory; +class BuildConfigurationFactory; class RunConfigurationFactory; class Kit; class NamedWidget; diff --git a/src/plugins/projectexplorer/targetsetupwidget.cpp b/src/plugins/projectexplorer/targetsetupwidget.cpp index 9635128415..e51ee45d0e 100644 --- a/src/plugins/projectexplorer/targetsetupwidget.cpp +++ b/src/plugins/projectexplorer/targetsetupwidget.cpp @@ -228,8 +228,8 @@ void TargetSetupWidget::expandWidget() QList<BuildInfo *> TargetSetupWidget::buildInfoList(const Kit *k, const QString &projectPath) { - const IBuildConfigurationFactory *const factory - = IBuildConfigurationFactory::find(k, projectPath); + const BuildConfigurationFactory *const factory + = BuildConfigurationFactory::find(k, projectPath); if (factory) return factory->availableSetups(k, projectPath); |