From b294c7e0adb23b9063ddf1cd76cf1b5244761919 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 28 Mar 2017 15:25:35 +0200 Subject: Generate reinterpret_cast<> for cppSelf Change-Id: Iafb5d014f9f33591aebf0ab4b99e3e6942a4d51a Reviewed-by: Christian Tismer --- generator/shiboken2/shibokengenerator.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'generator/shiboken2/shibokengenerator.cpp') diff --git a/generator/shiboken2/shibokengenerator.cpp b/generator/shiboken2/shibokengenerator.cpp index ca98441..766265b 100644 --- a/generator/shiboken2/shibokengenerator.cpp +++ b/generator/shiboken2/shibokengenerator.cpp @@ -558,16 +558,18 @@ QString ShibokenGenerator::cpythonWrapperCPtr(const AbstractMetaType *metaType, { if (!ShibokenGenerator::isWrapperType(metaType->typeEntry())) return QString(); - return QStringLiteral("((::%1*)Shiboken::Conversions::cppPointer(%2, (SbkObject*)%3))") - .arg(metaType->cppSignature(), cpythonTypeNameExt(metaType), argName); + return QLatin1String("reinterpret_cast< ::") + metaType->cppSignature() + + QLatin1String(" *>(Shiboken::Conversions::cppPointer(") + cpythonTypeNameExt(metaType) + + QLatin1String(", reinterpret_cast(") + argName + QLatin1String(")))"); } QString ShibokenGenerator::cpythonWrapperCPtr(const TypeEntry* type, QString argName) { if (!ShibokenGenerator::isWrapperType(type)) return QString(); - return QStringLiteral("((::%1*)Shiboken::Conversions::cppPointer(%2, (SbkObject*)%3))") - .arg(type->qualifiedCppName(), cpythonTypeNameExt(type), argName); + return QLatin1String("reinterpret_cast< ::") + type->qualifiedCppName() + + QLatin1String(" *>(Shiboken::Conversions::cppPointer(") + cpythonTypeNameExt(type) + + QLatin1String(", reinterpret_cast(") + argName + QLatin1String(")))"); } QString ShibokenGenerator::getFunctionReturnType(const AbstractMetaFunction* func, Options) const -- cgit v1.2.3