shiboken: Move wrapperName and type into GeneratorContext

Introduce a Type enumeration to GeneratorContext and add
the wrapper name as a string. Overwrite creation function
in ShibokenGenerator to add this.

Remove unused wrapperName overloads.

Use the wrapper name and type from the GeneratorContext where
applicable instead of repeatedly running the check in
shouldGenerateCppWrapper().

Change-Id: I52cace3ad165c2cd6c6ce718cec822abfb8ad8ce
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

1 files changed, 8 insertions, 8 deletions

diff --git a/sources/shiboken2/generator/shiboken2/headergenerator.cpp b/sources/shiboken2/generator/shiboken2/headergenerator.cpp
index 65bc8909e..8b3fe1653 100644
--- a/sources/shiboken2/generator/shiboken2/headergenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/headergenerator.cpp
@@ -103,10 +103,10 @@ void HeaderGenerator::generateClass(QTextStream &s, const GeneratorContext &clas
 
     QString wrapperName;
     if (!classContext.forSmartPointer()) {
-        wrapperName = shouldGenerateCppWrapper(metaClass)
-            ? HeaderGenerator::wrapperName(metaClass) : metaClass->qualifiedCppName();
+        wrapperName = classContext.useWrapper()
+            ? classContext.wrapperName() : metaClass->qualifiedCppName();
     } else {
-        wrapperName = HeaderGenerator::wrapperName(classContext.preciseType());
+        wrapperName = classContext.smartPointerWrapperName();
     }
     QString outerHeaderGuard = getFilteredCppSignatureString(wrapperName).toUpper();
     QString innerHeaderGuard;
@@ -121,11 +121,10 @@ void HeaderGenerator::generateClass(QTextStream &s, const GeneratorContext &clas
     //Includes
     s << metaClass->typeEntry()->include() << Qt::endl;
 
-    if (shouldGenerateCppWrapper(metaClass) &&
-        usePySideExtensions() && metaClass->isQObject())
+    if (classContext.useWrapper() && usePySideExtensions() && metaClass->isQObject())
         s << "namespace PySide { class DynamicQMetaObject; }\n\n";
 
-    while (shouldGenerateCppWrapper(metaClass)) {
+    while (classContext.useWrapper()) {
         if (!innerHeaderGuard.isEmpty()) {
             s << "#  ifndef SBK_" << innerHeaderGuard << "_H\n";
             s << "#  define SBK_" << innerHeaderGuard << "_H\n\n";
@@ -208,9 +207,10 @@ void HeaderGenerator::generateClass(QTextStream &s, const GeneratorContext &clas
             break;
         classContext = contextForClass(metaClass);
         if (!classContext.forSmartPointer()) {
-            wrapperName = HeaderGenerator::wrapperName(metaClass);
+            wrapperName = classContext.useWrapper()
+                ? classContext.wrapperName() : metaClass->qualifiedCppName();
         } else {
-            wrapperName = HeaderGenerator::wrapperName(classContext.preciseType());
+            wrapperName = classContext.smartPointerWrapperName();
         }
         innerHeaderGuard = getFilteredCppSignatureString(wrapperName).toUpper();
     }