qmltyperegistrar: Silence further static analysis warnings

Change-Id: Ib6e45a06ca5cf606281171fd1dc890f67026b79a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

2 files changed, 12 insertions, 12 deletions

diff --git a/src/qmltyperegistrar/qmltypesclassdescription.cpp b/src/qmltyperegistrar/qmltypesclassdescription.cpp
index 4e84ee43e2..ea0b70af2b 100644
--- a/src/qmltyperegistrar/qmltypesclassdescription.cpp
+++ b/src/qmltyperegistrar/qmltypesclassdescription.cpp
@@ -35,7 +35,7 @@ static void collectExtraVersions(const QJsonObject *component, const QString &ke
                                  QList<QTypeRevision> &extraVersions)
 {
     const QJsonArray &items = component->value(key).toArray();
-    for (const QJsonValue item : items) {
+    for (const QJsonValue &item : items) {
         const QJsonObject obj = item.toObject();
         const auto revision = obj.find(QLatin1String("revision"));
         if (revision != obj.end()) {
@@ -69,14 +69,14 @@ void QmlTypesClassDescription::collect(const QJsonObject *classDef,
 
     if (classDef->contains(QLatin1String("interfaces"))) {
         const QJsonArray array = classDef->value(QLatin1String("interfaces")).toArray();
-        for (const QJsonValue value : array) {
+        for (const QJsonValue &value : array) {
             auto object = value.toArray()[0].toObject();
             implementsInterfaces << object[QLatin1String("className")].toString();
         }
     }
 
     const auto classInfos = classDef->value(QLatin1String("classInfos")).toArray();
-    for (const QJsonValue classInfo : classInfos) {
+    for (const QJsonValue &classInfo : classInfos) {
         const QJsonObject obj = classInfo.toObject();
         const QString name = obj[QLatin1String("name")].toString();
         const QString value = obj[QLatin1String("value")].toString();
@@ -158,7 +158,7 @@ void QmlTypesClassDescription::collect(const QJsonObject *classDef,
             supers.append(origSuper);
     }
 
-    for (const QJsonValue superValue : qAsConst(supers)) {
+    for (const QJsonValue &superValue : qAsConst(supers)) {
         const QJsonObject superObject = superValue.toObject();
         if (superObject[QLatin1String("access")].toString() == QLatin1String("public")) {
             const QString superName = superObject[QLatin1String("name")].toString();
@@ -188,7 +188,7 @@ void QmlTypesClassDescription::collect(const QJsonObject *classDef,
 
     std::sort(revisions.begin(), revisions.end());
     const auto end = std::unique(revisions.begin(), revisions.end());
-    revisions.erase(end, revisions.end());
+    revisions.erase(QList<QTypeRevision>::const_iterator(end), revisions.constEnd());
 
     resolvedClass = classDef;
     if (className.isEmpty() && mode == TopLevel)
diff --git a/src/qmltyperegistrar/qmltypescreator.cpp b/src/qmltyperegistrar/qmltypescreator.cpp
index 2a3c10829a..62996ff90b 100644
--- a/src/qmltyperegistrar/qmltypescreator.cpp
+++ b/src/qmltyperegistrar/qmltypescreator.cpp
@@ -77,7 +77,7 @@ void QmlTypesCreator::writeClassProperties(const QmlTypesClassDescription &colle
             break;
 
         exports.append(enquote(QString::fromLatin1("%1/%2 %3.%4")
-                               .arg(m_module).arg(collector.elementName)
+                               .arg(m_module, collector.elementName)
                                .arg(revision.hasMajorVersion() ? revision.majorVersion()
                                                                : m_version.majorVersion())
                                .arg(revision.minorVersion())));
@@ -163,7 +163,7 @@ void QmlTypesCreator::writeType(const QJsonObject &property, const QString &key,
 
 void QmlTypesCreator::writeProperties(const QJsonArray &properties, QSet<QString> &notifySignals)
 {
-    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"));
@@ -186,7 +186,7 @@ void QmlTypesCreator::writeProperties(const QJsonArray &properties, QSet<QString
 void QmlTypesCreator::writeMethods(const QJsonArray &methods, const QString &type,
                                    const QSet<QString> &notifySignals)
 {
-    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())
@@ -200,7 +200,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();
@@ -215,12 +215,12 @@ void QmlTypesCreator::writeMethods(const QJsonArray &methods, const QString &typ
 
 void QmlTypesCreator::writeEnums(const QJsonArray &enums)
 {
-    for (const QJsonValue 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"));
@@ -255,7 +255,7 @@ static QJsonArray members(const QJsonObject *classDef, const QJsonObject *origCl
     QJsonArray classDefMembers;
 
     const QJsonArray candidates = classDef->value(key).toArray();
-    for (const QJsonValue member : candidates) {
+    for (const QJsonValue &member : candidates) {
         if (isAllowedInMajorVersion(member, maxMajorVersion))
             classDefMembers.append(member);
     }