diff options
Diffstat (limited to 'src/plugins/qmakeprojectmanager')
12 files changed, 28 insertions, 28 deletions
diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp index 188b9add4ee..7cef5bf6bf3 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp @@ -623,7 +623,7 @@ DesktopQmakeRunConfigurationFactory::DesktopQmakeRunConfigurationFactory(QObject DesktopQmakeRunConfigurationFactory::~DesktopQmakeRunConfigurationFactory() { } -bool DesktopQmakeRunConfigurationFactory::canCreate(Target *parent, const Core::Id id) const +bool DesktopQmakeRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const { if (!canHandle(parent)) return false; @@ -631,7 +631,7 @@ bool DesktopQmakeRunConfigurationFactory::canCreate(Target *parent, const Core:: return project->hasApplicationProFile(pathFromId(id)); } -RunConfiguration *DesktopQmakeRunConfigurationFactory::doCreate(Target *parent, const Core::Id id) +RunConfiguration *DesktopQmakeRunConfigurationFactory::doCreate(Target *parent, Core::Id id) { DesktopQmakeRunConfiguration *rc = new DesktopQmakeRunConfiguration(parent, id); const QmakeProFileNode *node = static_cast<QmakeProject *>(parent->project())->rootQmakeProjectNode()->findProFileFor(rc->proFilePath()); @@ -679,7 +679,7 @@ QList<Core::Id> DesktopQmakeRunConfigurationFactory::availableCreationIds(Target return QmakeProject::idsForNodes(Core::Id(QMAKE_RC_PREFIX), nodes); } -QString DesktopQmakeRunConfigurationFactory::displayNameForId(const Core::Id id) const +QString DesktopQmakeRunConfigurationFactory::displayNameForId(Core::Id id) const { return QFileInfo(pathFromId(id)).completeBaseName(); } diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h index ffba1c09bcc..c7c30cb669c 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h @@ -188,13 +188,13 @@ public: explicit DesktopQmakeRunConfigurationFactory(QObject *parent = 0); ~DesktopQmakeRunConfigurationFactory(); - bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const; + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const; ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source); QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const; - QString displayNameForId(const Core::Id id) const; + QString displayNameForId(Core::Id id) const; QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Target *t, const ProjectExplorer::Node *n); @@ -202,7 +202,7 @@ public: private: bool canHandle(ProjectExplorer::Target *t) const; - ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, const Core::Id id); + ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id); ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent, const QVariantMap &map); }; diff --git a/src/plugins/qmakeprojectmanager/makestep.cpp b/src/plugins/qmakeprojectmanager/makestep.cpp index 14923acf33c..316b0726e22 100644 --- a/src/plugins/qmakeprojectmanager/makestep.cpp +++ b/src/plugins/qmakeprojectmanager/makestep.cpp @@ -77,7 +77,7 @@ MakeStep::MakeStep(BuildStepList *bsl, MakeStep *bs) : ctor(); } -MakeStep::MakeStep(BuildStepList *bsl, const Core::Id id) : +MakeStep::MakeStep(BuildStepList *bsl, Core::Id id) : AbstractProcessStep(bsl, id), m_clean(false) { @@ -483,14 +483,14 @@ MakeStepFactory::~MakeStepFactory() { } -bool MakeStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const +bool MakeStepFactory::canCreate(BuildStepList *parent, Core::Id id) const { if (parent->target()->project()->id() == Constants::QMAKEPROJECT_ID) return id == MAKESTEP_BS_ID; return false; } -BuildStep *MakeStepFactory::create(BuildStepList *parent, const Core::Id id) +BuildStep *MakeStepFactory::create(BuildStepList *parent, Core::Id id) { if (!canCreate(parent, id)) return 0; @@ -537,7 +537,7 @@ QList<Core::Id> MakeStepFactory::availableCreationIds(BuildStepList *parent) con return QList<Core::Id>(); } -QString MakeStepFactory::displayNameForId(const Core::Id id) const +QString MakeStepFactory::displayNameForId(Core::Id id) const { if (id == MAKESTEP_BS_ID) return tr("Make"); diff --git a/src/plugins/qmakeprojectmanager/makestep.h b/src/plugins/qmakeprojectmanager/makestep.h index 1b68a7e9cd9..47e1ffa54c7 100644 --- a/src/plugins/qmakeprojectmanager/makestep.h +++ b/src/plugins/qmakeprojectmanager/makestep.h @@ -57,15 +57,15 @@ public: explicit MakeStepFactory(QObject *parent = 0); virtual ~MakeStepFactory(); - bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id); + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const; ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source); bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; - QString displayNameForId(const Core::Id id) const; + QString displayNameForId(Core::Id id) const; }; } //namespace Internal @@ -101,7 +101,7 @@ signals: protected: MakeStep(ProjectExplorer::BuildStepList *bsl, MakeStep *bs); - MakeStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id); + MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); virtual bool fromMap(const QVariantMap &map); private: diff --git a/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp b/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp index ce684b24724..736a187bb12 100644 --- a/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp +++ b/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp @@ -279,7 +279,7 @@ ProFileCompletionAssistProvider::~ProFileCompletionAssistProvider() { } -bool ProFileCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const +bool ProFileCompletionAssistProvider::supportsEditor(Core::Id editorId) const { return editorId == QmakeProjectManager::Constants::PROFILE_EDITOR_ID; } diff --git a/src/plugins/qmakeprojectmanager/profilecompletionassist.h b/src/plugins/qmakeprojectmanager/profilecompletionassist.h index 96118191712..459552512ce 100644 --- a/src/plugins/qmakeprojectmanager/profilecompletionassist.h +++ b/src/plugins/qmakeprojectmanager/profilecompletionassist.h @@ -47,7 +47,7 @@ public: void init(); ~ProFileCompletionAssistProvider(); - bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE; + bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE; TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE; QStringList variables() const; QStringList functions() const; diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index dcf5b7edda1..c97e2b80c3f 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -93,7 +93,7 @@ QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target) : ctor(); } -QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, const Core::Id id) : +QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id) : BuildConfiguration(target, id), m_shadowBuild(true), m_isEnabled(false), diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h index e07795afe90..76c472b5172 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h @@ -120,7 +120,7 @@ private slots: protected: QmakeBuildConfiguration(ProjectExplorer::Target *target, QmakeBuildConfiguration *source); - QmakeBuildConfiguration(ProjectExplorer::Target *target, const Core::Id id); + QmakeBuildConfiguration(ProjectExplorer::Target *target, Core::Id id); virtual bool fromMap(const QVariantMap &map); private: diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 4b8e2d43028..17d86a2fd9c 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -1105,7 +1105,7 @@ QList<QmakeProFileNode *> QmakeProject::nodesWithQtcRunnable(QList<QmakeProFileN return nodes; } -QList<Core::Id> QmakeProject::idsForNodes(const Core::Id base, const QList<QmakeProFileNode *> &nodes) +QList<Core::Id> QmakeProject::idsForNodes(Core::Id base, const QList<QmakeProFileNode *> &nodes) { return Utils::transform(nodes, [&base](QmakeProFileNode *node) { return base.withSuffix(node->path()); diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h index 1575b2f1f78..0c19acb4086 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.h +++ b/src/plugins/qmakeprojectmanager/qmakeproject.h @@ -93,7 +93,7 @@ public: bool hasApplicationProFile(const QString &path) const; static QList<QmakeProFileNode *> nodesWithQtcRunnable(QList<QmakeProFileNode *> nodes); - static QList<Core::Id> idsForNodes(const Core::Id base, const QList<QmakeProFileNode *> &nodes); + static QList<Core::Id> idsForNodes(Core::Id base, const QList<QmakeProFileNode *> &nodes); void notifyChanged(const QString &name); diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index bb1e173bd58..c210d25b3a4 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -78,7 +78,7 @@ QMakeStep::QMakeStep(BuildStepList *bsl) : ctor(); } -QMakeStep::QMakeStep(BuildStepList *bsl, const Core::Id id) : +QMakeStep::QMakeStep(BuildStepList *bsl, Core::Id id) : AbstractProcessStep(bsl, id), m_forced(false), m_linkQmlDebuggingLibrary(DebugLink) @@ -661,7 +661,7 @@ QMakeStepFactory::~QMakeStepFactory() { } -bool QMakeStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const +bool QMakeStepFactory::canCreate(BuildStepList *parent, Core::Id id) const { if (parent->id() != ProjectExplorer::Constants::BUILDSTEPS_BUILD) return false; @@ -670,7 +670,7 @@ bool QMakeStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const return id == QMAKE_BS_ID; } -ProjectExplorer::BuildStep *QMakeStepFactory::create(BuildStepList *parent, const Core::Id id) +ProjectExplorer::BuildStep *QMakeStepFactory::create(BuildStepList *parent, Core::Id id) { if (!canCreate(parent, id)) return 0; @@ -714,7 +714,7 @@ QList<Core::Id> QMakeStepFactory::availableCreationIds(ProjectExplorer::BuildSte return QList<Core::Id>(); } -QString QMakeStepFactory::displayNameForId(const Core::Id id) const +QString QMakeStepFactory::displayNameForId(Core::Id id) const { if (id == QMAKE_BS_ID) return tr("qmake"); diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h index e382ba234bd..ea5a5a3d648 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.h +++ b/src/plugins/qmakeprojectmanager/qmakestep.h @@ -58,14 +58,14 @@ class QMakeStepFactory : public ProjectExplorer::IBuildStepFactory public: explicit QMakeStepFactory(QObject *parent = 0); virtual ~QMakeStepFactory(); - bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id); + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *bs) const; ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *bs); bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; - QString displayNameForId(const Core::Id id) const; + QString displayNameForId(Core::Id id) const; }; } // namespace Internal @@ -120,7 +120,7 @@ signals: protected: QMakeStep(ProjectExplorer::BuildStepList *parent, QMakeStep *source); - QMakeStep(ProjectExplorer::BuildStepList *parent, const Core::Id id); + QMakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id); virtual bool fromMap(const QVariantMap &map); virtual void processStartupFailed(); |