From fd126b28e1d9b02ea16c813bc392461bdb05bd1d Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 6 Jun 2019 12:51:24 +0200
Subject: shiboken: Fix generation of init functions and types for const-refs
 of smart pointers

Add a convenience to strip all qualifiers and use that.

This at least fixes the naming (for example, getInitFunctionName
returning "const_QSharedPointer_QSize___&"), the init function for the
type itself is missing, though.

Task-number: PYSIDE-1016
Change-Id: Id61b3c879199fc061e2846007951e3e9c82b85c4
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/shiboken2/generator/generator.cpp                 | 2 ++
 sources/shiboken2/generator/shiboken2/headergenerator.cpp | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'sources/shiboken2/generator')

diff --git a/sources/shiboken2/generator/generator.cpp b/sources/shiboken2/generator/generator.cpp
index 87758e533..fe03d3489 100644
--- a/sources/shiboken2/generator/generator.cpp
+++ b/sources/shiboken2/generator/generator.cpp
@@ -28,6 +28,7 @@
 
 #include "generator.h"
 #include "abstractmetalang.h"
+#include "parser/codemodel.h"
 #include "messages.h"
 #include "reporthandler.h"
 #include "fileout.h"
@@ -911,6 +912,7 @@ QString getClassTargetFullName(const AbstractMetaType *metaType, bool includePac
 
 QString getFilteredCppSignatureString(QString signature)
 {
+    TypeInfo::stripQualifiers(&signature); // for const refs to smart pointers
     signature.replace(QLatin1String("::"), QLatin1String("_"));
     signature.replace(QLatin1Char('<'), QLatin1Char('_'));
     signature.replace(QLatin1Char('>'), QLatin1Char('_'));
diff --git a/sources/shiboken2/generator/shiboken2/headergenerator.cpp b/sources/shiboken2/generator/shiboken2/headergenerator.cpp
index 8881d71f4..17ebbcde9 100644
--- a/sources/shiboken2/generator/shiboken2/headergenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/headergenerator.cpp
@@ -31,6 +31,7 @@
 #include <typedatabase.h>
 #include <reporthandler.h>
 #include <fileout.h>
+#include "parser/codemodel.h"
 
 #include <algorithm>
 
@@ -592,8 +593,10 @@ void HeaderGenerator::writeSbkTypeFunction(QTextStream& s, const AbstractMetaCla
 
 void HeaderGenerator::writeSbkTypeFunction(QTextStream &s, const AbstractMetaType *metaType)
 {
-    s <<  "template<> inline PyTypeObject* SbkType< ::" << metaType->cppSignature() << " >() "
-      <<  "{ return reinterpret_cast<PyTypeObject*>(" << cpythonTypeNameExt(metaType) << "); }\n";
+    QString signature = metaType->cppSignature();
+    TypeInfo::stripQualifiers(&signature); // for const refs to smart pointers
+    s <<  "template<> inline PyTypeObject *SbkType< ::" << signature << " >() "
+       <<  "{ return reinterpret_cast<PyTypeObject *>(" << cpythonTypeNameExt(metaType) << "); }\n";
 }
 
 void HeaderGenerator::writeInheritedOverloads(QTextStream& s)
-- 
cgit v1.2.3