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

8
src/plugins/projectexplorer/project.cpp
View File

@@ -216,7 +216,7 @@ void Project::setActiveTarget(Target *target)
}
}
Target *Project::target(const QString &id) const
Target *Project::target(Core::Id id) const
{
foreach (Target * target, d->m_targets) {
if (target->id() == id)
@@ -319,10 +319,10 @@ bool Project::fromMap(const QVariantMap &map)
Target *t = 0;
const QString id = idFromMap(targetMap);
Core::Id id = idFromMap(targetMap);
if (target(id)) {
qWarning("Warning: Duplicated target id found, not restoring second target with id '%s'. Continuing.",
qPrintable(id));
qPrintable(id.name()));
} else {
foreach (ITargetFactory *factory, factories) {
if (factory->canRestore(this, targetMap)) {
@@ -332,7 +332,7 @@ bool Project::fromMap(const QVariantMap &map)
}
if (!t) {
qWarning("Warning: Unable to restore target '%s'. Continuing.", qPrintable(id));
qWarning("Warning: Unable to restore target '%s'. Continuing.", qPrintable(id.name()));
continue;
}
addTarget(t);