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>

src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h

@@ -38,7 +38,7 @@ class AutotoolsBuildConfiguration : public ProjectExplorer::BuildConfiguration
 {
     Q_OBJECT
 
-    friend class ProjectExplorer::IBuildConfigurationFactory;
+    friend class ProjectExplorer::BuildConfigurationFactory;
     AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id);
 
     void initialize(const ProjectExplorer::BuildInfo *info) override;
@@ -46,7 +46,7 @@ class AutotoolsBuildConfiguration : public ProjectExplorer::BuildConfiguration
     BuildType buildType() const override;
 };
 
-class AutotoolsBuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
+class AutotoolsBuildConfigurationFactory : public ProjectExplorer::BuildConfigurationFactory
 {
     Q_OBJECT
 

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h

@@ -48,7 +48,7 @@ class CMakeBuildConfiguration : public ProjectExplorer::BuildConfiguration
 {
     Q_OBJECT
 
-    friend class ProjectExplorer::IBuildConfigurationFactory;
+    friend class ProjectExplorer::BuildConfigurationFactory;
     CMakeBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id);
 
 public:
@@ -117,7 +117,7 @@ private:
 
 class CMakeProjectImporter;
 
-class CMakeBuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
+class CMakeBuildConfigurationFactory : public ProjectExplorer::BuildConfigurationFactory
 {
     Q_OBJECT
 

src/plugins/cmakeprojectmanager/cmakebuildinfo.h

@@ -40,11 +40,11 @@ namespace CMakeProjectManager {
 class CMakeBuildInfo : public ProjectExplorer::BuildInfo
 {
 public:
-    CMakeBuildInfo(const ProjectExplorer::IBuildConfigurationFactory *f) : ProjectExplorer::BuildInfo(f)
+    CMakeBuildInfo(const ProjectExplorer::BuildConfigurationFactory *f) : ProjectExplorer::BuildInfo(f)
     { }
 
     CMakeBuildInfo(const Internal::CMakeBuildConfiguration *bc) :
-        ProjectExplorer::BuildInfo(ProjectExplorer::IBuildConfigurationFactory::find(bc->target()))
+        ProjectExplorer::BuildInfo(ProjectExplorer::BuildConfigurationFactory::find(bc->target()))
     {
         displayName = bc->displayName();
         buildDirectory = bc->buildDirectory();

src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp

@@ -352,7 +352,7 @@ QList<BuildInfo *> CMakeProjectImporter::buildInfoListForKit(const Kit *k, void
     QList<BuildInfo *> result;
     auto data = static_cast<const DirectoryData *>(directoryData);
     auto factory = qobject_cast<CMakeBuildConfigurationFactory *>(
-                IBuildConfigurationFactory::find(k, projectFilePath().toString()));
+                BuildConfigurationFactory::find(k, projectFilePath().toString()));
     if (!factory)
         return result;
 

src/plugins/genericprojectmanager/genericbuildconfiguration.h

@@ -40,7 +40,7 @@ class GenericBuildConfiguration : public ProjectExplorer::BuildConfiguration
 {
     Q_OBJECT
 
-    friend class ProjectExplorer::IBuildConfigurationFactory;
+    friend class ProjectExplorer::BuildConfigurationFactory;
     GenericBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id);
 
     void initialize(const ProjectExplorer::BuildInfo *info) override;
@@ -49,7 +49,7 @@ class GenericBuildConfiguration : public ProjectExplorer::BuildConfiguration
     void addToEnvironment(Utils::Environment &env) const final;
 };
 
-class GenericBuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
+class GenericBuildConfigurationFactory : public ProjectExplorer::BuildConfigurationFactory
 {
     Q_OBJECT
 

src/plugins/nim/project/nimbuildconfiguration.h

@@ -36,7 +36,7 @@ class NimBuildConfiguration : public ProjectExplorer::BuildConfiguration
 {
     Q_OBJECT
 
-    friend class ProjectExplorer::IBuildConfigurationFactory;
+    friend class ProjectExplorer::BuildConfigurationFactory;
     NimBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
 
     void initialize(const ProjectExplorer::BuildInfo *info) override;
@@ -59,7 +59,7 @@ private:
 };
 
 
-class NimBuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
+class NimBuildConfigurationFactory : public ProjectExplorer::BuildConfigurationFactory
 {
     Q_OBJECT
 

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());

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();
+    BuildConfigurationFactory();
-    ~IBuildConfigurationFactory() override;
+    ~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 BuildConfigurationFactory *find(const Kit *k, const QString &projectPath);
-    static IBuildConfigurationFactory *find(Target *parent);
+    static BuildConfigurationFactory *find(Target *parent);
 
 protected:
     bool supportsTargetDeviceType(Core::Id id) const;

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

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;
 

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;

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);

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;

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
+    const BuildConfigurationFactory *const factory
-            = IBuildConfigurationFactory::find(k, projectPath);
+            = BuildConfigurationFactory::find(k, projectPath);
     if (factory)
         return factory->availableSetups(k, projectPath);
 

src/plugins/qbsprojectmanager/qbsbuildconfiguration.h

@@ -45,7 +45,7 @@ class QbsBuildConfiguration : public ProjectExplorer::BuildConfiguration
 {
     Q_OBJECT
 
-    friend class ProjectExplorer::IBuildConfigurationFactory;
+    friend class ProjectExplorer::BuildConfigurationFactory;
     QbsBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
 
 public:
@@ -97,7 +97,7 @@ private:
     friend class QbsBuildConfigurationWidget;
 };
 
-class QbsBuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
+class QbsBuildConfigurationFactory : public ProjectExplorer::BuildConfigurationFactory
 {
     Q_OBJECT
 

src/plugins/qbsprojectmanager/qbsbuildinfo.cpp

@@ -30,7 +30,7 @@
 namespace QbsProjectManager {
 namespace Internal {
 
-QbsBuildInfo::QbsBuildInfo(const ProjectExplorer::IBuildConfigurationFactory *f)
+QbsBuildInfo::QbsBuildInfo(const ProjectExplorer::BuildConfigurationFactory *f)
     : ProjectExplorer::BuildInfo(f)
 {
 }

src/plugins/qbsprojectmanager/qbsbuildinfo.h

@@ -35,7 +35,7 @@ namespace Internal {
 class QbsBuildInfo final : public ProjectExplorer::BuildInfo
 {
 public:
-    QbsBuildInfo(const ProjectExplorer::IBuildConfigurationFactory *f);
+    QbsBuildInfo(const ProjectExplorer::BuildConfigurationFactory *f);
 
     QVariantMap config;
 

src/plugins/qbsprojectmanager/qbsproject.cpp

@@ -696,8 +696,8 @@ void QbsProject::configureAsExampleProject(const QSet<Id> &platforms)
                 = QtSupport::QtKitInformation::qtVersion(k);
         if (!qtVersion || !qtVersionMatchesPlatform(qtVersion))
             continue;
-        const IBuildConfigurationFactory * const factory
+        const BuildConfigurationFactory * const factory
-                = IBuildConfigurationFactory::find(k, projectFilePath().toString());
+                = BuildConfigurationFactory::find(k, projectFilePath().toString());
         if (!factory)
             continue;
         const auto &buildInfos = factory->availableSetups(k, projectFilePath().toString());

src/plugins/qbsprojectmanager/qbsprojectimporter.cpp

@@ -226,7 +226,7 @@ QList<BuildInfo *> QbsProjectImporter::buildInfoListForKit(const Kit *k, void *d
     qCDebug(qbsPmLog) << "creating build info for kit" << k->displayName();
     QList<BuildInfo *> result;
     const auto factory = qobject_cast<QbsBuildConfigurationFactory *>(
-                IBuildConfigurationFactory::find(k, projectFilePath().toString()));
+                BuildConfigurationFactory::find(k, projectFilePath().toString()));
     if (!factory) {
         qCDebug(qbsPmLog) << "no build config factory found";
         return result;

src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h

@@ -145,7 +145,7 @@ private:
     friend class QmakeBuildConfigurationFactory;
 };
 
-class QMAKEPROJECTMANAGER_EXPORT QmakeBuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
+class QMAKEPROJECTMANAGER_EXPORT QmakeBuildConfigurationFactory : public ProjectExplorer::BuildConfigurationFactory
 {
     Q_OBJECT
 

src/plugins/qmakeprojectmanager/qmakeproject.cpp

@@ -966,7 +966,7 @@ void QmakeProject::configureAsExampleProject(const QSet<Core::Id> &platforms)
                     && !Utils::contains(version->targetDeviceTypes(), [platforms](Core::Id i) { return platforms.contains(i); })))
             continue;
 
-        IBuildConfigurationFactory *factory = IBuildConfigurationFactory::find(k, projectFilePath().toString());
+        BuildConfigurationFactory *factory = BuildConfigurationFactory::find(k, projectFilePath().toString());
         if (!factory)
             continue;
         foreach (BuildInfo *info, factory->availableSetups(k, projectFilePath().toString()))

src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp

@@ -234,7 +234,7 @@ QList<BuildInfo *> QmakeProjectImporter::buildInfoListForKit(const Kit *k, void
     QList<BuildInfo *> result;
     auto *data = static_cast<DirectoryData *>(directoryData);
     auto factory = qobject_cast<QmakeBuildConfigurationFactory *>(
-                IBuildConfigurationFactory::find(k, projectFilePath().toString()));
+                BuildConfigurationFactory::find(k, projectFilePath().toString()));
     if (!factory)
         return result;
 

src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp

@@ -71,7 +71,7 @@ public:
     bool needsConfiguration() const final { return false; }
 };
 
-class DummyBuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
+class DummyBuildConfigurationFactory : public ProjectExplorer::BuildConfigurationFactory
 {
 public:
     QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *) const final