diff options
author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-12-01 18:05:33 -0200 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:12:08 -0300 |
commit | 766a0b55bff35c10463c4601f087d550fd0d9837 (patch) | |
tree | 70f7a255e2781012277e38bd93254991d94eb27b /libshiboken/typeresolver.h | |
parent | 3cfac85d50b8f891a8230513a4b5a0f6aea67b3e (diff) |
Removed useless stuff from TypeResolver.
Diffstat (limited to 'libshiboken/typeresolver.h')
-rw-r--r-- | libshiboken/typeresolver.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libshiboken/typeresolver.h b/libshiboken/typeresolver.h index d53d313f3..cdd379bc3 100644 --- a/libshiboken/typeresolver.h +++ b/libshiboken/typeresolver.h @@ -66,40 +66,38 @@ public: typedef PyObject* (*CppToPythonFunc)(void*); typedef void (*PythonToCppFunc)(PyObject*, void**); - typedef void (*DeleteObjectFunc)(void*); ~TypeResolver(); template<typename T> static TypeResolver* createValueTypeResolver(const char* typeName) { - return new TypeResolver(typeName, &Shiboken::Converter<T>::toPython, &pythonToValueType<T>, SbkType<T>(), &callCppDestructor<T>); + return createTypeResolver(typeName, &Shiboken::Converter<T>::toPython, &pythonToValueType<T>, SbkType<T>()); } template<typename T> static TypeResolver* createObjectTypeResolver(const char* typeName) { - return new TypeResolver(typeName, &objectTypeToPython<T>, &pythonToObjectType<T>, SbkType<T>()); + return createTypeResolver(typeName, &objectTypeToPython<T>, &pythonToObjectType<T>, SbkType<T>()); } static Type getType(const char* name); static TypeResolver* get(const char* typeName); - const char* typeName() const; PyObject* toPython(void* cppObj); void toCpp(PyObject* pyObj, void** place); - void deleteObject(void* object); PyTypeObject* pythonType(); private: struct TypeResolverPrivate; TypeResolverPrivate* m_d; + TypeResolver(); // disable object copy TypeResolver(const TypeResolver&); TypeResolver& operator=(const TypeResolver&); - TypeResolver(const char* typeName, CppToPythonFunc cppToPy, PythonToCppFunc pyToCpp, PyTypeObject* pyType, DeleteObjectFunc deleter = 0); + static TypeResolver* createTypeResolver(const char* typeName, CppToPythonFunc cppToPy, PythonToCppFunc pyToCpp, PyTypeObject* pyType); }; } |