From e7206d5b04b14ddb3a17be288f483d603c7f3fa9 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 15 Apr 2013 15:32:06 +0200 Subject: [PATCH] QmlDesigner: Fix reparent function in qmlpuppet Change-Id: I7f30f23c5f2af24f3715bae2b1f4b7be044b0da7 Reviewed-by: Thomas Hartmann --- .../qmlpuppet/instances/anchorchangesnodeinstance.cpp | 4 ++-- .../qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h | 4 ++-- .../qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp | 4 ++-- .../qmlpuppet/instances/qmlpropertychangesnodeinstance.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp index 2a7f17c7151..8beab695d56 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp @@ -67,9 +67,9 @@ void AnchorChangesNodeInstance::resetProperty(const PropertyName &/*name*/) } -void AnchorChangesNodeInstance::reparent(const ServerNodeInstance &/*oldParentInstance*/, +void AnchorChangesNodeInstance::reparent(const ObjectNodeInstance::Pointer &/*oldParentInstance*/, const PropertyName &/*oldParentProperty*/, - const ServerNodeInstance &/*newParentInstance*/, + const ObjectNodeInstance::Pointer &/*newParentInstance*/, const PropertyName &/*newParentProperty*/) { } diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h index d1418a976d6..cbebcdf1c52 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h @@ -59,9 +59,9 @@ public: virtual void resetProperty(const PropertyName &name); using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around - void reparent(const ServerNodeInstance &oldParentInstance, + void reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, - const ServerNodeInstance &newParentInstance, + const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty); protected: diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp index 41c11b92c12..d262b404ce3 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp @@ -99,11 +99,11 @@ void QmlPropertyChangesNodeInstance::resetProperty(const PropertyName &name) } -void QmlPropertyChangesNodeInstance::reparent(const ServerNodeInstance &oldParentInstance, const PropertyName &oldParentProperty, const ServerNodeInstance &newParentInstance, const PropertyName &newParentProperty) +void QmlPropertyChangesNodeInstance::reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty) { changesObject()->detachFromState(); - ObjectNodeInstance::reparent(oldParentInstance.internalInstance(), oldParentProperty, newParentInstance.internalInstance(), newParentProperty); + ObjectNodeInstance::reparent(oldParentInstance, oldParentProperty, newParentInstance, newParentProperty); changesObject()->attachToState(); } diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.h index f0229f008f9..a7b12744604 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.h @@ -61,7 +61,7 @@ public: virtual void resetProperty(const PropertyName &name); using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around - void reparent(const ServerNodeInstance &oldParentInstance, const PropertyName &oldParentProperty, const ServerNodeInstance &newParentInstance, const PropertyName &newParentProperty); + void reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty); protected: QmlPropertyChangesNodeInstance(QDeclarativePropertyChanges *object);