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

Fix Krazy warnings about values or keys iteration in project management.

Browse Source 
Change-Id: I70674ac326f508b53f50b4dbbc5e051dbdd9017d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Friedemann Kleint
2013-03-14 14:14:48 +01:00
parent 0fcbbbd4ee
commit fff7c62b8a
9 changed files with 55 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,6 +378,8 @@ bool Kit::isEqual(const Kit *other) const
QVariantMap Kit::toMap() const
{
typedef QHash<Core::Id, QVariant>::ConstIterator IdVariantConstIt;
QVariantMap data;
data.insert(QLatin1String(ID_KEY), QString::fromLatin1(d->m_id.name()));
data.insert(QLatin1String(DISPLAYNAME_KEY), d->m_displayName);
@@ -386,8 +388,10 @@ QVariantMap Kit::toMap() const
data.insert(QLatin1String(ICON_KEY), d->m_iconPath);
QVariantMap extra;
foreach (const Id key, d->m_data.keys())
extra.insert(QString::fromLatin1(key.name().constData()), d->m_data.value(key));
const IdVariantConstIt cend = d->m_data.constEnd();
for (IdVariantConstIt it = d->m_data.constBegin(); it != cend; ++it)
extra.insert(QString::fromLatin1(it.key().name().constData()), it.value());
data.insert(QLatin1String(DATA_KEY), extra);
return data;
@@ -471,8 +475,9 @@ bool Kit::fromMap(const QVariantMap &data)
setIconPath(data.value(QLatin1String(ICON_KEY)).toString());
QVariantMap extra = data.value(QLatin1String(DATA_KEY)).toMap();
foreach (const QString &key, extra.keys())
setValue(Id(key), extra.value(key));
const QVariantMap::ConstIterator cend = extra.constEnd();
for (QVariantMap::ConstIterator it = extra.constBegin(); it != cend; ++it)
setValue(Id(it.key()), it.value());
return true;
}