diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-11-10 14:30:42 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:08:57 -0300 |
| commit | 6c031f64b1e0369d468274be4d3d0107e45fc722 (patch) | |
| tree | 85a89e655078e2fbe7e2e6475d8dec189225d149 | |
| parent | a83a6aeec455dc50cba788de72d4bed51237142c (diff) | |
SbkBaseWrapper_Type variable renamed to SbkObject_Type
| -rw-r--r-- | generator/cppgenerator.cpp | 2 | ||||
| -rw-r--r-- | libshiboken/basewrapper.cpp | 4 | ||||
| -rw-r--r-- | libshiboken/basewrapper.h | 6 | ||||
| -rw-r--r-- | tests/samplebinding/typesystem_sample.xml | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp index 294352311..8e0706bfe 100644 --- a/generator/cppgenerator.cpp +++ b/generator/cppgenerator.cpp @@ -2341,7 +2341,7 @@ void CppGenerator::writeClassDefinition(QTextStream& s, const AbstractMetaClass* tp_as_sequence = QString("&Py%1_as_sequence").arg(cppClassName); if (!metaClass->baseClass()) - baseClassName = "reinterpret_cast<PyTypeObject*>(&SbkBaseWrapper_Type)"; + baseClassName = "reinterpret_cast<PyTypeObject*>(&SbkObject_Type)"; if (metaClass->isNamespace() || metaClass->hasPrivateDestructor()) { tp_flags = "Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES"; diff --git a/libshiboken/basewrapper.cpp b/libshiboken/basewrapper.cpp index f7ff1dc54..9fdcc456b 100644 --- a/libshiboken/basewrapper.cpp +++ b/libshiboken/basewrapper.cpp @@ -100,7 +100,7 @@ static PyGetSetDef SbkObjectGetSetList[] = { {0} // Sentinel }; -SbkObjectType SbkBaseWrapper_Type = { { { +SbkObjectType SbkObject_Type = { { { PyObject_HEAD_INIT(&SbkBaseWrapperType_Type) /*ob_size*/ 0, /*tp_name*/ "Shiboken.Object", @@ -497,7 +497,7 @@ void initShiboken() if (PyType_Ready(&SbkBaseWrapperType_Type) < 0) Py_FatalError("[libshiboken] Failed to initialise Shiboken.BaseWrapperType metatype."); - if (PyType_Ready((PyTypeObject *)&SbkBaseWrapper_Type) < 0) + if (PyType_Ready((PyTypeObject *)&SbkObject_Type) < 0) Py_FatalError("[libshiboken] Failed to initialise Shiboken.BaseWrapper type."); shibokenAlreadInitialised = true; diff --git a/libshiboken/basewrapper.h b/libshiboken/basewrapper.h index fbb558f7e..3e42ee86b 100644 --- a/libshiboken/basewrapper.h +++ b/libshiboken/basewrapper.h @@ -72,7 +72,7 @@ typedef bool (*ExtendedIsConvertibleFunc)(PyObject*); typedef void (*DeleteUserDataFunc)(void*); extern LIBSHIBOKEN_API PyTypeObject SbkBaseWrapperType_Type; -extern LIBSHIBOKEN_API SbkObjectType SbkBaseWrapper_Type; +extern LIBSHIBOKEN_API SbkObjectType SbkObject_Type; /// PyTypeObject extended with C++ multiple inheritance information. struct LIBSHIBOKEN_API SbkObjectType @@ -166,8 +166,8 @@ LIBSHIBOKEN_API bool canCallConstructor(PyTypeObject* myType, PyTypeObject* ctor */ #define Shiboken_TypeCheck(pyobj, type) (PyObject_TypeCheck(pyobj, SbkType<type>())) -#define SbkBaseWrapper_Check(op) PyObject_TypeCheck(op, (PyTypeObject*)&SbkBaseWrapper_Type) -#define SbkBaseWrapper_CheckExact(op) ((op)->ob_type == &SbkBaseWrapper_Type) +#define SbkBaseWrapper_Check(op) PyObject_TypeCheck(op, (PyTypeObject*)&SbkObject_Type) +#define SbkBaseWrapper_CheckExact(op) ((op)->ob_type == &SbkObject_Type) /** * Increments the reference count of the referred Python object. diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml index 3285da13e..d2d1266c2 100644 --- a/tests/samplebinding/typesystem_sample.xml +++ b/tests/samplebinding/typesystem_sample.xml @@ -1176,7 +1176,7 @@ </modify-argument> <inject-code class="target" position="end"> %RETURN_TYPE %0 = %TYPE::%FUNCTION_NAME(); - %PYARG_0 = Shiboken::Wrapper::newObject(&SbkBaseWrapper_Type, %0, false, false); + %PYARG_0 = Shiboken::Wrapper::newObject(&SbkObject_Type, %0, false, false); </inject-code> </modify-function> </value-type> |