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>
 

2 files changed, 12 insertions, 0 deletions

diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
index eb0f44689..7bb7e0a83 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
@@ -353,6 +353,17 @@ bool TypeInfo::stripLeadingQualifier(const QString &qualifier, QString *s)
     return true;
 }
 
+// Strip all const/volatile/*/&
+void TypeInfo::stripQualifiers(QString *s)
+{
+    stripLeadingConst(s);
+    stripLeadingVolatile(s);
+    while (s->endsWith(QLatin1Char('&')) || s->endsWith(QLatin1Char('*'))
+        || s->endsWith(QLatin1Char(' '))) {
+        s->chop(1);
+    }
+}
+
 // Helper functionality to simplify a raw standard type as returned by
 // clang_getCanonicalType() for g++ standard containers from
 // "std::__cxx11::list<int, std::allocator<int> >" or
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.h b/sources/shiboken2/ApiExtractor/parser/codemodel.h
index 3bce5e216..6f3c17613 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.h
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.h
@@ -213,6 +213,7 @@ public:
     static bool stripLeadingConst(QString *s);
     static bool stripLeadingVolatile(QString *s);
     static bool stripLeadingQualifier(const QString &qualifier, QString *s);
+    static void stripQualifiers(QString *s);
 
     void simplifyStdType();