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

RunConfigurations: Avoid some direct QString use with Core::Id

Browse Source 
Change-Id: Ic67c34837f01ab478f107dc05c4fe1470dcfa36c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2013-03-19 12:35:08 +01:00
committed by Eike Ziller
parent bee3cc3d63
commit 55e45ff3e0
6 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/projectconfiguration.cpp
View File

@@ -111,7 +111,7 @@ bool ProjectConfiguration::fromMap(const QVariantMap &map)
Core::Id ProjectExplorer::idFromMap(const QVariantMap &map) Core::Id ProjectExplorer::idFromMap(const QVariantMap &map)
{ {
return Core::Id(map.value(QLatin1String(CONFIGURATION_ID_KEY), QString()).toString()); return Core::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY)));
} }
QString ProjectExplorer::displayNameFromMap(const QVariantMap &map) QString ProjectExplorer::displayNameFromMap(const QVariantMap &map)

7
src/plugins/projectexplorer/session.cpp
View File

@@ -894,12 +894,9 @@ bool SessionManager::loadSession(const QString &session)
m_future = QFutureInterface<void>(); m_future = QFutureInterface<void>();
// restore the active mode // restore the active mode
QString modeIdentifier = value(QLatin1String("ActiveMode")).toString(); Id modeId = Id::fromSetting(value(QLatin1String("ActiveMode")));
Id modeId; if (!modeId.isValid())
if (modeIdentifier.isEmpty())
modeId = Id(Core::Constants::MODE_EDIT); modeId = Id(Core::Constants::MODE_EDIT);
else
modeId = Id(modeIdentifier);
ModeManager::activateMode(modeId); ModeManager::activateMode(modeId);
ModeManager::setFocusToCurrentMode(); ModeManager::setFocusToCurrentMode();

2
src/plugins/qnx/blackberryrunconfigurationfactory.cpp
View File

@@ -69,7 +69,7 @@ QList<Core::Id> BlackBerryRunConfigurationFactory::availableCreationIds(ProjectE
QStringList proFiles = qt4Project->applicationProFilePathes(QLatin1String(Constants::QNX_BB_RUNCONFIGURATION_PREFIX)); QStringList proFiles = qt4Project->applicationProFilePathes(QLatin1String(Constants::QNX_BB_RUNCONFIGURATION_PREFIX));
foreach (const QString &pf, proFiles) foreach (const QString &pf, proFiles)
ids << Core::Id(pf); ids << Core::Id::fromString(pf);
return ids; return ids;
} }

2
src/plugins/qnx/qnxrunconfigurationfactory.cpp
View File

@@ -70,7 +70,7 @@ QList<Core::Id> QnxRunConfigurationFactory::availableCreationIds(ProjectExplorer
QStringList proFiles = qt4Project->applicationProFilePathes(QLatin1String(Constants::QNX_QNX_RUNCONFIGURATION_PREFIX)); QStringList proFiles = qt4Project->applicationProFilePathes(QLatin1String(Constants::QNX_QNX_RUNCONFIGURATION_PREFIX));
foreach (const QString &pf, proFiles) foreach (const QString &pf, proFiles)
ids << Core::Id(pf); ids << Core::Id::fromString(pf);
return ids; return ids;
} }

2
src/plugins/qt4projectmanager/externaleditors.cpp
View File

@@ -112,7 +112,7 @@ ExternalQtEditor::ExternalQtEditor(const QString &id,
QObject *parent) : QObject *parent) :
Core::IExternalEditor(parent), Core::IExternalEditor(parent),
m_mimeTypes(mimetype), m_mimeTypes(mimetype),
m_id(id), m_id(Core::Id::fromString(id)),
m_displayName(displayName) m_displayName(displayName)
{ {
} }

2
src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
View File

@@ -813,7 +813,7 @@ QList<Core::Id> Qt4RunConfigurationFactory::availableCreationIds(ProjectExplorer
Qt4Project *project = static_cast<Qt4Project *>(parent->project()); Qt4Project *project = static_cast<Qt4Project *>(parent->project());
QStringList proFiles = project->applicationProFilePathes(QLatin1String(QT4_RC_PREFIX)); QStringList proFiles = project->applicationProFilePathes(QLatin1String(QT4_RC_PREFIX));
foreach (const QString &pf, proFiles) foreach (const QString &pf, proFiles)
result << Core::Id(pf); result << Core::Id::fromString(pf);
return result; return result;
} }