feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use Core::Id in project-related objects

Browse Source 
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>
This commit is contained in:
Tobias Hunger
2012-03-15 17:17:40 +01:00
parent cf26765c62
commit df5dab6382
217 changed files with 1379 additions and 1357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/android/androidpackageinstallationfactory.cpp
View File

@@ -51,16 +51,16 @@ AndroidPackageInstallationFactory::AndroidPackageInstallationFactory(QObject *pa
{
}
QStringList AndroidPackageInstallationFactory::availableCreationIds(BuildStepList *parent) const
QList<Core::Id> AndroidPackageInstallationFactory::availableCreationIds(BuildStepList *parent) const
{
if (parent->id() == QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
&& parent->target()->id() == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
&& !parent->contains(AndroidPackageInstallationStep::Id))
return QStringList() << AndroidPackageInstallationStep::Id;
return QStringList();
if (parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
&& parent->target()->id() == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
&& !parent->contains(Core::Id(AndroidPackageInstallationStep::Id)))
return QList<Core::Id>() << Core::Id(AndroidPackageInstallationStep::Id);
return QList<Core::Id>();
}
QString AndroidPackageInstallationFactory::displayNameForId(const QString &id) const
QString AndroidPackageInstallationFactory::displayNameForId(const Core::Id id) const
{
if (id == AndroidPackageInstallationStep::Id)
return QCoreApplication::translate("Qt4ProjectManager::Internal::AndroidPackageInstallationFactory",
@@ -68,15 +68,15 @@ QString AndroidPackageInstallationFactory::displayNameForId(const QString &id) c
return QString();
}
bool AndroidPackageInstallationFactory::canCreate(BuildStepList *parent, const QString &id) const
bool AndroidPackageInstallationFactory::canCreate(BuildStepList *parent, const Core::Id id) const
{
return parent->id() == QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
&& id == QLatin1String(AndroidPackageInstallationStep::Id)
&& parent->target()->id() == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
return parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
&& id == Core::Id(AndroidPackageInstallationStep::Id)
&& parent->target()->id() == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
&& !parent->contains(AndroidPackageInstallationStep::Id);
}
BuildStep *AndroidPackageInstallationFactory::create(BuildStepList *parent, const QString &id)
BuildStep *AndroidPackageInstallationFactory::create(BuildStepList *parent, const Core::Id id)
{
Q_ASSERT(canCreate(parent, id));
return new AndroidPackageInstallationStep(parent);