shiboken6: Factor out helper writeTemplateCustomConverterRegister()

It is now used for containers and will be later reused for smart
pointers.

Task-number: PYSIDE-3107
Change-Id: I0790c38cbcf8f9f4cb500d252c00d1c9e66deb7b
Reviewed-by: Cristian Maureira-Fredes <[email protected]>

2 files changed, 23 insertions, 8 deletions

diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
index 539094075..6b238d19b 100644
--- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
@@ -2120,6 +2120,24 @@ void CppGenerator::writeCustomConverterRegister(TextStream &s,
     }
 }
 
+void CppGenerator::writeTemplateCustomConverterRegister(TextStream &s,
+                                                        const AbstractMetaType &type,
+                                                        QString converter)
+{
+    auto customConversion = CustomConversion::getCustomConversion(type.typeEntry());
+    if (!customConversion || customConversion->targetToNativeConversions().isEmpty())
+        return;
+    if (converter.isEmpty())
+        converter = converterVar;
+    const QString typeName = fixedCppTypeName(type);
+    for (const auto &conv : customConversion->targetToNativeConversions()) {
+        const QString &sourceTypeName = conv.sourceTypeName();
+        QString toCpp = pythonToCppFunctionName(sourceTypeName, typeName);
+        QString isConv = convertibleToCppFunctionName(sourceTypeName, typeName);
+        writeAddPythonToCppConversion(s, converter, toCpp, isConv);
+    }
+}
+
 void CppGenerator::writeContainerConverterFunctions(TextStream &s,
                                                     const AbstractMetaType &containerType) const
 {
@@ -4438,8 +4456,7 @@ QString CppGenerator::writeContainerConverterInitialization(TextStream &s,
         s << '&' << targetTypeName << "_Type";
     }
 
-    const QString typeName = fixedCppTypeName(type);
-    s << ", " << cppToPythonFunctionName(typeName, targetTypeName) << ");\n";
+    s << ", " << cppToPythonFunctionName(fixedCppTypeName(type), targetTypeName) << ");\n";
 
     s << registerConverterName(cppSignature, converter);
     if (usePySideExtensions() && cppSignature.startsWith("const "_L1)
@@ -4448,12 +4465,7 @@ QString CppGenerator::writeContainerConverterInitialization(TextStream &s,
         s << registerConverterName(underlyingType, converter);
     }
 
-    for (const auto &conv : typeEntry->customConversion()->targetToNativeConversions()) {
-        const QString &sourceTypeName = conv.sourceTypeName();
-        QString toCpp = pythonToCppFunctionName(sourceTypeName, typeName);
-        QString isConv = convertibleToCppFunctionName(sourceTypeName, typeName);
-        writeAddPythonToCppConversion(s, converter, toCpp, isConv);
-    }
+    writeTemplateCustomConverterRegister(s, type, converter);
 
     auto typedefItPair = api.typedefTargetToName().equal_range(type.cppSignature());
     if (typedefItPair.first != typedefItPair.second) {
diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.h b/sources/shiboken6/generator/shiboken/cppgenerator.h
index 0cf204234..6d536424a 100644
--- a/sources/shiboken6/generator/shiboken/cppgenerator.h
+++ b/sources/shiboken6/generator/shiboken/cppgenerator.h
@@ -114,6 +114,9 @@ private:
     static void writeCustomConverterRegister(TextStream &s,
                                              const CustomConversionPtr &customConversion,
                                              const QString &converterVar);
+    static void writeTemplateCustomConverterRegister(TextStream &s,
+                                                     const AbstractMetaType &type,
+                                                     QString converter = {});
 
     void writeContainerConverterFunctions(TextStream &s,
                                           const AbstractMetaType &containerType) const;