summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-11-10 14:30:42 -0200
committerHugo Parente Lima <hugo.pl@gmail.com>2010-11-10 15:36:29 -0200
commit7090a14a3412af1d857d3a995dfdb7e575ebf22a (patch)
treef470251a99a32caed9c00d3ed277e9536ef26212
parentf7ec12bd0547fafd94d114bb78c9ee0e48686043 (diff)
downloadshiboken-7090a14a3412af1d857d3a995dfdb7e575ebf22a.tar.gz
shiboken-7090a14a3412af1d857d3a995dfdb7e575ebf22a.tar.xz
shiboken-7090a14a3412af1d857d3a995dfdb7e575ebf22a.zip
SbkBaseWrapper_Type variable renamed to SbkObject_Type
-rw-r--r--generator/cppgenerator.cpp2
-rw-r--r--libshiboken/basewrapper.cpp4
-rw-r--r--libshiboken/basewrapper.h6
-rw-r--r--tests/samplebinding/typesystem_sample.xml2
4 files changed, 7 insertions, 7 deletions
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp
index 29435231..8e0706bf 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 f7ff1dc5..9fdcc456 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 fbb558f7..3e42ee86 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 3285da13..d2d1266c 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(&amp;SbkBaseWrapper_Type, %0, false, false);
+ %PYARG_0 = Shiboken::Wrapper::newObject(&amp;SbkObject_Type, %0, false, false);
</inject-code>
</modify-function>
</value-type>