Added method to take care of the details of ownership transfer to C++.

Simple ownership transference, i.e. without parenting, is now performed
by the new BindingManager::transferOwnershipToCpp method. It remove the
parent of the transfered object and proceeds transfer or invalidation
if needed. The generated code for simple ownership transfer from Python
to C++ now reflects this change.

Fixed the method BlackBox::keepObjectType that steals an ObjectType
ownership to C++ to remove it from its parent also. The BlackBox
class does not take care of the stolen object as a proper parent
would, but its destructor deletes the object, so the "unparenting"
is needed to avoid freeing the same memory twice.

Created an unit test that adds children to a parent ObjectType and then
steal the children to C++ with BlackBox.keepObjectType.

Reviewed by Hugo Lima <hugo.lima@openbossa.org>

2 files changed, 19 insertions, 0 deletions

diff --git a/libshiboken/bindingmanager.cpp b/libshiboken/bindingmanager.cpp
index 3610e2907..8c8be3e46 100644
--- a/libshiboken/bindingmanager.cpp
+++ b/libshiboken/bindingmanager.cpp
@@ -153,5 +153,16 @@ void BindingManager::invalidateWrapper(const void* cptr)
         invalidateWrapper(iter->second);
 }
 
+void BindingManager::transferOwnershipToCpp(PyBaseWrapper* wrapper)
+{
+    if (wrapper->parentInfo)
+        Shiboken::removeParent(wrapper);
+
+    if (PyBaseWrapper_containsCppWrapper(wrapper))
+        PyBaseWrapper_setOwnership(wrapper, false);
+    else
+        invalidateWrapper(wrapper);
+}
+
 } // namespace Shiboken
 
diff --git a/libshiboken/bindingmanager.h b/libshiboken/bindingmanager.h
index fe5767d32..602066f91 100644
--- a/libshiboken/bindingmanager.h
+++ b/libshiboken/bindingmanager.h
@@ -64,6 +64,14 @@ public:
     /// Convenience method to invalidate the Python wrapper for a C++ wrapped object. Do nothing if C++ pointer has no Python wrapper.
     void invalidateWrapper(const void* cptr);
 
+    /// Transfers the ownership of a Python wrapper to C++.
+    void transferOwnershipToCpp(PyBaseWrapper* wrapper);
+    /// Convenience method to call transferOwnershipToCpp with a properly cast PyBaseWrapper.
+    inline void transferOwnershipToCpp(PyObject* wrapper)
+    {
+        transferOwnershipToCpp(reinterpret_cast<PyBaseWrapper*>(wrapper));
+    }
+
 private:
     ~BindingManager();
     // disable copy