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

28
src/plugins/android/androidrunfactories.cpp
View File

@@ -53,11 +53,13 @@ using namespace Qt4ProjectManager;
namespace {
QString pathFromId(const QString &id)
QString pathFromId(const Core::Id id)
{
if (!id.startsWith(ANDROID_RC_ID_PREFIX))
QString pathStr = QString::fromUtf8(id.name());
const QString prefix = QLatin1String(ANDROID_RC_ID_PREFIX);
if (!pathStr.startsWith(prefix))
return QString();
return id.mid(QString(ANDROID_RC_ID_PREFIX).size());
return pathStr.mid(prefix.size());
}
} // namespace
@@ -72,11 +74,11 @@ AndroidRunConfigurationFactory::~AndroidRunConfigurationFactory()
}
bool AndroidRunConfigurationFactory::canCreate(Target *parent,
const QString &/*id*/) const
const Core::Id/*id*/) const
{
AndroidTarget *target = qobject_cast<AndroidTarget *>(parent);
if (!target
|| target->id() != QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)) {
|| target->id() != Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)) {
return false;
}
return true;
@@ -89,8 +91,8 @@ bool AndroidRunConfigurationFactory::canRestore(Target *parent,
Q_UNUSED(map)
if (!qobject_cast<AndroidTarget *>(parent))
return false;
return ProjectExplorer::idFromMap(map)
.startsWith(QLatin1String(ANDROID_RC_ID));
QString id = QString::fromUtf8(ProjectExplorer::idFromMap(map).name());
return id.startsWith(QLatin1String(ANDROID_RC_ID));
}
bool AndroidRunConfigurationFactory::canClone(Target *parent,
@@ -99,27 +101,27 @@ bool AndroidRunConfigurationFactory::canClone(Target *parent,
return canCreate(parent, source->id());
}
QStringList AndroidRunConfigurationFactory::availableCreationIds(Target *parent) const
QList<Core::Id> AndroidRunConfigurationFactory::availableCreationIds(Target *parent) const
{
QStringList ids;
QList<Core::Id> ids;
if (AndroidTarget *t = qobject_cast<AndroidTarget *>(parent)) {
if (t->id() == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)) {
if (t->id() == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)) {
QList<Qt4ProFileNode *> nodes = t->qt4Project()->allProFiles();
foreach (Qt4ProFileNode *node, nodes)
if (node->projectType() == ApplicationTemplate || node->projectType() == LibraryTemplate)
ids << node->targetInformation().target;
ids << Core::Id(node->targetInformation().target);
}
}
return ids;
}
QString AndroidRunConfigurationFactory::displayNameForId(const QString &id) const
QString AndroidRunConfigurationFactory::displayNameForId(const Core::Id id) const
{
return QFileInfo(pathFromId(id)).completeBaseName();
}
RunConfiguration *AndroidRunConfigurationFactory::create(Target *parent,
const QString &id)
const Core::Id id)
{
if (!canCreate(parent, id))
return 0;