diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp index 6cbb7bc72ef65441dfaac27fc7e0a6518c037394..7b876d7d7c861d12676d36e142fc24460ab9ce2d 100644 --- a/src/plugins/cmakeprojectmanager/makestep.cpp +++ b/src/plugins/cmakeprojectmanager/makestep.cpp @@ -284,7 +284,7 @@ BuildStep *MakeStepFactory::clone(BuildStep *bs, BuildConfiguration *bc) const return new MakeStep(static_cast<MakeStep *>(bs), bc); } -QStringList MakeStepFactory::canCreateForProject(BuildConfiguration * /* pro */) const +QStringList MakeStepFactory::canCreateForBuildConfiguration(BuildConfiguration * /* pro */) const { return QStringList(); } diff --git a/src/plugins/cmakeprojectmanager/makestep.h b/src/plugins/cmakeprojectmanager/makestep.h index 6bb2a9b55691858ec2057137d94b780db875e404..1fa3ff36a998a425ef330800fae9f0d07ded2705 100644 --- a/src/plugins/cmakeprojectmanager/makestep.h +++ b/src/plugins/cmakeprojectmanager/makestep.h @@ -107,7 +107,7 @@ class MakeStepFactory : public ProjectExplorer::IBuildStepFactory virtual bool canCreate(const QString &name) const; virtual ProjectExplorer::BuildStep *create(ProjectExplorer::BuildConfiguration *bc, const QString &name) const; virtual ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const; - virtual QStringList canCreateForProject(ProjectExplorer::BuildConfiguration *bc) const; + virtual QStringList canCreateForBuildConfiguration(ProjectExplorer::BuildConfiguration *bc) const; virtual QString displayNameForName(const QString &name) const; }; diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp index 2d7f82de09dc63589cd8f0be346e6474a0f9bf69..bb9fdc1f814867873c95e32b3c79bdcc2b868f98 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.cpp +++ b/src/plugins/genericprojectmanager/genericmakestep.cpp @@ -292,7 +292,7 @@ ProjectExplorer::BuildStep *GenericMakeStepFactory::clone(ProjectExplorer::Build return new GenericMakeStep(static_cast<GenericMakeStep*>(bs), bc); } -QStringList GenericMakeStepFactory::canCreateForProject(ProjectExplorer::BuildConfiguration * /* pro */) const +QStringList GenericMakeStepFactory::canCreateForBuildConfiguration(ProjectExplorer::BuildConfiguration * /* pro */) const { return QStringList(); } diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h index d5eb0ccc9793cc7aea3f14fe63144615da6bc4e4..98b2a8018e7a540fd8b88075c2cc14d3c55842ad 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.h +++ b/src/plugins/genericprojectmanager/genericmakestep.h @@ -107,7 +107,7 @@ class GenericMakeStepFactory : public ProjectExplorer::IBuildStepFactory const QString &name) const; virtual ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const; - virtual QStringList canCreateForProject(ProjectExplorer::BuildConfiguration *bc) const; + virtual QStringList canCreateForBuildConfiguration(ProjectExplorer::BuildConfiguration *bc) const; virtual QString displayNameForName(const QString &name) const; }; diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index 78c715495db6a17d2e1e803e7eece14d3e827f8d..09fcbf55441b7433fdbb74fc14c55148aa88110c 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -133,7 +133,7 @@ public: virtual BuildStep *create(BuildConfiguration *bc, const QString &name) const = 0; /// Called by the add BuildStep action to check which BuildSteps could be added /// to the project by this factory, should return a list of names - virtual QStringList canCreateForProject(BuildConfiguration *bc) const = 0; + virtual QStringList canCreateForBuildConfiguration(BuildConfiguration *bc) const = 0; /// Called to convert an internal name to a displayName /// Called to clone a BuildStep diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp index c95b9b32d2a86dc0c9b39116fb6fc31edb223dab..2804ec414f98c12455202d22c6c2000e6b55a338 100644 --- a/src/plugins/projectexplorer/buildstepspage.cpp +++ b/src/plugins/projectexplorer/buildstepspage.cpp @@ -143,7 +143,7 @@ void BuildStepsPage::updateAddBuildStepMenu() //Build up a list of possible steps and save map the display names to the (internal) name and factories. QList<IBuildStepFactory *> factories = ExtensionSystem::PluginManager::instance()->getObjects<IBuildStepFactory>(); foreach (IBuildStepFactory * factory, factories) { - QStringList names = factory->canCreateForProject(m_configuration); + QStringList names = factory->canCreateForBuildConfiguration(m_configuration); foreach (const QString &name, names) { map.insert(factory->displayNameForName(name), QPair<QString, IBuildStepFactory *>(name, factory)); } diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp index fac4255c4c445e080cdae2bd6ac046679879612a..d579ebe9511022a9dea0fc5f36064172d5f4c512 100644 --- a/src/plugins/projectexplorer/processstep.cpp +++ b/src/plugins/projectexplorer/processstep.cpp @@ -212,7 +212,7 @@ BuildStep *ProcessStepFactory::clone(BuildStep *bs, BuildConfiguration *bc) cons return new ProcessStep(static_cast<ProcessStep *>(bs), bc); } -QStringList ProcessStepFactory::canCreateForProject(BuildConfiguration *bc) const +QStringList ProcessStepFactory::canCreateForBuildConfiguration(BuildConfiguration *bc) const { Q_UNUSED(bc) return QStringList()<<"projectexplorer.processstep"; diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h index 2dc0398ad78ef979fa0fe0fedc7e6e425e5677bd..801ba25894576cfd5fca296cdb358386f96b5ac6 100644 --- a/src/plugins/projectexplorer/processstep.h +++ b/src/plugins/projectexplorer/processstep.h @@ -47,7 +47,7 @@ public: virtual bool canCreate(const QString &name) const; virtual BuildStep *create(BuildConfiguration *bc, const QString &name) const; virtual BuildStep *clone(BuildStep *bs, BuildConfiguration *bc) const; - virtual QStringList canCreateForProject(BuildConfiguration *pro) const; + virtual QStringList canCreateForBuildConfiguration(BuildConfiguration *pro) const; virtual QString displayNameForName(const QString &name) const; }; diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index 77280b2498bb5661411f5031a32c7c713d0a9b39..0079f4fcb7320fc63341fcb257f866459bfc6f3e 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -335,7 +335,7 @@ ProjectExplorer::BuildStep *MakeStepFactory::clone(ProjectExplorer::BuildStep *b return new MakeStep(static_cast<MakeStep *>(bs), bc); } -QStringList MakeStepFactory::canCreateForProject(ProjectExplorer::BuildConfiguration *pro) const +QStringList MakeStepFactory::canCreateForBuildConfiguration(ProjectExplorer::BuildConfiguration *pro) const { if (qobject_cast<Qt4BuildConfiguration *>(pro)) return QStringList() << Constants::MAKESTEP; diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h index 8040d98c2cb86729f01e44698be1c1f61555f4e4..5c674cf7dd7ec7f0b6ffc934d3ee47b3e397ef1d 100644 --- a/src/plugins/qt4projectmanager/makestep.h +++ b/src/plugins/qt4projectmanager/makestep.h @@ -54,7 +54,7 @@ public: bool canCreate(const QString & name) const; ProjectExplorer::BuildStep *create(ProjectExplorer::BuildConfiguration *bc, const QString & name) const; ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const; - QStringList canCreateForProject(ProjectExplorer::BuildConfiguration *bc) const; + QStringList canCreateForBuildConfiguration(ProjectExplorer::BuildConfiguration *bc) const; QString displayNameForName(const QString &name) const; }; } diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index c5c914c031e97e1a8061d63f9eaf84ec4e28b568..11672a43f9d092c7bcc75e11239b621d4b5fd845 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -377,7 +377,7 @@ ProjectExplorer::BuildStep *QMakeStepFactory::clone(ProjectExplorer::BuildStep * return new QMakeStep(static_cast<QMakeStep *>(bs), bc); } -QStringList QMakeStepFactory::canCreateForProject(ProjectExplorer::BuildConfiguration *bc) const +QStringList QMakeStepFactory::canCreateForBuildConfiguration(ProjectExplorer::BuildConfiguration *bc) const { if (qobject_cast<Qt4BuildConfiguration *>(bc)) return QStringList() << Constants::QMAKESTEP; diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h index fd249756f3f0fd26cc4163dbcb6ea1cd30e6860c..867c938c0dc9b73e3c68b6103dde75fccdb03484 100644 --- a/src/plugins/qt4projectmanager/qmakestep.h +++ b/src/plugins/qt4projectmanager/qmakestep.h @@ -54,7 +54,7 @@ public: bool canCreate(const QString & name) const; ProjectExplorer::BuildStep *create(ProjectExplorer::BuildConfiguration *bc, const QString & name) const; ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const; - QStringList canCreateForProject(ProjectExplorer::BuildConfiguration *bc) const; + QStringList canCreateForBuildConfiguration(ProjectExplorer::BuildConfiguration *bc) const; QString displayNameForName(const QString &name) const; }; }