diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-11-10 14:36:07 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:08:57 -0300 |
| commit | cdeb0172eca90f2050313b589fb068145d882dbb (patch) | |
| tree | e7340214a3df7ebb7386b79751032bffa3576240 /libshiboken | |
| parent | 6c031f64b1e0369d468274be4d3d0107e45fc722 (diff) | |
Variable SbkBaseWrapperType_Type renamed to SbkObjectType_Type
Diffstat (limited to 'libshiboken')
| -rw-r--r-- | libshiboken/basewrapper.cpp | 10 | ||||
| -rw-r--r-- | libshiboken/basewrapper.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libshiboken/basewrapper.cpp b/libshiboken/basewrapper.cpp index 9fdcc456b..0e375cfc2 100644 --- a/libshiboken/basewrapper.cpp +++ b/libshiboken/basewrapper.cpp @@ -36,7 +36,7 @@ extern "C" static void SbkObjectTypeDealloc(PyObject* pyObj); static PyObject* SbkObjectTypeTpNew(PyTypeObject* metatype, PyObject* args, PyObject* kwds); -PyTypeObject SbkBaseWrapperType_Type = { +PyTypeObject SbkObjectType_Type = { PyObject_HEAD_INIT(0) /*ob_size*/ 0, /*tp_name*/ "Shiboken.ObjectType", @@ -101,7 +101,7 @@ static PyGetSetDef SbkObjectGetSetList[] = { }; SbkObjectType SbkObject_Type = { { { - PyObject_HEAD_INIT(&SbkBaseWrapperType_Type) + PyObject_HEAD_INIT(&SbkObjectType_Type) /*ob_size*/ 0, /*tp_name*/ "Shiboken.Object", /*tp_basicsize*/ sizeof(SbkObject), @@ -387,7 +387,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 != &SbkBaseWrapperType_Type) { + if (type->ob_type != &SbkObjectType_Type) { continue; } else { SbkObjectType* sbkType = reinterpret_cast<SbkObjectType*>(type); @@ -494,7 +494,7 @@ void initShiboken() if (PyType_Ready(&SbkEnumType_Type) < 0) Py_FatalError("[libshiboken] Failed to initialise Shiboken.SbkEnumType metatype."); - if (PyType_Ready(&SbkBaseWrapperType_Type) < 0) + if (PyType_Ready(&SbkObjectType_Type) < 0) Py_FatalError("[libshiboken] Failed to initialise Shiboken.BaseWrapperType metatype."); if (PyType_Ready((PyTypeObject *)&SbkObject_Type) < 0) @@ -689,7 +689,7 @@ bool setCppPointer(SbkObject* sbkObj, PyTypeObject* desiredType, void* cptr) bool isValid(PyObject* pyObj) { if (!pyObj || pyObj == Py_None - || pyObj->ob_type->ob_type != &SbkBaseWrapperType_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 3e42ee86b..c6b936b75 100644 --- a/libshiboken/basewrapper.h +++ b/libshiboken/basewrapper.h @@ -71,7 +71,7 @@ typedef bool (*ExtendedIsConvertibleFunc)(PyObject*); // Used in userdata dealloc function typedef void (*DeleteUserDataFunc)(void*); -extern LIBSHIBOKEN_API PyTypeObject SbkBaseWrapperType_Type; +extern LIBSHIBOKEN_API PyTypeObject SbkObjectType_Type; extern LIBSHIBOKEN_API SbkObjectType SbkObject_Type; /// PyTypeObject extended with C++ multiple inheritance information. @@ -138,7 +138,7 @@ LIBSHIBOKEN_API void destroyParentInfo(SbkObject* obj, bool removeFromParent = t */ inline bool isShibokenType(PyObject*& pyObj) { - return pyObj->ob_type->ob_type == &SbkBaseWrapperType_Type; + return pyObj->ob_type->ob_type == &SbkObjectType_Type; } /** |