diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp index 2a864bd20ea..80f4b2126fe 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp @@ -103,12 +103,9 @@ void GraphicalNodeInstance::createEffectItem(bool createEffectItem) s_createEffectItem = createEffectItem; } -void GraphicalNodeInstance::updateDirtyNodeRecursive() +void GraphicalNodeInstance::updateAllDirtyNodesRecursive() { - foreach (QQuickItem *childItem, quickItem()->childItems()) - updateDirtyNodeRecursive(childItem); - - DesignerSupport::updateDirtyNode(quickItem()); + updateAllDirtyNodesRecursive(quickItem()); } GraphicalNodeInstance::~GraphicalNodeInstance() @@ -117,27 +114,27 @@ GraphicalNodeInstance::~GraphicalNodeInstance() designerSupport()->derefFromEffectItem(quickItem()); } -void GraphicalNodeInstance::updateDirtyNodeRecursive(QQuickItem *parentItem) const +void GraphicalNodeInstance::updateDirtyNodesRecursive(QQuickItem *parentItem) const { foreach (QQuickItem *childItem, parentItem->childItems()) { if (!nodeInstanceServer()->hasInstanceForObject(childItem)) - updateDirtyNodeRecursive(childItem); + updateDirtyNodesRecursive(childItem); } DesignerSupport::updateDirtyNode(parentItem); } -void GraphicalNodeInstance::updateAllDirtyNodeRecursive(QQuickItem *parentItem) const +void GraphicalNodeInstance::updateAllDirtyNodesRecursive(QQuickItem *parentItem) const { foreach (QQuickItem *childItem, parentItem->childItems()) - updateDirtyNodeRecursive(childItem); + updateAllDirtyNodesRecursive(childItem); DesignerSupport::updateDirtyNode(parentItem); } QImage GraphicalNodeInstance::renderImage() const { - updateDirtyNodeRecursive(quickItem()); + updateDirtyNodesRecursive(quickItem()); QRectF renderBoundingRect = boundingRect(); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.h index 06ff5d28a49..d9996cb7377 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.h @@ -40,7 +40,7 @@ public: QList childItems() const; - void updateDirtyNodeRecursive(); + void updateAllDirtyNodesRecursive(); static void createEffectItem(bool createEffectItem); int penWidth() const; @@ -64,8 +64,8 @@ protected: void setHasContent(bool hasContent); DesignerSupport *designerSupport() const; Qt5NodeInstanceServer *qt5NodeInstanceServer() const; - void updateDirtyNodeRecursive(QQuickItem *parentItem) const; - void updateAllDirtyNodeRecursive(QQuickItem *parentItem) const; + void updateDirtyNodesRecursive(QQuickItem *parentItem) const; + void updateAllDirtyNodesRecursive(QQuickItem *parentItem) const; QRectF boundingRectWithStepChilds(QQuickItem *parentItem) const; void resetHorizontal(); void resetVertical(); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp index 262ca4fc2d7..3c21908da9f 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp @@ -459,7 +459,7 @@ QVariant ObjectNodeInstance::fixResourcePaths(const QVariant &value) return value; } -void ObjectNodeInstance::updateDirtyNodeRecursive() +void ObjectNodeInstance::updateAllDirtyNodesRecursive() { } diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h index 7576640d216..a6db1584d01 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h @@ -186,7 +186,7 @@ public: static QVariant fixResourcePaths(const QVariant &value); - virtual void updateDirtyNodeRecursive(); + virtual void updateAllDirtyNodesRecursive(); protected: explicit ObjectNodeInstance(QObject *object); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp index a40019c5794..548f371ac81 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp @@ -158,7 +158,7 @@ bool ServerNodeInstance::holdsGraphical() const void ServerNodeInstance::updateDirtyNodeRecursive() { - m_nodeInstance->updateDirtyNodeRecursive(); + m_nodeInstance->updateAllDirtyNodesRecursive(); } bool ServerNodeInstance::isSubclassOf(const QString &superTypeName) const