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

Device: Simplify code a bit

Browse Source 
Simplify the code a bit, now that Core::Id uses utf8 conversion from/to
QString. Also make sure to not trigger warnings on invalid data.

Change-Id: Iccc523161fbcb89148a76684353e96ac875c24c7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2012-06-20 15:36:42 +02:00
parent 420fd035ab
commit 783c53fbd2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/devicesupport/idevice.cpp
View File

@@ -261,12 +261,15 @@ Core::Id IDevice::invalidId()
Core::Id IDevice::typeFromMap(const QVariantMap &map) Core::Id IDevice::typeFromMap(const QVariantMap &map)
{ {
return Core::Id(map.value(QLatin1String(TypeKey)).toByteArray().constData()); const QString idStr = map.value(QLatin1String(TypeKey)).toString();
if (idStr.isEmpty())
return Core::Id();
return Core::Id(idStr);
} }
Core::Id IDevice::idFromMap(const QVariantMap &map) Core::Id IDevice::idFromMap(const QVariantMap &map)
{ {
return Core::Id(map.value(QLatin1String(IdKey)).toByteArray().constData()); return Core::Id(map.value(QLatin1String(IdKey)).toString());
} }
void IDevice::fromMap(const QVariantMap &map) void IDevice::fromMap(const QVariantMap &map)
@@ -293,7 +296,7 @@ QVariantMap IDevice::toMap() const
{ {
QVariantMap map; QVariantMap map;
map.insert(QLatin1String(DisplayNameKey), d->displayName); map.insert(QLatin1String(DisplayNameKey), d->displayName);
map.insert(QLatin1String(TypeKey), d->type.name()); map.insert(QLatin1String(TypeKey), d->type.toString());
map.insert(QLatin1String(IdKey), d->id.name()); map.insert(QLatin1String(IdKey), d->id.name());
map.insert(QLatin1String(OriginKey), d->origin); map.insert(QLatin1String(OriginKey), d->origin);