diff options
| author | hjk <hjk121@nokiamail.com> | 2013-03-19 18:27:04 +0100 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-04-04 16:47:59 +0200 |
| commit | fe29d6a8a31efe4857e4cfbc876da52c179eee89 (patch) | |
| tree | 420250c0765edd8dcb58d7b707e738c81606f1c8 /src/plugins/projectexplorer/editorconfiguration.cpp | |
| parent | 52575f1c62e97efd934c394d29c636cf80250674 (diff) | |
| download | qt-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/editorconfiguration.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/editorconfiguration.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp index 482d1b834c..6273d97149 100644 --- a/src/plugins/projectexplorer/editorconfiguration.cpp +++ b/src/plugins/projectexplorer/editorconfiguration.cpp @@ -184,7 +184,7 @@ QVariantMap EditorConfiguration::toMap() const while (itCodeStyle.hasNext()) { itCodeStyle.next(); QVariantMap settingsIdMap; - settingsIdMap.insert(QLatin1String("language"), itCodeStyle.key().name()); + settingsIdMap.insert(QLatin1String("language"), itCodeStyle.key().toSetting()); QVariantMap value; itCodeStyle.value()->toMap(QString(), &value); settingsIdMap.insert(QLatin1String("value"), value); @@ -217,7 +217,7 @@ void EditorConfiguration::fromMap(const QVariantMap &map) qWarning() << "No data for code style settings list" << i << "found!"; continue; } - Core::Id languageId(settingsIdMap.value(QLatin1String("language")).toByteArray()); + Core::Id languageId = Core::Id::fromSetting(settingsIdMap.value(QLatin1String("language"))); QVariantMap value = settingsIdMap.value(QLatin1String("value")).toMap(); ICodeStylePreferences *preferences = d->m_languageCodeStylePreferences.value(languageId); if (preferences) |