Adds support for void pointer conversions.

A new converter specialization was added to deal with 'void*'
conversions. In the case of C++ generating a unknown void pointer
a BaseWrapper is used to hold the said pointer.
There is a new test for this situation.

Reviewed by Renato Araújo <renato.filho@openbossa.org>

5 files changed, 110 insertions, 0 deletions

diff --git a/tests/libsample/voidholder.h b/tests/libsample/voidholder.h
new file mode 100644
index 000000000..02c446d02
--- /dev/null
+++ b/tests/libsample/voidholder.h
@@ -0,0 +1,56 @@
+/*
+ * This file is part of the Shiboken Python Binding Generator project.
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation. Please
+ * review the following information to ensure the GNU Lesser General
+ * Public License version 2.1 requirements will be met:
+ * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ *
+ * As a special exception to the GNU Lesser General Public License
+ * version 2.1, the object code form of a "work that uses the Library"
+ * may incorporate material from a header file that is part of the
+ * Library.  You may distribute such object code under terms of your
+ * choice, provided that the incorporated material (i) does not exceed
+ * more than 5% of the total size of the Library; and (ii) is limited to
+ * numerical parameters, data structure layouts, accessors, macros,
+ * inline functions and templates.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef VOIDHOLDER_H
+#define VOIDHOLDER_H
+
+#include "libsamplemacros.h"
+
+class LIBSAMPLE_API VoidHolder
+{
+public:
+    explicit VoidHolder(void* ptr = 0) : m_ptr(ptr) {}
+    ~VoidHolder() {}
+    void* voidPointer() { return m_ptr; }
+    static void* gimmeMeSomeVoidPointer()
+    {
+        static void* pointerToSomething = new VoidHolder();
+        return pointerToSomething;
+    }
+private:
+    void* m_ptr;
+};
+
+#endif // VOIDHOLDER_H
+
diff --git a/tests/samplebinding/CMakeLists.txt b/tests/samplebinding/CMakeLists.txt
index 59996a555..de24c02fe 100644
--- a/tests/samplebinding/CMakeLists.txt
+++ b/tests/samplebinding/CMakeLists.txt
@@ -61,6 +61,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/sample/time_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/virtualdaughter_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/virtualdtor_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/virtualmethods_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/sample/voidholder_wrapper.cpp
 )
 
 find_program(GENERATOR generatorrunner REQUIRED)
diff --git a/tests/samplebinding/global.h b/tests/samplebinding/global.h
index ab46ca074..b11098631 100644
--- a/tests/samplebinding/global.h
+++ b/tests/samplebinding/global.h
@@ -32,4 +32,5 @@
 #include "strlist.h"
 #include "sometime.h"
 #include "virtualmethods.h"
+#include "voidholder.h"
 
diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index 828ec9f69..a19eb6194 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -818,6 +818,8 @@
         </modify-function>
     </value-type>
 
+    <value-type name="VoidHolder"/>
+
     <object-type name="PrivateDtor" />
 
     <object-type name="Base1"/>
diff --git a/tests/samplebinding/voidholder_test.py b/tests/samplebinding/voidholder_test.py
new file mode 100755
index 000000000..8d08d1fdf
--- /dev/null
+++ b/tests/samplebinding/voidholder_test.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# This file is part of the Shiboken Python Bindings Generator project.
+#
+# Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+#
+# Contact: PySide team <contact@pyside.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# version 2.1 as published by the Free Software Foundation. Please
+# review the following information to ensure the GNU Lesser General
+# Public License version 2.1 requirements will be met:
+# http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+# #
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+'''Test case for a class that holds a void pointer.'''
+
+import unittest
+
+from sample import VoidHolder, Point
+
+class VoidHolderTest(unittest.TestCase):
+    '''Test case for void pointer manipulation.'''
+
+    def testGetVoidPointerFromCppAndPutsOnVoidHolder(self):
+        '''Passes a void pointer created in C++ and to kept by VoidHolder.'''
+        voidptr = VoidHolder.gimmeMeSomeVoidPointer()
+        voidholder = VoidHolder(voidptr)
+        self.assertEquals(voidptr, voidholder.voidPointer())
+
+    def testPutRandomObjectInsideVoidHolder(self):
+        '''Passes a C++ pointer for an object created in Python to be kept VoidHolder.'''
+        obj = Point(1, 2)
+        voidholder = VoidHolder(obj)
+        self.assertEquals(obj, voidholder.voidPointer())
+
+if __name__ == '__main__':
+    unittest.main()
+