diff options
author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-12-01 14:27:39 -0200 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:12:07 -0300 |
commit | 3cfac85d50b8f891a8230513a4b5a0f6aea67b3e (patch) | |
tree | 546bff5ad1910b6bdb0d54becc950a9bf8f218d1 /libshiboken/typeresolver.h | |
parent | 96488c9cfd16c6ef9800c678c83d271343c2a813 (diff) |
Remove SbkTypeInfo and CppObjectCopier structs, they aren't needed after the fix on qt_metacall.
Diffstat (limited to 'libshiboken/typeresolver.h')
-rw-r--r-- | libshiboken/typeresolver.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/libshiboken/typeresolver.h b/libshiboken/typeresolver.h index 6a3750c1b..d53d313f3 100644 --- a/libshiboken/typeresolver.h +++ b/libshiboken/typeresolver.h @@ -31,20 +31,15 @@ namespace Shiboken /* To C++ convertion functions. */ template <typename T> -inline void* pythonToValueType(PyObject* pyobj, void** data, bool alloc) +inline void pythonToValueType(PyObject* pyobj, void** data) { - if (alloc) - *data = Shiboken::CppObjectCopier<T>::copy(Shiboken::Converter<T>::toCpp(pyobj)); - - *reinterpret_cast< T*>(*data) = Shiboken::Converter<T>::toCpp(pyobj); - return *data; + *reinterpret_cast<T*>(*data) = Shiboken::Converter<T>::toCpp(pyobj); } template <typename T> -inline void* pythonToObjectType(PyObject* pyobj, void** data, bool) +inline void pythonToObjectType(PyObject* pyobj, void** data) { - *data = Shiboken::Converter<T*>::toCpp(pyobj); - return *data; + *reinterpret_cast<T**>(*data) = Shiboken::Converter<T*>::toCpp(pyobj); } template <typename T> @@ -70,7 +65,7 @@ public: }; typedef PyObject* (*CppToPythonFunc)(void*); - typedef void* (*PythonToCppFunc)(PyObject*, void**, bool); + typedef void (*PythonToCppFunc)(PyObject*, void**); typedef void (*DeleteObjectFunc)(void*); ~TypeResolver(); @@ -92,7 +87,7 @@ public: const char* typeName() const; PyObject* toPython(void* cppObj); - void* toCpp(PyObject* pyObj, void** place, bool alloc=false); + void toCpp(PyObject* pyObj, void** place); void deleteObject(void* object); PyTypeObject* pythonType(); |