diff options
author | Marcelo Lira <marcelo.lira@openbossa.org> | 2009-12-11 14:40:21 -0300 |
---|---|---|
committer | Marcelo Lira <marcelo.lira@openbossa.org> | 2009-12-11 14:40:30 -0300 |
commit | 0f31a28bcb0d802f461fd2012dd2a239decb81b0 (patch) | |
tree | 79523ebbf47d445fd6b90b98e31c3fdbcba959ac /cppgenerator.cpp | |
parent | 88dc53b65f0fa7d6dc918198d7800501861ea3ac (diff) |
Renamed ShiboTypeObject to SbkBaseWrapperType to clearify its relationship with SbkBaseWrapper.
Diffstat (limited to 'cppgenerator.cpp')
-rw-r--r-- | cppgenerator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cppgenerator.cpp b/cppgenerator.cpp index a19cc6aaf..1999ed236 100644 --- a/cppgenerator.cpp +++ b/cppgenerator.cpp @@ -471,7 +471,7 @@ void CppGenerator::writeConstructorWrapper(QTextStream& s, const AbstractMetaFun s << INDENT << "if (type != (PyTypeObject*)&" << className << ") {" << endl; { Indentation indentation(INDENT); - s << INDENT << "ShiboTypeObject* shibotype = reinterpret_cast<ShiboTypeObject*>(type);" << endl; + s << INDENT << "SbkBaseWrapperType* shibotype = reinterpret_cast<SbkBaseWrapperType*>(type);" << endl; s << INDENT << "shibotype->mi_init = " << className << ".mi_init;" << endl; s << INDENT << "shibotype->mi_offsets = " << className << ".mi_offsets;" << endl; s << INDENT << "shibotype->mi_specialcast = " << className << ".mi_specialcast;" << endl; @@ -1286,7 +1286,7 @@ void CppGenerator::writeMultipleInheritanceInitializerFunction(QTextStream& s, c void CppGenerator::writeSpecialCastFunction(QTextStream& s, const AbstractMetaClass* metaClass) { - s << "static void* " << cpythonSpecialCastFunctionName(metaClass) << "(PyObject* obj, ShiboTypeObject* desiredType)\n"; + s << "static void* " << cpythonSpecialCastFunctionName(metaClass) << "(PyObject* obj, SbkBaseWrapperType* desiredType)\n"; s << "{\n"; s << INDENT << metaClass->qualifiedCppName() << "* me = " << cpythonWrapperCPtr(metaClass, "obj") << ";\n"; AbstractMetaClassList bases = getBaseClasses(metaClass); @@ -1395,7 +1395,7 @@ void CppGenerator::writeClassDefinition(QTextStream& s, const AbstractMetaClass* s << "// Class Definition -----------------------------------------------" << endl; - s << "Shiboken::ShiboTypeObject " << className + "_Type" << " = { {" << endl; + s << "Shiboken::SbkBaseWrapperType " << className + "_Type" << " = { {" << endl; s << INDENT << "PyObject_HEAD_INIT(&PyType_Type)" << endl; s << INDENT << "/*ob_size*/ 0," << endl; s << INDENT << "/*tp_name*/ \"" << cppClassName << "\"," << endl; |