diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index 1ab170fc1c3..fe345024182 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -230,8 +230,8 @@ void DragTool::dropEvent(const QList &itemList, QGraphicsSceneD QString effectPath; const QStringList assetPaths = QString::fromUtf8(event->mimeData() ->data(Constants::MIME_TYPE_ASSETS)).split(','); - for (auto &path : assetPaths) { - auto assetType = AssetsLibraryWidget::getAssetTypeAndData(path).first; + for (const QString &path : assetPaths) { + const QString assetType = AssetsLibraryWidget::getAssetTypeAndData(path).first; if (assetType == Constants::MIME_TYPE_ASSET_EFFECT) { effectPath = path; break; @@ -266,8 +266,7 @@ void DragTool::dropEvent(const QList &itemList, QGraphicsSceneD return; } - QmlItemNode effectNode = QmlItemNode:: - createQmlItemNodeForEffect(view(), parentQmlItemNode, effectName); + QmlItemNode::createQmlItemNodeForEffect(view(), parentQmlItemNode, effectName); view()->setSelectedModelNodes({parentQmlItemNode}); view()->resetPuppet(); diff --git a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h index ada5887621a..61c38dd5042 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h +++ b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h @@ -60,9 +60,9 @@ public: const QPointF &position, NodeAbstractProperty parentproperty, bool executeInTransaction = true); - static QmlItemNode createQmlItemNodeForEffect(AbstractView *view, - const QmlItemNode &parentNode, - const QString &effectName); + static void createQmlItemNodeForEffect(AbstractView *view, + const QmlItemNode &parentNode, + const QString &effectName); QList children() const; QList resources() const; QList allDirectSubNodes() const; diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index 7a818808158..ca2bb3c5a51 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -5,6 +5,7 @@ #include #include "nodelistproperty.h" #include "nodehints.h" +#include "nodeproperty.h" #include "variantproperty.h" #include "bindingproperty.h" #include "qmlanchors.h" @@ -161,9 +162,9 @@ static bool useLayerEffect() return settings->value(layerEffectEntry, true).toBool(); } -QmlItemNode QmlItemNode::createQmlItemNodeForEffect(AbstractView *view, - const QmlItemNode &parentNode, - const QString &effectName) +void QmlItemNode::createQmlItemNodeForEffect(AbstractView *view, + const QmlItemNode &parentNode, + const QString &effectName) { QmlItemNode newQmlItemNode; @@ -174,7 +175,7 @@ QmlItemNode QmlItemNode::createQmlItemNodeForEffect(AbstractView *view, if (!view->model()->hasImport(import, true, true)) view->model()->changeImports({import}, {}); } catch (const Exception &) { - QTC_ASSERT(false, return QmlItemNode()); + QTC_ASSERT(false, return); } TypeName type(effectName.toUtf8()); @@ -190,10 +191,6 @@ QmlItemNode QmlItemNode::createQmlItemNodeForEffect(AbstractView *view, } else { parentNode.modelNode().variantProperty("layer.enabled").setValue(true); } - - QTC_ASSERT(newQmlItemNode.isValid(), return QmlItemNode()); - - return newQmlItemNode; } bool QmlItemNode::isValid() const