From bdfa13fb40778a91622e125a0c5e96f51ed666eb Mon Sep 17 00:00:00 2001
From: Hugo Parente Lima <hugo.pl@gmail.com>
Date: Fri, 19 Nov 2010 19:04:30 -0200
Subject: SbkBaseType_Type renamed to SbkObjectType_Type.

---
 libshiboken/basewrapper.cpp | 12 ++++++------
 libshiboken/basewrapper.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'libshiboken')

diff --git a/libshiboken/basewrapper.cpp b/libshiboken/basewrapper.cpp
index 1afa55295..48ed80842 100644
--- a/libshiboken/basewrapper.cpp
+++ b/libshiboken/basewrapper.cpp
@@ -37,7 +37,7 @@ extern "C"
 static void SbkObjectTypeDealloc(PyObject* pyObj);
 static PyObject* SbkObjectTypeTpNew(PyTypeObject* metatype, PyObject* args, PyObject* kwds);
 
-PyTypeObject SbkBaseType_Type = {
+PyTypeObject SbkObjectType_Type = {
     PyObject_HEAD_INIT(0)
     /*ob_size*/             0,
     /*tp_name*/             "Shiboken.ObjectType",
@@ -102,7 +102,7 @@ static PyGetSetDef SbkObjectGetSetList[] = {
 };
 
 SbkObjectType SbkObject_Type = { { {
-    PyObject_HEAD_INIT(&SbkBaseType_Type)
+    PyObject_HEAD_INIT(&SbkObjectType_Type)
     /*ob_size*/             0,
     /*tp_name*/             "Shiboken.Object",
     /*tp_basicsize*/        sizeof(SbkObject),
@@ -279,7 +279,7 @@ void walkThroughClassHierarchy(PyTypeObject* currentType, HierarchyVisitor* visi
     for (int i = 0; i < numBases; ++i) {
         PyTypeObject* type = reinterpret_cast<PyTypeObject*>(PyTuple_GET_ITEM(bases, i));
 
-        if (type->ob_type != &SbkBaseType_Type) {
+        if (type->ob_type != &SbkObjectType_Type) {
             continue;
         } else {
             SbkObjectType* sbkType = reinterpret_cast<SbkObjectType*>(type);
@@ -331,7 +331,7 @@ void init()
     if (PyType_Ready(&SbkEnumType_Type) < 0)
         Py_FatalError("[libshiboken] Failed to initialise Shiboken.SbkEnumType metatype.");
 
-    if (PyType_Ready(&SbkBaseType_Type) < 0)
+    if (PyType_Ready(&SbkObjectType_Type) < 0)
         Py_FatalError("[libshiboken] Failed to initialise Shiboken.BaseWrapperType metatype.");
 
     if (PyType_Ready((PyTypeObject *)&SbkObject_Type) < 0)
@@ -442,7 +442,7 @@ namespace ObjectType
 
 bool checkType(PyTypeObject* type)
 {
-    return type->ob_type == &SbkBaseType_Type;
+    return type->ob_type == &SbkObjectType_Type;
 }
 
 bool isUserType(PyTypeObject* type)
@@ -763,7 +763,7 @@ bool setCppPointer(SbkObject* sbkObj, PyTypeObject* desiredType, void* cptr)
 bool isValid(PyObject* pyObj)
 {
     if (!pyObj || pyObj == Py_None
-        || pyObj->ob_type->ob_type != &SbkBaseType_Type
+        || pyObj->ob_type->ob_type != &SbkObjectType_Type
         || ((SbkObject*)pyObj)->d->validCppObject) {
         return true;
     }
diff --git a/libshiboken/basewrapper.h b/libshiboken/basewrapper.h
index d41e7ea6c..460f31593 100644
--- a/libshiboken/basewrapper.h
+++ b/libshiboken/basewrapper.h
@@ -73,7 +73,7 @@ typedef void (*DeleteUserDataFunc)(void*);
 
 typedef void (*ObjectDestructor)(void*);
 
-extern LIBSHIBOKEN_API PyTypeObject SbkBaseType_Type;
+extern LIBSHIBOKEN_API PyTypeObject SbkObjectType_Type;
 extern LIBSHIBOKEN_API SbkObjectType SbkObject_Type;
 
 
-- 
cgit v1.2.3