Rename SbkBaseType back to SbkObjectType.

1 files changed, 25 insertions, 25 deletions

diff --git a/libshiboken/basewrapper.h b/libshiboken/basewrapper.h
index aa1301dff..80207e251 100644
--- a/libshiboken/basewrapper.h
+++ b/libshiboken/basewrapper.h
@@ -51,7 +51,7 @@ struct LIBSHIBOKEN_API SbkObject
 LIBSHIBOKEN_API void SbkDeallocWrapper(PyObject* pyObj);
 LIBSHIBOKEN_API void SbkDeallocWrapperWithPrivateDtor(PyObject* self);
 
-struct SbkBaseType;
+struct SbkObjectType;
 
 /// Function signature for the multiple inheritance information initializers that should be provided by classes with multiple inheritance.
 typedef int* (*MultipleInheritanceInitFunction)(const void*);
@@ -61,9 +61,9 @@ typedef int* (*MultipleInheritanceInitFunction)(const void*);
  *   part of a multiple inheritance hierarchy.
  *   The implementation of this function is auto generated by the generator and you don't need to care about it.
  */
-typedef void* (*SpecialCastFunction)(void*, SbkBaseType*);
+typedef void* (*SpecialCastFunction)(void*, SbkObjectType*);
 typedef void* (*ObjectCopierFunction)(const void*);
-typedef SbkBaseType* (*TypeDiscoveryFunc)(void*, SbkBaseType*);
+typedef SbkObjectType* (*TypeDiscoveryFunc)(void*, SbkObjectType*);
 
 typedef void* (*ExtendedToCppFunc)(PyObject*);
 typedef bool (*ExtendedIsConvertibleFunc)(PyObject*);
@@ -74,12 +74,12 @@ typedef void (*DeleteUserDataFunc)(void*);
 typedef void (*ObjectDestructor)(void*);
 
 extern LIBSHIBOKEN_API PyTypeObject SbkBaseType_Type;
-extern LIBSHIBOKEN_API SbkBaseType SbkObject_Type;
+extern LIBSHIBOKEN_API SbkObjectType SbkObject_Type;
 
 
 struct SbkBaseTypePrivate;
 /// PyTypeObject extended with C++ multiple inheritance information.
-struct LIBSHIBOKEN_API SbkBaseType
+struct LIBSHIBOKEN_API SbkObjectType
 {
     PyHeapTypeObject super;
     SbkBaseTypePrivate* d;
@@ -129,32 +129,32 @@ LIBSHIBOKEN_API bool        canCallConstructor(PyTypeObject* myType, PyTypeObjec
 /**
  * Call copy function for the object type
  **/
-LIBSHIBOKEN_API void*       copy(SbkBaseType* self, const void *obj);
-LIBSHIBOKEN_API void        setCopyFunction(SbkBaseType* self, ObjectCopierFunction func);
+LIBSHIBOKEN_API void*       copy(SbkObjectType* self, const void *obj);
+LIBSHIBOKEN_API void        setCopyFunction(SbkObjectType* self, ObjectCopierFunction func);
 
-LIBSHIBOKEN_API void        setExternalCppConversionFunction(SbkBaseType* self, ExtendedToCppFunc func);
-LIBSHIBOKEN_API void        setExternalIsConvertibleFunction(SbkBaseType* self, ExtendedIsConvertibleFunc func);
-LIBSHIBOKEN_API bool        hasExternalCppConversions(SbkBaseType* self);
-LIBSHIBOKEN_API bool        isExternalConvertible(SbkBaseType* self, PyObject* obj);
-LIBSHIBOKEN_API void*       callExternalCppConversion(SbkBaseType* self, PyObject* obj);
+LIBSHIBOKEN_API void        setExternalCppConversionFunction(SbkObjectType* self, ExtendedToCppFunc func);
+LIBSHIBOKEN_API void        setExternalIsConvertibleFunction(SbkObjectType* self, ExtendedIsConvertibleFunc func);
+LIBSHIBOKEN_API bool        hasExternalCppConversions(SbkObjectType* self);
+LIBSHIBOKEN_API bool        isExternalConvertible(SbkObjectType* self, PyObject* obj);
+LIBSHIBOKEN_API void*       callExternalCppConversion(SbkObjectType* self, PyObject* obj);
 
-LIBSHIBOKEN_API bool        hasCast(SbkBaseType* self);
-LIBSHIBOKEN_API void*       cast(SbkBaseType* self, SbkObject* obj, PyTypeObject* target);
-LIBSHIBOKEN_API void        setCastFunction(SbkBaseType* self, SpecialCastFunction func);
+LIBSHIBOKEN_API bool        hasCast(SbkObjectType* self);
+LIBSHIBOKEN_API void*       cast(SbkObjectType* self, SbkObject* obj, PyTypeObject* target);
+LIBSHIBOKEN_API void        setCastFunction(SbkObjectType* self, SpecialCastFunction func);
 
-LIBSHIBOKEN_API void        setOriginalName(SbkBaseType* self, const char* name);
-LIBSHIBOKEN_API const char* getOriginalName(SbkBaseType* self);
+LIBSHIBOKEN_API void        setOriginalName(SbkObjectType* self, const char* name);
+LIBSHIBOKEN_API const char* getOriginalName(SbkObjectType* self);
 
-LIBSHIBOKEN_API void        setTypeDiscoveryFunction(SbkBaseType* self, TypeDiscoveryFunc func);
-LIBSHIBOKEN_API TypeDiscoveryFunc getTypeDiscoveryFunction(SbkBaseType* self);
+LIBSHIBOKEN_API void        setTypeDiscoveryFunction(SbkObjectType* self, TypeDiscoveryFunc func);
+LIBSHIBOKEN_API TypeDiscoveryFunc getTypeDiscoveryFunction(SbkObjectType* self);
 
-LIBSHIBOKEN_API void        copyMultimpleheritance(SbkBaseType* self, SbkBaseType* other);
-LIBSHIBOKEN_API void        setMultipleIheritanceFunction(SbkBaseType* self, MultipleInheritanceInitFunction func);
-LIBSHIBOKEN_API MultipleInheritanceInitFunction getMultipleIheritanceFunction(SbkBaseType* self);
+LIBSHIBOKEN_API void        copyMultimpleheritance(SbkObjectType* self, SbkObjectType* other);
+LIBSHIBOKEN_API void        setMultipleIheritanceFunction(SbkObjectType* self, MultipleInheritanceInitFunction func);
+LIBSHIBOKEN_API MultipleInheritanceInitFunction getMultipleIheritanceFunction(SbkObjectType* self);
 
-LIBSHIBOKEN_API void        setDestructorFunction(SbkBaseType* self, ObjectDestructor func);
+LIBSHIBOKEN_API void        setDestructorFunction(SbkObjectType* self, ObjectDestructor func);
 
-LIBSHIBOKEN_API void        initPrivateData(SbkBaseType* self);
+LIBSHIBOKEN_API void        initPrivateData(SbkObjectType* self);
 }
 
 namespace Wrapper {
@@ -166,7 +166,7 @@ LIBSHIBOKEN_API bool        checkType(PyObject* pyObj);
 LIBSHIBOKEN_API bool        isUserType(PyObject* pyObj);
 
 
-LIBSHIBOKEN_API PyObject*   newObject(SbkBaseType* instanceType,
+LIBSHIBOKEN_API PyObject*   newObject(SbkObjectType* instanceType,
                                       void* cptr,
                                       bool hasOwnership = true,
                                       bool isExactType = false,