feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix reparent function in qmlpuppet

Browse Source 
Change-Id: I7f30f23c5f2af24f3715bae2b1f4b7be044b0da7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-04-15 15:32:06 +02:00
parent 5d3c1a2a2b
commit e7206d5b04
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp
View File

@@ -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 PropertyName &/*oldParentProperty*/,
const ServerNodeInstance &/*newParentInstance*/, const ObjectNodeInstance::Pointer &/*newParentInstance*/,
const PropertyName &/*newParentProperty*/) const PropertyName &/*newParentProperty*/)
{ {
} }

4
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h
View File

@@ -59,9 +59,9 @@ public:
virtual void resetProperty(const PropertyName &name); virtual void resetProperty(const PropertyName &name);
using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around
void reparent(const ServerNodeInstance &oldParentInstance, void reparent(const ObjectNodeInstance::Pointer &oldParentInstance,
const PropertyName &oldParentProperty, const PropertyName &oldParentProperty,
const ServerNodeInstance &newParentInstance, const ObjectNodeInstance::Pointer &newParentInstance,
const PropertyName &newParentProperty); const PropertyName &newParentProperty);
protected: protected:

4
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp
View File

@@ -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(); changesObject()->detachFromState();
ObjectNodeInstance::reparent(oldParentInstance.internalInstance(), oldParentProperty, newParentInstance.internalInstance(), newParentProperty); ObjectNodeInstance::reparent(oldParentInstance, oldParentProperty, newParentInstance, newParentProperty);
changesObject()->attachToState(); changesObject()->attachToState();
} }

2
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.h
View File

@@ -61,7 +61,7 @@ public:
virtual void resetProperty(const PropertyName &name); virtual void resetProperty(const PropertyName &name);
using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around 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: protected:
QmlPropertyChangesNodeInstance(QDeclarativePropertyChanges *object); QmlPropertyChangesNodeInstance(QDeclarativePropertyChanges *object);