diff options
| author | Renato Araujo Oliveira Filho <renato.filho@openbossa.org> | 2010-11-19 17:01:22 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:08:59 -0300 |
| commit | f315a69eca35fd24b05a07237130ee861254615f (patch) | |
| tree | 87b6b278fa0ad751512d52180f74700b74d438ca /generator | |
| parent | 00924f871f1ed0511078157b5c37072d15621b3a (diff) | |
Fix merge mistakes:
* Replaces PySide::deleteDynamicQMetaObject by
Shiboken::callCppDestructor<DynamicQMetaObject>
* Shiboken namespace usage.
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/cppgenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp index 537c658fb..284b20f81 100644 --- a/generator/cppgenerator.cpp +++ b/generator/cppgenerator.cpp @@ -794,7 +794,7 @@ void CppGenerator::writeMetaObjectMethod(QTextStream& s, const AbstractMetaClass Indentation indentation2(INDENT); s << INDENT << "m_metaObject = PySide::DynamicQMetaObject::createBasedOn((PyObject*)pySelf, pySelf->ob_type, &" << metaClass->qualifiedCppName() << "::staticMetaObject);" << endl - << INDENT << "Shiboken::Wrapper::setTypeUserData(pySelf, m_metaObject, PySide::deleteDynamicQMetaObject);" << endl; + << INDENT << "Shiboken::Wrapper::setTypeUserData(pySelf, m_metaObject, &Shiboken::callCppDestructor<PySide::DynamicQMetaObject>);" << endl; } s << INDENT << "} else {" << endl; { |