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 | |
parent | 96488c9cfd16c6ef9800c678c83d271343c2a813 (diff) |
Remove SbkTypeInfo and CppObjectCopier structs, they aren't needed after the fix on qt_metacall.
Diffstat (limited to 'libshiboken')
-rw-r--r-- | libshiboken/conversions.h | 37 | ||||
-rw-r--r-- | libshiboken/typeresolver.cpp | 4 | ||||
-rw-r--r-- | libshiboken/typeresolver.h | 17 |
3 files changed, 9 insertions, 49 deletions
diff --git a/libshiboken/conversions.h b/libshiboken/conversions.h index ed7dcc017..8b312dfe1 100644 --- a/libshiboken/conversions.h +++ b/libshiboken/conversions.h @@ -69,41 +69,6 @@ template<> inline PyTypeObject* SbkType<char>() { return &PyInt_Type; } template<> inline PyTypeObject* SbkType<signed char>() { return &PyInt_Type; } template<> inline PyTypeObject* SbkType<unsigned char>() { return &PyInt_Type; } -template<typename T> -struct SbkTypeInfo { - static const bool isCppWrapper = false; -}; - -/** - * This struct template is used to copy a C++ object using the proper - * constructor, which could be the same type as used on the wrapped library - * or a C++ wrapper type provided by the binding. - */ -template <typename T, bool hasWrapper = SbkTypeInfo<T>::isCppWrapper> -struct CppObjectCopier -{ - static inline T* copy(const T& obj); -}; - -template<typename T> -struct CppObjectCopier<T, false> -{ - static inline T* copy(const T& obj) - { - return new T(obj); - } -}; - -template<typename T> -struct CppObjectCopier<T, true> -{ - static inline T* copy(const T& obj) - { - return reinterpret_cast<T*>(ObjectType::copy(reinterpret_cast<SbkObjectType*>(SbkType<T>()), &obj)); - } -}; - - /** * Convenience template to create wrappers using the proper Python type for a given C++ class instance. */ @@ -152,7 +117,7 @@ struct Converter<T*> if (PyObject_TypeCheck(pyobj, SbkType<T>())) return (T*) Object::cppPointer(reinterpret_cast<SbkObject*>(pyobj), SbkType<T>()); else if (Converter<T>::isConvertible(pyobj)) - return CppObjectCopier<T>::copy(Converter<T>::toCpp(pyobj)); + return new T(Converter<T>::toCpp(pyobj)); else if (pyobj == Py_None) return 0; diff --git a/libshiboken/typeresolver.cpp b/libshiboken/typeresolver.cpp index 3d0cb11a2..8d3ce7a96 100644 --- a/libshiboken/typeresolver.cpp +++ b/libshiboken/typeresolver.cpp @@ -97,9 +97,9 @@ const char* TypeResolver::typeName() const return m_d->typeName; } -void* TypeResolver::toCpp(PyObject* pyObj, void** place, bool alloc) +void TypeResolver::toCpp(PyObject* pyObj, void** place) { - return m_d->pythonToCpp(pyObj, place, alloc); + m_d->pythonToCpp(pyObj, place); } void TypeResolver::deleteObject(void* object) 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(); |