From 6530a4fdc70575bb02cfebd14bd14c5832865fba Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 6 Aug 2021 17:23:33 +0200 Subject: [PATCH] Fix some compiler warnings Change-Id: I4eaf47bda086b83618f461ab19d1715c67e27ae1 Reviewed-by: Qt CI Bot Reviewed-by: Christian Stenger --- .../qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp | 4 ++-- src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp | 4 ++-- src/plugins/qmljseditor/qmljscomponentnamedialog.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp index dd08ccbe908..e191d6468e1 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp @@ -727,7 +727,7 @@ static bool isTypeAvailable(const MockupTypeContainer &mockupType, QQmlEngine *e void NodeInstanceServer::setupMockupTypes(const QVector &container) { for (const MockupTypeContainer &mockupType : container) { - if (!isTypeAvailable(mockupType, engine())) + if (!isTypeAvailable(mockupType, engine())) { #if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) if (mockupType.majorVersion() == -1 && mockupType.minorVersion() == -1) { QQuickDesignerSupportMetaInfo::registerMockupObject(mockupType.importUri().toUtf8(), @@ -748,7 +748,7 @@ void NodeInstanceServer::setupMockupTypes(const QVector &co mockupType.minorVersion(), mockupType.typeName()); #endif - + } } } diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index 4c329352b92..7dc831caf19 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -668,7 +668,7 @@ bool QmlFlowItemNode::isValidQmlFlowItemNode(const ModelNode &modelNode) QList QmlFlowItemNode::flowActionAreas() const { QList list; - for (const ModelNode &node : allDirectSubModelNodes()) + for (const ModelNode node : allDirectSubModelNodes()) if (QmlFlowActionAreaNode::isValidQmlFlowActionAreaNode(node)) list.append(node); return list; @@ -751,7 +751,7 @@ bool QmlFlowViewNode::isValidQmlFlowViewNode(const ModelNode &modelNode) QList QmlFlowViewNode::flowItems() const { QList list; - for (const ModelNode &node : allDirectSubModelNodes()) + for (const ModelNode node : allDirectSubModelNodes()) if (QmlFlowItemNode::isValidQmlFlowItemNode(node) || QmlVisualNode::isFlowDecision(node) || QmlVisualNode::isFlowWildcard(node)) diff --git a/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp b/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp index 55e374676ea..d70f7841c9e 100644 --- a/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp +++ b/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp @@ -168,7 +168,7 @@ QString ComponentNameDialog::isValid() const if (!ui->pathEdit->isValid()) return tr("Invalid path."); - if (QDir(ui->pathEdit->path()).exists(compName + u".qml")) + if (QDir(ui->pathEdit->path()).exists(compName + ".qml")) return tr("Component already exists."); return QString();