summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/projectconfiguration.cpp
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2013-03-19 18:27:04 +0100
committerhjk <hjk121@nokiamail.com>2013-04-04 16:47:59 +0200
commitfe29d6a8a31efe4857e4cfbc876da52c179eee89 (patch)
tree420250c0765edd8dcb58d7b707e738c81606f1c8 /src/plugins/projectexplorer/projectconfiguration.cpp
parent52575f1c62e97efd934c394d29c636cf80250674 (diff)
downloadqt-creator-fe29d6a8a31efe4857e4cfbc876da52c179eee89.tar.gz
Core: Remove Core::Id(QByteArray) constructor
This was mostly used to disambiguate the char * and the QString constructors. Change-Id: Ib6923ef8e8c0e5d514a883e73aa001a1cd9fb534 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/projectexplorer/projectconfiguration.cpp')
-rw-r--r--src/plugins/projectexplorer/projectconfiguration.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/projectconfiguration.cpp b/src/plugins/projectexplorer/projectconfiguration.cpp
index ad317c4352..d765f6aa05 100644
--- a/src/plugins/projectexplorer/projectconfiguration.cpp
+++ b/src/plugins/projectexplorer/projectconfiguration.cpp
@@ -93,7 +93,7 @@ bool ProjectConfiguration::usesDefaultDisplayName() const
QVariantMap ProjectConfiguration::toMap() const
{
QVariantMap map;
- map.insert(QLatin1String(CONFIGURATION_ID_KEY), m_id.name());
+ map.insert(QLatin1String(CONFIGURATION_ID_KEY), m_id.toSetting());
map.insert(QLatin1String(DISPLAY_NAME_KEY), m_displayName);
map.insert(QLatin1String(DEFAULT_DISPLAY_NAME_KEY), m_defaultDisplayName);
return map;
@@ -101,7 +101,7 @@ QVariantMap ProjectConfiguration::toMap() const
bool ProjectConfiguration::fromMap(const QVariantMap &map)
{
- m_id = Core::Id(map.value(QLatin1String(CONFIGURATION_ID_KEY), QByteArray()).toByteArray());
+ m_id = Core::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY)));
m_displayName = map.value(QLatin1String(DISPLAY_NAME_KEY), QString()).toString();
m_defaultDisplayName = map.value(QLatin1String(DEFAULT_DISPLAY_NAME_KEY),
m_defaultDisplayName.isEmpty() ?