aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2020-02-28 00:11:07 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2020-03-02 12:52:16 +0000
commit971cd8c44ffe1623d2129931ed88471432064b01 (patch)
treebb34ff81c012b6b85ad56abcd9c5c8bc1f293eac /src/lib
parentc36a805b831f463f13461c75cb704876ffbe8fc2 (diff)
Use std::vector for the probeBindings in ModuleLoader::resolveProbe()
Change-Id: Idaaed904006e421a015eefab6daf2b1b392b2ad4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/corelib/language/moduleloader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 47b0944ec..74c14781a 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -3584,7 +3584,7 @@ void ModuleLoader::resolveProbe(ProductContext *productContext, Item *parent, It
if (Q_UNLIKELY(configureScript->sourceCode() == StringConstants::undefinedValue()))
throw ErrorInfo(Tr::tr("Probe.configure must be set."), probe->location());
using ProbeProperty = std::pair<QString, QScriptValue>;
- QList<ProbeProperty> probeBindings;
+ std::vector<ProbeProperty> probeBindings;
QVariantMap initialProperties;
for (Item *obj = probe; obj; obj = obj->prototype()) {
const Item::PropertyMap &props = obj->properties();
@@ -3593,7 +3593,7 @@ void ModuleLoader::resolveProbe(ProductContext *productContext, Item *parent, It
if (name == StringConstants::configureProperty())
continue;
const QScriptValue value = m_evaluator->value(probe, name);
- probeBindings += ProbeProperty(name, value);
+ probeBindings << ProbeProperty(name, value);
if (name != StringConstants::conditionProperty())
initialProperties.insert(name, value.toVariant());
}
@@ -3632,7 +3632,7 @@ void ModuleLoader::resolveProbe(ProductContext *productContext, Item *parent, It
engine->currentContext()->pushScope(fileCtxScopes.fileScope);
engine->currentContext()->pushScope(fileCtxScopes.importScope);
configureScope = engine->newObject();
- for (const ProbeProperty &b : qAsConst(probeBindings))
+ for (const ProbeProperty &b : probeBindings)
configureScope.setProperty(b.first, b.second);
engine->currentContext()->pushScope(configureScope);
engine->clearRequestedProperties();
@@ -3648,7 +3648,7 @@ void ModuleLoader::resolveProbe(ProductContext *productContext, Item *parent, It
importedFilesUsedInConfigure = resolvedProbe->importedFilesUsed();
}
QVariantMap properties;
- for (const ProbeProperty &b : qAsConst(probeBindings)) {
+ for (const ProbeProperty &b : probeBindings) {
QVariant newValue;
if (resolvedProbe) {
newValue = resolvedProbe->properties().value(b.first);