diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2012-03-15 17:17:40 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-04-25 11:49:19 +0200 |
| commit | df5dab63827dc01412e7ddbe44ef0bef83b695ca (patch) | |
| tree | 92a5c25562a2148acdcd2e9318a1491dfd09b1ee /src/plugins/autotoolsprojectmanager/makestep.cpp | |
| parent | cf26765c62f9964ae337f2d52ac261099403d35f (diff) | |
| download | qt-creator-df5dab63827dc01412e7ddbe44ef0bef83b695ca.tar.gz | |
Use Core::Id in project-related objects
Use Core::Id for all the project related objects in favor of plain
QStrings.
Change-Id: I790ab40cb29899efdb49c413a77609486f52e683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/autotoolsprojectmanager/makestep.cpp')
| -rw-r--r-- | src/plugins/autotoolsprojectmanager/makestep.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp index e44eee9fe1..d01a13a8ce 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.cpp +++ b/src/plugins/autotoolsprojectmanager/makestep.cpp @@ -68,32 +68,32 @@ MakeStepFactory::MakeStepFactory(QObject *parent) : { } -QStringList MakeStepFactory::availableCreationIds(BuildStepList *parent) const +QList<Core::Id> MakeStepFactory::availableCreationIds(BuildStepList *parent) const { - if (parent->target()->project()->id() == QLatin1String(AUTOTOOLS_PROJECT_ID)) - return QStringList() << QLatin1String(MAKE_STEP_ID); - return QStringList(); + if (parent->target()->project()->id() == Core::Id(AUTOTOOLS_PROJECT_ID)) + return QList<Core::Id>() << Core::Id(MAKE_STEP_ID); + return QList<Core::Id>(); } -QString MakeStepFactory::displayNameForId(const QString &id) const +QString MakeStepFactory::displayNameForId(const Core::Id id) const { - if (id == QLatin1String(MAKE_STEP_ID)) + if (id == Core::Id(MAKE_STEP_ID)) return tr("Make", "Display name for AutotoolsProjectManager::MakeStep id."); return QString(); } -bool MakeStepFactory::canCreate(BuildStepList *parent, const QString &id) const +bool MakeStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const { - if (parent->target()->project()->id() != QLatin1String(AUTOTOOLS_PROJECT_ID)) + if (parent->target()->project()->id() != Core::Id(AUTOTOOLS_PROJECT_ID)) return false; - if (parent->id() != QLatin1String(BUILDSTEPS_BUILD)) + if (parent->id() != Core::Id(BUILDSTEPS_BUILD)) return false; - return QLatin1String(MAKE_STEP_ID) == id; + return Core::Id(MAKE_STEP_ID) == id; } -BuildStep *MakeStepFactory::create(BuildStepList *parent, const QString &id) +BuildStep *MakeStepFactory::create(BuildStepList *parent, const Core::Id id) { if (!canCreate(parent, id)) return 0; @@ -114,8 +114,7 @@ BuildStep *MakeStepFactory::clone(BuildStepList *parent, BuildStep *source) bool MakeStepFactory::canRestore(BuildStepList *parent, const QVariantMap &map) const { - QString id = idFromMap(map); - return canCreate(parent, id); + return canCreate(parent, idFromMap(map)); } BuildStep *MakeStepFactory::restore(BuildStepList *parent, const QVariantMap &map) @@ -133,13 +132,13 @@ BuildStep *MakeStepFactory::restore(BuildStepList *parent, const QVariantMap &ma // MakeStep class ///////////////////// MakeStep::MakeStep(BuildStepList* bsl) : - AbstractProcessStep(bsl, QLatin1String(MAKE_STEP_ID)), + AbstractProcessStep(bsl, Core::Id(MAKE_STEP_ID)), m_clean(false) { ctor(); } -MakeStep::MakeStep(BuildStepList *bsl, const QString &id) : +MakeStep::MakeStep(BuildStepList *bsl, const Core::Id id) : AbstractProcessStep(bsl, id), m_clean(false) { |