summaryrefslogtreecommitdiffstats
path: root/generator
diff options
context:
space:
mode:
authorRenato Araujo Oliveira Filho <renato.filho@openbossa.org>2010-11-19 17:01:22 -0300
committerRenato Araujo Oliveira Filho <renato.filho@openbossa.org>2010-11-19 17:14:34 -0300
commit1e4ec3e7f694bee931fd9d9af89dcaa405de1d2a (patch)
treee2b5f97a30592740bc69c3d2a3a1c6cf8770f9b6 /generator
parentb2096155a231797afd397acc8908acb691f3c732 (diff)
downloadshiboken-1e4ec3e7f694bee931fd9d9af89dcaa405de1d2a.tar.gz
shiboken-1e4ec3e7f694bee931fd9d9af89dcaa405de1d2a.tar.xz
shiboken-1e4ec3e7f694bee931fd9d9af89dcaa405de1d2a.zip
Fix merge mistakes:
* Replaces PySide::deleteDynamicQMetaObject by Shiboken::callCppDestructor<DynamicQMetaObject> * Shiboken namespace usage.
Diffstat (limited to 'generator')
-rw-r--r--generator/cppgenerator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp
index 537c658f..284b20f8 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;
{