From 4d421acad3dc128d24e0e1ebbad1d3aa536f5f9e Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 19 Mar 2013 12:38:15 +0100 Subject: [PATCH] Kits: Avoid some of the deprecated QString uses with Core::Id Change-Id: I40f4a0ff63fd99ecb1a9d8a35f034b1a48d6de84 Reviewed-by: Tobias Hunger Reviewed-by: hjk --- src/plugins/projectexplorer/devicesupport/devicemanager.cpp | 4 ++-- src/plugins/projectexplorer/kit.cpp | 2 +- src/plugins/projectexplorer/kitmanager.cpp | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp index 31b3341698b..16be85c5748 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp @@ -181,7 +181,7 @@ QList DeviceManager::fromMap(const QVariantMap &map) const QVariantMap defaultDevsMap = map.value(QLatin1String(DefaultDevicesKey)).toMap(); for (QVariantMap::ConstIterator it = defaultDevsMap.constBegin(); it != defaultDevsMap.constEnd(); ++it) { - d->defaultDevices.insert(Core::Id(it.key()), Core::Id(it.value().toString())); + d->defaultDevices.insert(Core::Id::fromString(it.key()), Core::Id::fromSetting(it.value())); } const QVariantList deviceList = map.value(QLatin1String(DeviceListKey)).toList(); foreach (const QVariant &v, deviceList) { @@ -203,7 +203,7 @@ QVariantMap DeviceManager::toMap() const typedef QHash TypeIdHash; for (TypeIdHash::ConstIterator it = d->defaultDevices.constBegin(); it != d->defaultDevices.constEnd(); ++it) { - defaultDeviceMap.insert(it.key().toString(), it.value().toString()); + defaultDeviceMap.insert(it.key().toString(), it.value().toSetting()); } map.insert(QLatin1String(DefaultDevicesKey), defaultDeviceMap); QVariantList deviceList; diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index f5cde538769..c804728abbf 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/src/plugins/projectexplorer/kit.cpp @@ -477,7 +477,7 @@ bool Kit::fromMap(const QVariantMap &data) QVariantMap extra = data.value(QLatin1String(DATA_KEY)).toMap(); const QVariantMap::ConstIterator cend = extra.constEnd(); for (QVariantMap::ConstIterator it = extra.constBegin(); it != cend; ++it) - setValue(Id(it.key()), it.value()); + setValue(Id::fromString(it.key()), it.value()); return true; } diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp index 9dbd0d5b6d3..a54623855c6 100644 --- a/src/plugins/projectexplorer/kitmanager.cpp +++ b/src/plugins/projectexplorer/kitmanager.cpp @@ -355,11 +355,10 @@ KitManager::KitList KitManager::restoreKits(const Utils::FileName &fileName) qPrintable(fileName.toUserOutput()), i); } } - const QString defaultId = data.value(QLatin1String(KIT_DEFAULT_KEY)).toString(); - if (defaultId.isEmpty()) + const Core::Id id = Core::Id::fromSetting(data.value(QLatin1String(KIT_DEFAULT_KEY))); + if (!id.isValid()) return result; - const Core::Id id = Core::Id(defaultId); foreach (Kit *k, result.kits) { if (k->id() == id) { result.defaultKit = id;