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

21
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -54,7 +54,7 @@ const char BUILD_DIRECTORY_KEY[] = "CMakeProjectManager.CMakeBuildConfiguration.
} // namespace
CMakeBuildConfiguration::CMakeBuildConfiguration(CMakeTarget *parent) :
BuildConfiguration(parent, QLatin1String(CMAKE_BC_ID))
BuildConfiguration(parent, Core::Id(CMAKE_BC_ID))
{
m_buildDirectory = cmakeTarget()->defaultBuildDirectory();
}
@@ -165,30 +165,30 @@ CMakeBuildConfigurationFactory::~CMakeBuildConfigurationFactory()
{
}
QStringList CMakeBuildConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
QList<Core::Id> CMakeBuildConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
{
if (!qobject_cast<CMakeTarget *>(parent))
return QStringList();
return QStringList() << QLatin1String(CMAKE_BC_ID);
return QList<Core::Id>();
return QList<Core::Id>() << Core::Id(CMAKE_BC_ID);
}
QString CMakeBuildConfigurationFactory::displayNameForId(const QString &id) const
QString CMakeBuildConfigurationFactory::displayNameForId(const Core::Id id) const
{
if (id == QLatin1String(CMAKE_BC_ID))
if (id == Core::Id(CMAKE_BC_ID))
return tr("Build");
return QString();
}
bool CMakeBuildConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const QString &id) const
bool CMakeBuildConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const Core::Id id) const
{
if (!qobject_cast<CMakeTarget *>(parent))
return false;
if (id == QLatin1String(CMAKE_BC_ID))
if (id == Core::Id(CMAKE_BC_ID))
return true;
return false;
}
CMakeBuildConfiguration *CMakeBuildConfigurationFactory::create(ProjectExplorer::Target *parent, const QString &id)
CMakeBuildConfiguration *CMakeBuildConfigurationFactory::create(ProjectExplorer::Target *parent, const Core::Id id)
{
if (!canCreate(parent, id))
return 0;
@@ -257,8 +257,7 @@ CMakeBuildConfiguration *CMakeBuildConfigurationFactory::clone(ProjectExplorer::
bool CMakeBuildConfigurationFactory::canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const
{
QString id(ProjectExplorer::idFromMap(map));
return canCreate(parent, id);
return canCreate(parent, ProjectExplorer::idFromMap(map));
}
CMakeBuildConfiguration *CMakeBuildConfigurationFactory::restore(ProjectExplorer::Target *parent, const QVariantMap &map)