shiboken6: Make more generator functions static

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

7 files changed, 55 insertions, 50 deletions

diff --git a/sources/shiboken6/generator/qtdoc/qtdocgenerator.h b/sources/shiboken6/generator/qtdoc/qtdocgenerator.h
index 218625cef..f953a6304 100644
--- a/sources/shiboken6/generator/qtdoc/qtdocgenerator.h
+++ b/sources/shiboken6/generator/qtdoc/qtdocgenerator.h
@@ -84,8 +84,9 @@ private:
                        const AbstractMetaFunctionCPtr &func, bool indexed = true);
     void writeFunctionParametersType(TextStream &s, const AbstractMetaClass *cppClass,
                                      const AbstractMetaFunctionCPtr &func) const;
-    void writeFunctionList(TextStream& s, const AbstractMetaClass* cppClass);
-    void writeFunctionBlock(TextStream& s, const QString& title, QStringList& functions);
+    static void writeFunctionList(TextStream& s, const AbstractMetaClass* cppClass);
+    static void writeFunctionBlock(TextStream& s, const QString& title,
+                                   QStringList& functions);
     void writeParameterType(TextStream &s, const AbstractMetaClass *cppClass,
                             const AbstractMetaArgument &arg) const;
 
@@ -96,7 +97,8 @@ private:
     bool writeInjectDocumentation(TextStream& s, TypeSystem::DocModificationMode mode,
                                   const AbstractMetaClass* cppClass,
                                   const AbstractMetaFunctionCPtr &func);
-    void writeDocSnips(TextStream &s, const CodeSnipList &codeSnips, TypeSystem::CodeSnipPosition position, TypeSystem::Language language);
+    static void writeDocSnips(TextStream &s, const CodeSnipList &codeSnips,
+                              TypeSystem::CodeSnipPosition position, TypeSystem::Language language);
 
     void writeModuleDocumentation();
     void writeAdditionalDocumentation() const;
diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
index aaab6906a..6a2b38f1c 100644
--- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
@@ -774,7 +774,7 @@ void CppGenerator::generateClass(TextStream &s, const GeneratorContext &classCon
     }
 }
 
-void CppGenerator::writeCacheResetNative(TextStream &s, const GeneratorContext &classContext) const
+void CppGenerator::writeCacheResetNative(TextStream &s, const GeneratorContext &classContext)
 {
     s << "void " << classContext.wrapperName()
         << "::resetPyMethodCache()\n{\n" << indent
@@ -1273,7 +1273,7 @@ void CppGenerator::writeMetaObjectMethod(TextStream &s,
 }
 
 void CppGenerator::writeMetaCast(TextStream &s,
-                                 const GeneratorContext &classContext) const
+                                 const GeneratorContext &classContext)
 {
     const QString wrapperClassName = classContext.wrapperName();
     const QString qualifiedCppName = classContext.metaClass()->qualifiedCppName();
@@ -1721,7 +1721,7 @@ void CppGenerator::writeConverterRegister(TextStream &s, const AbstractMetaClass
 }
 
 void CppGenerator::writeCustomConverterRegister(TextStream &s, const CustomConversion *customConversion,
-                                                const QString &converterVar) const
+                                                const QString &converterVar)
 {
     if (!customConversion)
         return;
@@ -3066,7 +3066,7 @@ void CppGenerator::writeIsPythonConvertibleToCppFunction(TextStream &s,
                                                          const QString &targetTypeName,
                                                          const QString &condition,
                                                          QString pythonToCppFuncName,
-                                                         bool acceptNoneAsCppNull) const
+                                                         bool acceptNoneAsCppNull)
 {
     if (pythonToCppFuncName.isEmpty())
         pythonToCppFuncName = pythonToCppFunctionName(sourceTypeName, targetTypeName);
@@ -3226,7 +3226,7 @@ void CppGenerator::writePythonToCppConversionFunctions(TextStream &s, const Abst
 
 void CppGenerator::writeAddPythonToCppConversion(TextStream &s, const QString &converterVar,
                                                  const QString &pythonToCppFunc,
-                                                 const QString &isConvertibleFunc) const
+                                                 const QString &isConvertibleFunc)
 {
     s << "Shiboken::Conversions::addPythonToCppValueConversion(" << converterVar << ',' << '\n';
     {
@@ -3902,7 +3902,8 @@ void CppGenerator::writeSpecialCastFunction(TextStream &s, const AbstractMetaCla
     s << "return me;\n" << outdent << "}\n\n";
 }
 
-void CppGenerator::writePrimitiveConverterInitialization(TextStream &s, const CustomConversion *customConversion) const
+void CppGenerator::writePrimitiveConverterInitialization(TextStream &s,
+                                                         const CustomConversion *customConversion)
 {
     const TypeEntry *type = customConversion->ownerType();
     QString converter = converterObject(type);
@@ -3921,14 +3922,14 @@ void CppGenerator::writePrimitiveConverterInitialization(TextStream &s, const Cu
     writeCustomConverterRegister(s, customConversion, converter);
 }
 
-void CppGenerator::writeEnumConverterInitialization(TextStream &s, const AbstractMetaEnum &metaEnum) const
+void CppGenerator::writeEnumConverterInitialization(TextStream &s, const AbstractMetaEnum &metaEnum)
 {
     if (metaEnum.isPrivate() || metaEnum.isAnonymous())
         return;
     writeEnumConverterInitialization(s, metaEnum.typeEntry());
 }
 
-void CppGenerator::writeEnumConverterInitialization(TextStream &s, const TypeEntry *enumType) const
+void CppGenerator::writeEnumConverterInitialization(TextStream &s, const TypeEntry *enumType)
 {
     if (!enumType)
         return;
@@ -4067,7 +4068,7 @@ void CppGenerator::writeSmartPointerConverterInitialization(TextStream &s, const
 }
 
 void CppGenerator::writeExtendedConverterInitialization(TextStream &s, const TypeEntry *externalType,
-                                                        const AbstractMetaClassCList &conversions) const
+                                                        const AbstractMetaClassCList &conversions)
 {
     s << "// Extended implicit conversions for " << externalType->qualifiedTargetLangName()
       << ".\n";
@@ -4526,7 +4527,7 @@ void CppGenerator::writeTypeAsNumberDefinition(TextStream &s, const AbstractMeta
     }
 }
 
-void CppGenerator::writeTpTraverseFunction(TextStream &s, const AbstractMetaClass *metaClass) const
+void CppGenerator::writeTpTraverseFunction(TextStream &s, const AbstractMetaClass *metaClass)
 {
     QString baseName = cpythonBaseName(metaClass);
     s << "static int " << baseName
@@ -4535,7 +4536,7 @@ void CppGenerator::writeTpTraverseFunction(TextStream &s, const AbstractMetaClas
         << outdent << "}\n";
 }
 
-void CppGenerator::writeTpClearFunction(TextStream &s, const AbstractMetaClass *metaClass) const
+void CppGenerator::writeTpClearFunction(TextStream &s, const AbstractMetaClass *metaClass)
 {
     QString baseName = cpythonBaseName(metaClass);
     s << "static int " << baseName << "_clear(PyObject *self)\n{\n" << indent
@@ -5213,7 +5214,7 @@ void CppGenerator::writeFlagsMethods(TextStream &s, const AbstractMetaEnum &cppE
     s << '\n';
 }
 
-void CppGenerator::writeFlagsNumberMethodsDefinition(TextStream &s, const AbstractMetaEnum &cppEnum) const
+void CppGenerator::writeFlagsNumberMethodsDefinition(TextStream &s, const AbstractMetaEnum &cppEnum)
 {
     QString cpythonName = cpythonEnumName(cppEnum);
 
@@ -5312,7 +5313,7 @@ QString CppGenerator::getInitFunctionName(const GeneratorContext &context) const
 void CppGenerator::writeSignatureStrings(TextStream &s,
                                          const QString &signatures,
                                          const QString &arrayName,
-                                         const char *comment) const
+                                         const char *comment)
 {
     s << "// The signatures string for the " << comment << ".\n"
         << "// Multiple signatures have their index \"n:\" in front.\n"
@@ -5542,7 +5543,7 @@ void CppGenerator::writeClassRegister(TextStream &s,
     s << outdent << "}\n";
 }
 
-void CppGenerator::writeInitQtMetaTypeFunctionBody(TextStream &s, const GeneratorContext &context) const
+void CppGenerator::writeInitQtMetaTypeFunctionBody(TextStream &s, const GeneratorContext &context)
 {
     const AbstractMetaClass *metaClass = context.metaClass();
     // Gets all class name variants used on different possible scopes
@@ -5886,7 +5887,7 @@ PyErr_Format(PyExc_AttributeError,
 // function.
 void CppGenerator::writeInitFunc(TextStream &declStr, TextStream &callStr,
                                  const QString &initFunctionName,
-                                 const TypeEntry *enclosingEntry) const
+                                 const TypeEntry *enclosingEntry)
 {
     const bool hasParent =
         enclosingEntry && enclosingEntry->type() != TypeEntry::TypeSystemType;
diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.h b/sources/shiboken6/generator/shiboken/cppgenerator.h
index 97811c946..b74681c88 100644
--- a/sources/shiboken6/generator/shiboken/cppgenerator.h
+++ b/sources/shiboken6/generator/shiboken/cppgenerator.h
@@ -52,10 +52,10 @@ protected:
     bool finishGeneration() override;
 
 private:
-    void writeInitFunc(TextStream &declStr, TextStream &callStr,
-                       const QString &initFunctionName,
-                       const TypeEntry *enclosingEntry = nullptr) const;
-    void writeCacheResetNative(TextStream &s, const GeneratorContext &classContext) const;
+    static void writeInitFunc(TextStream &declStr, TextStream &callStr,
+                              const QString &initFunctionName,
+                              const TypeEntry *enclosingEntry = nullptr);
+    static void writeCacheResetNative(TextStream &s, const GeneratorContext &classContext);
     void writeConstructorNative(TextStream &s, const GeneratorContext &classContext,
                                 const AbstractMetaFunctionCPtr &func) const;
     void writeDestructorNative(TextStream &s, const GeneratorContext &classContext) const;
@@ -71,7 +71,7 @@ private:
                                        const AbstractMetaFunctionCPtr &func,
                                        const FunctionModificationList &functionModifications);
     void writeMetaObjectMethod(TextStream &s, const GeneratorContext &classContext) const;
-    void writeMetaCast(TextStream &s, const GeneratorContext &classContext) const;
+    static void writeMetaCast(TextStream &s, const GeneratorContext &classContext);
 
     void writeEnumConverterFunctions(TextStream &s, const TypeEntry *enumType) const;
     void writeEnumConverterFunctions(TextStream &s, const AbstractMetaEnum &metaEnum) const;
@@ -81,8 +81,8 @@ private:
                                        const CustomConversion *customConversion) const;
     void writeConverterRegister(TextStream &s, const AbstractMetaClass *metaClass,
                                 const GeneratorContext &classContext) const;
-    void writeCustomConverterRegister(TextStream &s, const CustomConversion *customConversion,
-                                      const QString &converterVar) const;
+    static void writeCustomConverterRegister(TextStream &s, const CustomConversion *customConversion,
+                                             const QString &converterVar);
 
     void writeContainerConverterFunctions(TextStream &s,
                                           const AbstractMetaType &containerType) const;
@@ -238,12 +238,12 @@ private:
                                   const QString &targetTypeName) const;
 
     /// Writes a Python to C++ convertible check function.
-    void writeIsPythonConvertibleToCppFunction(TextStream &s,
-                                               const QString &sourceTypeName,
-                                               const QString &targetTypeName,
-                                               const QString &condition,
-                                               QString pythonToCppFuncName = QString(),
-                                               bool acceptNoneAsCppNull = false) const;
+    static void writeIsPythonConvertibleToCppFunction(TextStream &s,
+                                                       const QString &sourceTypeName,
+                                                       const QString &targetTypeName,
+                                                       const QString &condition,
+                                                       QString pythonToCppFuncName = QString(),
+                                                       bool acceptNoneAsCppNull = false);
 
     /// Writes a pair of Python to C++ conversion and check functions.
     void writePythonToCppConversionFunctions(TextStream &s,
@@ -261,9 +261,9 @@ private:
     void writePythonToCppConversionFunctions(TextStream &s,
                                              const AbstractMetaType &containerType) const;
 
-    void writeAddPythonToCppConversion(TextStream &s, const QString &converterVar,
+    static void writeAddPythonToCppConversion(TextStream &s, const QString &converterVar,
                                        const QString &pythonToCppFunc,
-                                       const QString &isConvertibleFunc) const;
+                                       const QString &isConvertibleFunc);
 
     void writeNamedArgumentResolution(TextStream &s, const AbstractMetaFunctionCPtr &func,
                                       bool usePyArgs, const OverloadData &overloadData) const;
@@ -279,9 +279,9 @@ private:
     QString getInitFunctionName(const GeneratorContext &context) const;
     QString getSimpleClassInitFunctionName(const AbstractMetaClass *metaClass) const;
 
-    void writeSignatureStrings(TextStream &s, const QString &signatures,
-                               const QString &arrayName,
-                               const char *comment) const;
+    static void writeSignatureStrings(TextStream &s, const QString &signatures,
+                                      const QString &arrayName,
+                                      const char *comment);
     void writeClassRegister(TextStream &s,
                             const AbstractMetaClass *metaClass,
                             const GeneratorContext &classContext,
@@ -309,8 +309,8 @@ private:
 
     void writeTypeAsNumberDefinition(TextStream &s, const AbstractMetaClass *metaClass) const;
 
-    void writeTpTraverseFunction(TextStream &s, const AbstractMetaClass *metaClass) const;
-    void writeTpClearFunction(TextStream &s, const AbstractMetaClass *metaClass) const;
+    static void writeTpTraverseFunction(TextStream &s, const AbstractMetaClass *metaClass);
+    static void writeTpClearFunction(TextStream &s, const AbstractMetaClass *metaClass);
 
     void writeCopyFunction(TextStream &s, const GeneratorContext &context) const;
 
@@ -342,7 +342,7 @@ private:
     void writeFlagsMethods(TextStream &s, const AbstractMetaEnum &cppEnum) const;
     void writeFlagsToLong(TextStream &s, const AbstractMetaEnum &cppEnum) const;
     void writeFlagsNonZero(TextStream &s, const AbstractMetaEnum &cppEnum) const;
-    void writeFlagsNumberMethodsDefinition(TextStream &s, const AbstractMetaEnum &cppEnum) const;
+    static void writeFlagsNumberMethodsDefinition(TextStream &s, const AbstractMetaEnum &cppEnum);
     void writeFlagsNumberMethodsDefinitions(TextStream &s, const AbstractMetaEnumList &enums) const;
     void writeFlagsBinaryOperator(TextStream &s, const AbstractMetaEnum &cppEnum,
                                   const QString &pyOpName, const QString &cppOpName) const;
@@ -355,21 +355,21 @@ private:
     /// Writes the implementation of special cast functions, used when we need to cast a class with multiple inheritance.
     static void writeSpecialCastFunction(TextStream &s, const AbstractMetaClass *metaClass);
 
-    void writePrimitiveConverterInitialization(TextStream &s,
-                                               const CustomConversion *customConversion) const;
-    void writeEnumConverterInitialization(TextStream &s, const TypeEntry *enumType) const;
-    void writeEnumConverterInitialization(TextStream &s, const AbstractMetaEnum &metaEnum) const;
+    static void writePrimitiveConverterInitialization(TextStream &s,
+                                                      const CustomConversion *customConversion);
+    static void writeEnumConverterInitialization(TextStream &s, const TypeEntry *enumType);
+    static void writeEnumConverterInitialization(TextStream &s, const AbstractMetaEnum &metaEnum);
     void writeContainerConverterInitialization(TextStream &s, const AbstractMetaType &type) const;
     void writeSmartPointerConverterInitialization(TextStream &s, const AbstractMetaType &ype) const;
-    void writeExtendedConverterInitialization(TextStream &s, const TypeEntry *externalType,
-                                              const AbstractMetaClassCList &conversions) const;
+    static void writeExtendedConverterInitialization(TextStream &s, const TypeEntry *externalType,
+                                                     const AbstractMetaClassCList &conversions);
 
     void writeParentChildManagement(TextStream &s, const AbstractMetaFunctionCPtr &func,
                                     bool userHeuristicForReturn) const;
     bool writeParentChildManagement(TextStream &s, const AbstractMetaFunctionCPtr &func,
                                     int argIndex, bool userHeuristicPolicy) const;
     void writeReturnValueHeuristics(TextStream &s, const AbstractMetaFunctionCPtr &func) const;
-    void writeInitQtMetaTypeFunctionBody(TextStream &s, const GeneratorContext &context) const;
+    static void writeInitQtMetaTypeFunctionBody(TextStream &s, const GeneratorContext &context);
 
     /**
      *   Returns the multiple inheritance initializer function for the given class.
diff --git a/sources/shiboken6/generator/shiboken/headergenerator.cpp b/sources/shiboken6/generator/shiboken/headergenerator.cpp
index b7719f803..005543d84 100644
--- a/sources/shiboken6/generator/shiboken/headergenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/headergenerator.cpp
@@ -69,7 +69,8 @@ void HeaderGenerator::writeCopyCtor(TextStream &s, const AbstractMetaClass *meta
       << "& self) : " << metaClass->qualifiedCppName() << "(self)\n{\n}\n\n";
 }
 
-void HeaderGenerator::writeProtectedFieldAccessors(TextStream &s, const AbstractMetaField &field) const
+void HeaderGenerator::writeProtectedFieldAccessors(TextStream &s,
+                                                   const AbstractMetaField &field)
 {
     const AbstractMetaType &metaType = field.type();
     QString fieldType = metaType.cppSignature();
diff --git a/sources/shiboken6/generator/shiboken/headergenerator.h b/sources/shiboken6/generator/shiboken/headergenerator.h
index 049ebd30a..e97c16b85 100644
--- a/sources/shiboken6/generator/shiboken/headergenerator.h
+++ b/sources/shiboken6/generator/shiboken/headergenerator.h
@@ -53,7 +53,8 @@ protected:
 
 private:
     void writeCopyCtor(TextStream &s, const AbstractMetaClass *metaClass) const;
-    void writeProtectedFieldAccessors(TextStream &s, const AbstractMetaField &field) const;
+    static void writeProtectedFieldAccessors(TextStream &s,
+                                             const AbstractMetaField &field);
     void writeFunction(TextStream &s, const AbstractMetaFunctionCPtr &func);
     void writeSbkTypeFunction(TextStream &s, const AbstractMetaEnum &cppEnum) const;
     void writeSbkTypeFunction(TextStream &s, const AbstractMetaClass *cppClass) const;
diff --git a/sources/shiboken6/generator/shiboken/shibokengenerator.cpp b/sources/shiboken6/generator/shiboken/shibokengenerator.cpp
index 26135a01e..9c9f34d31 100644
--- a/sources/shiboken6/generator/shiboken/shibokengenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/shibokengenerator.cpp
@@ -1426,7 +1426,7 @@ void ShibokenGenerator::writeFunctionCall(TextStream &s,
     s << ')';
 }
 
-void ShibokenGenerator::writeUnusedVariableCast(TextStream &s, const QString &variableName) const
+void ShibokenGenerator::writeUnusedVariableCast(TextStream &s, const QString &variableName)
 {
     s << "SBK_UNUSED(" << variableName<< ")\n";
 }
diff --git a/sources/shiboken6/generator/shiboken/shibokengenerator.h b/sources/shiboken6/generator/shiboken/shibokengenerator.h
index 321c70303..3269f3c92 100644
--- a/sources/shiboken6/generator/shiboken/shibokengenerator.h
+++ b/sources/shiboken6/generator/shiboken/shibokengenerator.h
@@ -359,7 +359,7 @@ protected:
                            const AbstractMetaFunctionCPtr &metaFunc,
                            Options options = NoOption) const;
 
-    void writeUnusedVariableCast(TextStream &s, const QString &variableName) const;
+    static void writeUnusedVariableCast(TextStream &s, const QString &variableName);
 
     AbstractMetaFunctionCList filterFunctions(const AbstractMetaClass *metaClass) const;