1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: don't iterate over .keys()

Browse Source 
... iterate over the container itself instead. Avoids
temporary QList creation as well as the lookup cost
when actually calling value(key).

Change-Id: Icac867c30e63863cfa44a382eedd4d6df2070a59
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
This commit is contained in:
Marc Mutz 2016-01-26 19:45:58 +01:00
parent dce2612a7c
commit c9cb20c01a
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -893,12 +893,10 @@ void VcprojGenerator::init()
} }
#if 0 // Debugging #if 0 // Debugging
Q_FOREACH(QString aKey, extraCompilerSources.keys()) { for (auto it = extraCompilerSources.cbegin(), end = extraCompilerSources.cend(); it != end; ++it)
qDebug("Extracompilers for %s are (%s)", aKey.toLatin1().constData(), extraCompilerSources.value(aKey).join(", ").toLatin1().constData()); qDebug("Extracompilers for %s are (%s)", it.key().toLatin1().constData(), it.value().join(", ").toLatin1().constData());
} for (auto it = extraCompilerOutputs.cbegin(), end = extraCompilerOutputs.cend(); it != end; ++it)
Q_FOREACH(QString aKey, extraCompilerOutputs.keys()) { qDebug("Object mapping for %s is (%s)", it.key().toLatin1().constData(), it.value().join(", ").toLatin1().constData());
qDebug("Object mapping for %s is (%s)", aKey.toLatin1().constData(), extraCompilerOutputs.value(aKey).join(", ").toLatin1().constData());
}
qDebug(""); qDebug("");
#endif #endif
} }

4
qmake/library/qmakebuiltins.cpp
View File

@ -302,8 +302,8 @@ static void addJsonArray(const QJsonArray &array, const QString &keyPrefix, ProV
static void addJsonObject(const QJsonObject &object, const QString &keyPrefix, ProValueMap *map) static void addJsonObject(const QJsonObject &object, const QString &keyPrefix, ProValueMap *map)
{ {
foreach (const QString &key, object.keys()) for (auto it = object.begin(), end = object.end(); it != end; ++it)
addJsonValue(object.value(key), keyPrefix + key, map); addJsonValue(it.value(), keyPrefix + it.key(), map);
insertJsonKeyValue(keyPrefix + QLatin1String("_KEYS_"), object.keys(), map); insertJsonKeyValue(keyPrefix + QLatin1String("_KEYS_"), object.keys(), map);
} }