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

Kits: Avoid some of the deprecated QString uses with Core::Id

Browse Source 
Change-Id: I40f4a0ff63fd99ecb1a9d8a35f034b1a48d6de84
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2013-03-19 12:38:15 +01:00
parent 2d177eb721
commit 4d421acad3
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/devicesupport/devicemanager.cpp
View File

@@ -181,7 +181,7 @@ QList<IDevice::Ptr> 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<Core::Id, Core::Id> 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;

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

@@ -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;
}

5
src/plugins/projectexplorer/kitmanager.cpp
View File

@@ -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;