From 785b184fb6e2de48a82142286a2ec958e3ad30fb Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 23 Apr 2020 13:26:05 +0200 Subject: [PATCH] QmlDesigner: Fix warnings about unused variables and functions Change-Id: Ib907db11dcdcef9cbbb91c8fd7af22ae420796b1 Reviewed-by: Thomas Hartmann --- .../editor3d/icongizmoimageprovider.cpp | 3 +++ .../componentcore/modelnodeoperations.cpp | 16 ---------------- .../components/formeditor/formeditoritem.cpp | 2 -- .../propertyeditor/propertyeditorview.cpp | 1 - 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/icongizmoimageprovider.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/icongizmoimageprovider.cpp index 2e5a2b0d0a0..cf2be48316d 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/icongizmoimageprovider.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/icongizmoimageprovider.cpp @@ -35,6 +35,9 @@ IconGizmoImageProvider::IconGizmoImageProvider() QImage IconGizmoImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize) { + Q_UNUSED(size) + Q_UNUSED(requestedSize) + // id format: : QStringList parts = id.split(':'); if (parts.size() == 2) { diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index 2c239a8aa94..91ab85dda58 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -77,22 +77,6 @@ namespace QmlDesigner { const PropertyName auxDataString("anchors_"); -static inline QList siblingsForNode(const QmlItemNode &itemNode) -{ - QList siblingList; - - if (itemNode.isValid() && itemNode.modelNode().hasParentProperty()) { - QList modelNodes = itemNode.modelNode().parentProperty().parentModelNode().directSubModelNodes(); - foreach (const ModelNode &node, modelNodes) { - QmlItemNode childItemNode = node; - if (childItemNode.isValid()) - siblingList.append(childItemNode); - } - } - - return siblingList; -} - static inline void reparentTo(const ModelNode &node, const QmlItemNode &parent) { diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp index 96a4cc5adf6..75f08df1bf1 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp @@ -591,7 +591,6 @@ void FormEditorFlowActionItem::paint(QPainter *painter, const QStyleOptionGraphi if (qmlItemNode().modelNode().hasAuxiliaryData("color")) flowColor = qmlItemNode().modelNode().auxiliaryData("color").value(); - const qreal scaleFactor = viewportTransform().m11(); qreal width = 2; if (qmlItemNode().modelNode().hasAuxiliaryData("width")) @@ -1153,7 +1152,6 @@ void FormEditorFlowDecisionItem::paint(QPainter *painter, const QStyleOptionGrap if (qmlItemNode().modelNode().hasAuxiliaryData("color")) flowColor = qmlItemNode().modelNode().auxiliaryData("color").value(); - const qreal scaleFactor = viewportTransform().m11(); qreal width = 2; if (qmlItemNode().modelNode().hasAuxiliaryData("width")) diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp index 5307bf522b3..f097f266e5c 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp @@ -212,7 +212,6 @@ void PropertyEditorView::changeValue(const QString &name) } } - bool forceReset = false; if (name == "state" && castedValue.toString() == "base state") castedValue = "";