diff options
author | David Skoland <davidskoland@gmail.com> | 2020-10-28 13:25:38 +0100 |
---|---|---|
committer | David Skoland <david.skoland@qt.io> | 2020-10-28 14:44:47 +0100 |
commit | 27bd9cab73a1e7e3d66e6025ace8510f932c5df8 (patch) | |
tree | 4c92072c9a15d681d1c6cdca97f35db88ca7dae2 /src/qmltyperegistrar/qmltypescreator.cpp | |
parent | 535adf8d9f6d26d4e9598a9276f23f938fcc7753 (diff) |
Standardize QJsonArray iteration
When using refs as loop variables, the clang compiler complains (with
default settings). This prevents that. Note that QJsonValueRef is used
"behind the scenes", which makes this iteration method correct.
Change-Id: I5a5f58ca8ad3887bce2009231cbae5a57c107697
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/qmltyperegistrar/qmltypescreator.cpp')
-rw-r--r-- | src/qmltyperegistrar/qmltypescreator.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qmltyperegistrar/qmltypescreator.cpp b/src/qmltyperegistrar/qmltypescreator.cpp index 3d8906732f..50980685e9 100644 --- a/src/qmltyperegistrar/qmltypescreator.cpp +++ b/src/qmltyperegistrar/qmltypescreator.cpp @@ -150,7 +150,7 @@ void QmlTypesCreator::writeType(const QJsonObject &property, const QString &key, void QmlTypesCreator::writeProperties(const QJsonArray &properties, QSet<QString> ¬ifySignals) { - for (const QJsonValue &property : properties) { + for (const QJsonValue property : properties) { const QJsonObject obj = property.toObject(); const QString name = obj[QLatin1String("name")].toString(); m_qml.writeStartObject(QLatin1String("Property")); @@ -173,7 +173,7 @@ void QmlTypesCreator::writeProperties(const QJsonArray &properties, QSet<QString void QmlTypesCreator::writeMethods(const QJsonArray &methods, const QString &type, const QSet<QString> ¬ifySignals) { - for (const QJsonValue &method : methods) { + for (const QJsonValue method : methods) { const QJsonObject obj = method.toObject(); const QString name = obj[QLatin1String("name")].toString(); if (name.isEmpty()) @@ -187,7 +187,7 @@ void QmlTypesCreator::writeMethods(const QJsonArray &methods, const QString &typ if (revision != obj.end()) m_qml.writeScriptBinding(QLatin1String("revision"), QString::number(revision.value().toInt())); writeType(obj, QLatin1String("returnType"), false, false); - for (const QJsonValue &argument : arguments) { + for (const QJsonValue argument : arguments) { const QJsonObject obj = argument.toObject(); m_qml.writeStartObject(QLatin1String("Parameter")); const QString name = obj[QLatin1String("name")].toString(); @@ -202,12 +202,12 @@ void QmlTypesCreator::writeMethods(const QJsonArray &methods, const QString &typ void QmlTypesCreator::writeEnums(const QJsonArray &enums) { - for (const auto &item : enums) { + for (const QJsonValue item : enums) { const QJsonObject obj = item.toObject(); const QJsonArray values = obj.value(QLatin1String("values")).toArray(); QStringList valueList; - for (const QJsonValue &value : values) + for (const QJsonValue value : values) valueList.append(enquote(value.toString())); m_qml.writeStartObject(QLatin1String("Enum")); @@ -242,14 +242,14 @@ static QJsonArray members(const QJsonObject *classDef, const QJsonObject *origCl QJsonArray classDefMembers; const QJsonArray candidates = classDef->value(key).toArray(); - for (const auto &member : candidates) { + for (const QJsonValue member : candidates) { if (isAllowedInMajorVersion(member, maxMajorVersion)) classDefMembers.append(member); } if (classDef != origClassDef) { const QJsonArray origClassDefMembers = origClassDef->value(key).toArray(); - for (const auto &member : origClassDefMembers) { + for (const QJsonValue member : origClassDefMembers) { if (isAllowedInMajorVersion(member, maxMajorVersion)) classDefMembers.append(member); } @@ -315,7 +315,7 @@ void QmlTypesCreator::writeComponents() // Hide deleteLater() methods QJsonArray componentMethods = members(classDef, &component, methodsKey, m_version); const QJsonArray componentSlots = members(classDef, &component, slotsKey, m_version); - for (const QJsonValue &componentSlot : componentSlots) + for (const QJsonValue componentSlot : componentSlots) componentMethods.append(componentSlot); for (auto it = componentMethods.begin(); it != componentMethods.end();) { if (it->toObject().value(nameKey).toString() == deleteLaterName) |