shiboken6: Fix coding style regarding pointers (Type* v -> Type *v)

As a drive-by, introduce some auto and streamline the code.

Pick-to: 6.4
Change-Id: If84a3721a50b2e00b473ba78cba184f1a35d326b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

54 files changed, 270 insertions, 268 deletions

diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
index 12569cdb5..5d3321f50 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
@@ -1521,8 +1521,9 @@ bool AbstractMetaBuilderPrivate::setupInheritance(AbstractMetaClass *metaClass)
     // we only support our own containers and ONLY if there is only one baseclass
     if (baseClasses.size() == 1 && baseClasses.constFirst().contains(u'<')) {
         TypeInfo info;
-        ComplexTypeEntry* baseContainerType;
-        AbstractMetaClass* templ = findTemplateClass(baseClasses.constFirst(), metaClass, &info, &baseContainerType);
+        ComplexTypeEntry *baseContainerType;
+        auto *templ = findTemplateClass(baseClasses.constFirst(), metaClass,
+                                        &info, &baseContainerType);
         if (templ) {
             setupInheritance(templ);
             inheritTemplate(metaClass, templ, info);
@@ -1548,9 +1549,9 @@ bool AbstractMetaBuilderPrivate::setupInheritance(AbstractMetaClass *metaClass)
         return false;
     }
 
-    TypeDatabase* types = TypeDatabase::instance();
+    auto *types = TypeDatabase::instance();
 
-    for (const auto  &baseClassName : baseClasses) {
+    for (const auto &baseClassName : baseClasses) {
         if (!types->isClassRejected(baseClassName)) {
             auto typeEntry = types->findType(baseClassName);
             if (typeEntry == nullptr || !typeEntry->isComplex()) {
@@ -2181,9 +2182,10 @@ AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(const Functio
     return metaFunction;
 }
 
-static const TypeEntry* findTypeEntryUsingContext(const AbstractMetaClass* metaClass, const QString& qualifiedName)
+static const TypeEntry *findTypeEntryUsingContext(const AbstractMetaClass *metaClass,
+                                                  const QString& qualifiedName)
 {
-    const TypeEntry* type = nullptr;
+    const TypeEntry *type = nullptr;
     QStringList context = metaClass->qualifiedCppName().split(colonColon());
     while (!type && !context.isEmpty()) {
         type = TypeDatabase::instance()->findType(context.join(colonColon()) + colonColon() + qualifiedName);
@@ -2915,14 +2917,14 @@ bool AbstractMetaBuilderPrivate::isEnum(const FileModelItem &dom, const QStringL
     return item && item->kind() == _EnumModelItem::__node_kind;
 }
 
-AbstractMetaClass* AbstractMetaBuilderPrivate::findTemplateClass(const QString &name,
+AbstractMetaClass *AbstractMetaBuilderPrivate::findTemplateClass(const QString &name,
                                                                  const AbstractMetaClass *context,
                                                                  TypeInfo *info,
                                                                  ComplexTypeEntry **baseContainerType) const
 {
     if (baseContainerType)
         *baseContainerType = nullptr;
-    TypeDatabase* types = TypeDatabase::instance();
+    auto *types = TypeDatabase::instance();
 
     QStringList scope = context->typeEntry()->qualifiedCppName().split(colonColon());
     QString errorMessage;
diff --git a/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp b/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp
index ae782f9e9..4d115e8b7 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp
@@ -71,7 +71,7 @@ public:
     mutable QString m_cachedModifiedName;
     QString m_unresolvedSignature;
 
-    FunctionTypeEntry* m_typeEntry = nullptr;
+    FunctionTypeEntry *m_typeEntry = nullptr;
     AbstractMetaFunction::FunctionType m_functionType = AbstractMetaFunction::NormalFunction;
     AbstractMetaType m_type;
     QString m_modifiedTypeName;
diff --git a/sources/shiboken6/ApiExtractor/abstractmetafunction.h b/sources/shiboken6/ApiExtractor/abstractmetafunction.h
index 805f8d475..1e7016d41 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetafunction.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetafunction.h
@@ -380,9 +380,9 @@ public:
     int propertySpecIndex() const;
     void setPropertySpecIndex(int i);
 
-    FunctionTypeEntry* typeEntry() const;
+    FunctionTypeEntry *typeEntry() const;
 
-    void setTypeEntry(FunctionTypeEntry* typeEntry);
+    void setTypeEntry(FunctionTypeEntry *typeEntry);
 
     bool isCallOperator() const;
 
diff --git a/sources/shiboken6/ApiExtractor/abstractmetalang.h b/sources/shiboken6/ApiExtractor/abstractmetalang.h
index 2c14b8dbe..8e8c451c4 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetalang.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetalang.h
@@ -210,7 +210,7 @@ public:
     void setExtendedNamespace(const AbstractMetaClass *e);
 
     const AbstractMetaClassCList &innerClasses() const;
-    void addInnerClass(AbstractMetaClass* cl);
+    void addInnerClass(AbstractMetaClass *cl);
     void setInnerClasses(const AbstractMetaClassCList &innerClasses);
 
     QString package() const;
@@ -323,9 +323,9 @@ public:
     static const AbstractMetaClass *findClass(const AbstractMetaClassCList &classes,
                                               QStringView name);
     static AbstractMetaClass *findClass(const AbstractMetaClassList &classes,
-                                        const TypeEntry* typeEntry);
+                                        const TypeEntry *typeEntry);
     static const AbstractMetaClass *findClass(const AbstractMetaClassCList &classes,
-                                              const TypeEntry* typeEntry);
+                                              const TypeEntry *typeEntry);
     const AbstractMetaClass *findBaseClass(const QString &qualifiedName) const;
 
     static std::optional<AbstractMetaEnumValue> findEnumValue(const AbstractMetaClassList &classes,
diff --git a/sources/shiboken6/ApiExtractor/apiextractor.cpp b/sources/shiboken6/ApiExtractor/apiextractor.cpp
index 890c4c9e2..8c0286f7d 100644
--- a/sources/shiboken6/ApiExtractor/apiextractor.cpp
+++ b/sources/shiboken6/ApiExtractor/apiextractor.cpp
@@ -69,7 +69,7 @@ struct ApiExtractorPrivate
     QFileInfoList m_cppFileNames;
     HeaderPaths m_includePaths;
     QStringList m_clangOptions;
-    AbstractMetaBuilder* m_builder = nullptr;
+    AbstractMetaBuilder *m_builder = nullptr;
     QString m_logDirectory;
     LanguageLevel m_languageLevel = LanguageLevel::Default;
     bool m_skipDeprecated = false;
diff --git a/sources/shiboken6/ApiExtractor/apiextractorresult.h b/sources/shiboken6/ApiExtractor/apiextractorresult.h
index d683b54fe..8c32f2b57 100644
--- a/sources/shiboken6/ApiExtractor/apiextractorresult.h
+++ b/sources/shiboken6/ApiExtractor/apiextractorresult.h
@@ -44,7 +44,7 @@ public:
     const InstantiatedSmartPointers &instantiatedSmartPointers() const;
 
     // Query functions for the generators
-    std::optional<AbstractMetaEnum> findAbstractMetaEnum(const TypeEntry* typeEntry) const;
+    std::optional<AbstractMetaEnum> findAbstractMetaEnum(const TypeEntry *typeEntry) const;
 
     /// Retrieves a list of constructors used in implicit conversions
     /// available on the given type. The TypeEntry must be a value-type
diff --git a/sources/shiboken6/ApiExtractor/docparser.cpp b/sources/shiboken6/ApiExtractor/docparser.cpp
index b15dd52e6..4b092593c 100644
--- a/sources/shiboken6/ApiExtractor/docparser.cpp
+++ b/sources/shiboken6/ApiExtractor/docparser.cpp
@@ -86,7 +86,7 @@ bool DocParser::skipForQuery(const AbstractMetaFunctionCPtr &func)
                        usesRValueReference);
 }
 
-DocModificationList DocParser::getDocModifications(const AbstractMetaClass* cppClass,
+DocModificationList DocParser::getDocModifications(const AbstractMetaClass *cppClass,
                                                    const AbstractMetaFunctionCPtr &func)
 {
     auto *te = cppClass->typeEntry();
diff --git a/sources/shiboken6/ApiExtractor/docparser.h b/sources/shiboken6/ApiExtractor/docparser.h
index 9cb55aa33..88643b7bf 100644
--- a/sources/shiboken6/ApiExtractor/docparser.h
+++ b/sources/shiboken6/ApiExtractor/docparser.h
@@ -26,7 +26,7 @@ public:
 
     DocParser();
     virtual ~DocParser();
-    virtual void fillDocumentation(AbstractMetaClass* metaClass) = 0;
+    virtual void fillDocumentation(AbstractMetaClass *metaClass) = 0;
 
     /**
      *   Process and retrieves documentation concerning the entire
@@ -93,7 +93,7 @@ public:
 
     /// Helper to return the documentation modifications for a class
     /// or a member function.
-    static DocModificationList getDocModifications(const AbstractMetaClass* cppClass,
+    static DocModificationList getDocModifications(const AbstractMetaClass *cppClass,
                                                    const AbstractMetaFunctionCPtr &func = {});
 
     static QString enumBaseClass(const AbstractMetaEnum &e);
diff --git a/sources/shiboken6/ApiExtractor/doxygenparser.cpp b/sources/shiboken6/ApiExtractor/doxygenparser.cpp
index a6c712946..8f608cbc8 100644
--- a/sources/shiboken6/ApiExtractor/doxygenparser.cpp
+++ b/sources/shiboken6/ApiExtractor/doxygenparser.cpp
@@ -41,7 +41,7 @@ Documentation DoxygenParser::retrieveModuleDocumentation()
         return retrieveModuleDocumentation(packageName());
 }
 
-void DoxygenParser::fillDocumentation(AbstractMetaClass* metaClass)
+void DoxygenParser::fillDocumentation(AbstractMetaClass *metaClass)
 {
     if (!metaClass)
         return;
diff --git a/sources/shiboken6/ApiExtractor/enumvaluetypeentry.h b/sources/shiboken6/ApiExtractor/enumvaluetypeentry.h
index 730631b0a..70c05fa8d 100644
--- a/sources/shiboken6/ApiExtractor/enumvaluetypeentry.h
+++ b/sources/shiboken6/ApiExtractor/enumvaluetypeentry.h
@@ -15,12 +15,12 @@ class EnumValueTypeEntryPrivate;
 class EnumValueTypeEntry : public TypeEntry
 {
 public:
-    explicit EnumValueTypeEntry(const QString& name, const QString& value,
-                                const EnumTypeEntry* enclosingEnum,
+    explicit EnumValueTypeEntry(const QString& name, const QString &value,
+                                const EnumTypeEntry *enclosingEnum,
                                 bool isScopedEnum, const QVersionNumber &vr);
 
     QString value() const;
-    const EnumTypeEntry* enclosingEnum() const;
+    const EnumTypeEntry *enclosingEnum() const;
 
     TypeEntry *clone() const override;
 
diff --git a/sources/shiboken6/ApiExtractor/messages.cpp b/sources/shiboken6/ApiExtractor/messages.cpp
index 2fb16e671..06c10a49b 100644
--- a/sources/shiboken6/ApiExtractor/messages.cpp
+++ b/sources/shiboken6/ApiExtractor/messages.cpp
@@ -759,7 +759,7 @@ QString msgEnclosingClassNotFound(const TypeEntry *t)
     return result;
 }
 
-QString msgUnknownOperator(const AbstractMetaFunction* func)
+QString msgUnknownOperator(const AbstractMetaFunction *func)
 {
     QString result = u"Unknown operator: \""_s + func->originalName()
                      + u'"';
diff --git a/sources/shiboken6/ApiExtractor/messages.h b/sources/shiboken6/ApiExtractor/messages.h
index ffece3348..896ca1b82 100644
--- a/sources/shiboken6/ApiExtractor/messages.h
+++ b/sources/shiboken6/ApiExtractor/messages.h
@@ -219,7 +219,7 @@ QString msgClassNotFound(const TypeEntry *t);
 
 QString msgEnclosingClassNotFound(const TypeEntry *t);
 
-QString msgUnknownOperator(const AbstractMetaFunction* func);
+QString msgUnknownOperator(const AbstractMetaFunction *func);
 
 QString msgWrongIndex(const char *varName, const QString &capture,
                       const AbstractMetaFunction *func);
diff --git a/sources/shiboken6/ApiExtractor/primitivetypeentry.h b/sources/shiboken6/ApiExtractor/primitivetypeentry.h
index 8bc26f76f..f9864eb66 100644
--- a/sources/shiboken6/ApiExtractor/primitivetypeentry.h
+++ b/sources/shiboken6/ApiExtractor/primitivetypeentry.h
@@ -34,19 +34,19 @@ public:
      *   Defines type referenced by this entry.
      *   \param referencedTypeEntry type referenced by this entry
      */
-    void setReferencedTypeEntry(PrimitiveTypeEntry* referencedTypeEntry);
+    void setReferencedTypeEntry(PrimitiveTypeEntry *referencedTypeEntry);
 
     /// Finds the most basic primitive type that the typedef represents,
     /// i.e. a type that is not an typedef'ed.
     /// \return the most basic non-typedef'ed primitive type represented
     /// by this typedef or self in case it is not a reference.
-    const PrimitiveTypeEntry* basicReferencedTypeEntry() const;
+    const PrimitiveTypeEntry *basicReferencedTypeEntry() const;
 
     /// Finds the basic primitive type that the typedef represents
     /// and was explicitly specified in the type system.
     /// \return the basic primitive type that was explicitly specified in
     /// the type system.
-    const PrimitiveTypeEntry* basicReferencedNonBuiltinTypeEntry() const;
+    const PrimitiveTypeEntry *basicReferencedNonBuiltinTypeEntry() const;
 
     /// Returns whether this entry references another entry.
     bool referencesType() const;
diff --git a/sources/shiboken6/ApiExtractor/qtdocparser.cpp b/sources/shiboken6/ApiExtractor/qtdocparser.cpp
index 236ca4c31..c5e99bb39 100644
--- a/sources/shiboken6/ApiExtractor/qtdocparser.cpp
+++ b/sources/shiboken6/ApiExtractor/qtdocparser.cpp
@@ -102,7 +102,7 @@ static QString formatFunctionArgTypeQuery(const AbstractMetaType &metaType)
 
 QString QtDocParser::functionDocumentation(const QString &sourceFileName,
                                            const ClassDocumentation &classDocumentation,
-                                           const AbstractMetaClass* metaClass,
+                                           const AbstractMetaClass *metaClass,
                                            const AbstractMetaFunctionCPtr &func,
                                            QString *errorMessage)
 {
@@ -119,7 +119,7 @@ QString QtDocParser::functionDocumentation(const QString &sourceFileName,
 
 QString QtDocParser::queryFunctionDocumentation(const QString &sourceFileName,
                                                 const ClassDocumentation &classDocumentation,
-                                                const AbstractMetaClass* metaClass,
+                                                const AbstractMetaClass *metaClass,
                                                 const AbstractMetaFunctionCPtr &func,
                                                 QString *errorMessage)
 {
@@ -213,12 +213,12 @@ static QString extractBrief(QString *value)
     return briefValue;
 }
 
-void QtDocParser::fillDocumentation(AbstractMetaClass* metaClass)
+void QtDocParser::fillDocumentation(AbstractMetaClass *metaClass)
 {
     if (!metaClass)
         return;
 
-    const AbstractMetaClass* context = metaClass->enclosingClass();
+    auto *context = metaClass->enclosingClass();
     while(context) {
         if (context->enclosingClass() == nullptr)
             break;
diff --git a/sources/shiboken6/ApiExtractor/qtdocparser.h b/sources/shiboken6/ApiExtractor/qtdocparser.h
index 91d0a4557..402664217 100644
--- a/sources/shiboken6/ApiExtractor/qtdocparser.h
+++ b/sources/shiboken6/ApiExtractor/qtdocparser.h
@@ -12,20 +12,20 @@ class QtDocParser : public DocParser
 {
 public:
     QtDocParser() = default;
-    void fillDocumentation(AbstractMetaClass* metaClass) override;
+    void fillDocumentation(AbstractMetaClass *metaClass) override;
     Documentation retrieveModuleDocumentation() override;
     Documentation retrieveModuleDocumentation(const QString& name) override;
 
 private:
     static QString functionDocumentation(const QString &sourceFileName,
                                          const ClassDocumentation &classDocumentation,
-                                         const AbstractMetaClass* metaClass,
+                                         const AbstractMetaClass *metaClass,
                                          const AbstractMetaFunctionCPtr &func,
                                          QString *errorMessage);
 
     static QString queryFunctionDocumentation(const QString &sourceFileName,
                                               const ClassDocumentation &classDocumentation,
-                                              const AbstractMetaClass* metaClass,
+                                              const AbstractMetaClass *metaClass,
                                               const AbstractMetaFunctionCPtr &func,
                                               QString *errorMessage);
 };
diff --git a/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp
index 2dc6e2cab..8021810b3 100644
--- a/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp
@@ -18,8 +18,10 @@ using namespace Qt::StringLiterals;
 
 void TestAbstractMetaClass::testClassName()
 {
-    const char* cppCode ="class ClassName {};";
-    const char* xmlCode = "<typesystem package=\"Foo\"><value-type name=\"ClassName\"/></typesystem>";
+    const char cppCode[] = "class ClassName {};";
+    const char xmlCode[] = R"(<typesystem package="Foo">
+    <value-type name="ClassName"/>
+</typesystem>)";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
@@ -29,8 +31,8 @@ void TestAbstractMetaClass::testClassName()
 
 void TestAbstractMetaClass::testClassNameUnderNamespace()
 {
-    const char* cppCode ="namespace Namespace { class ClassName {}; }\n";
-    const char* xmlCode = R"XML(
+    const char cppCode[] = "namespace Namespace { class ClassName {}; }\n";
+    const char xmlCode[] = R"XML(
     <typesystem package="Foo">
         <namespace-type name="Namespace">
             <value-type name="ClassName"/>
@@ -111,15 +113,13 @@ public:
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 4);
-    AbstractMetaClass* a = AbstractMetaClass::findClass(classes, u"A");
-    AbstractMetaClass* b = AbstractMetaClass::findClass(classes, u"B");
-    AbstractMetaClass* c = AbstractMetaClass::findClass(classes, u"C");
+    auto *a = AbstractMetaClass::findClass(classes, u"A");
+    auto *b = AbstractMetaClass::findClass(classes, u"B");
+    auto *c = AbstractMetaClass::findClass(classes, u"C");
     const AbstractMetaClass *f = AbstractMetaClass::findClass(classes, u"F");
     QVERIFY(f);
 
-    AbstractMetaClass* no_class = nullptr;
-
-    QCOMPARE(a->baseClass(), no_class);
+    QCOMPARE(a->baseClass(), nullptr);
     QCOMPARE(b->baseClass(), a);
     QCOMPARE(c->baseClass(), b);
     QCOMPARE(f->baseClass(), c);
@@ -206,12 +206,12 @@ class Derived : public Base {};
 
 void TestAbstractMetaClass::testDefaultValues()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {\n\
         class B {};\n\
         void method(B b = B());\n\
     };\n";
-    const char* xmlCode = R"XML(
+    const char xmlCode[] = R"XML(
     <typesystem package="Foo">
         <value-type name='A'>
             <value-type name='B'/>
@@ -221,7 +221,7 @@ void TestAbstractMetaClass::testDefaultValues()
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 2);
-    AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A");
+    auto *classA = AbstractMetaClass::findClass(classes, u"A");
     const auto candidates = classA->queryFunctionsByName(u"method"_s);
     QCOMPARE(candidates.size(), 1);
     const auto &method = candidates.constFirst();
@@ -231,12 +231,12 @@ void TestAbstractMetaClass::testDefaultValues()
 
 void TestAbstractMetaClass::testModifiedDefaultValues()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {\n\
         class B {};\n\
         void method(B b = B());\n\
     };\n";
-    const char* xmlCode = R"XML(
+    const char xmlCode[] = R"XML(
     <typesystem package="Foo">
         <value-type name='A'>
             <modify-function signature='method(A::B)'>
@@ -251,7 +251,7 @@ void TestAbstractMetaClass::testModifiedDefaultValues()
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 2);
-    AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A");
+    auto *classA = AbstractMetaClass::findClass(classes, u"A");
     const auto methodMatches = classA->queryFunctionsByName(u"method"_s);
     QCOMPARE(methodMatches.size(), 1);
     const auto method = methodMatches.constFirst();
@@ -262,12 +262,12 @@ void TestAbstractMetaClass::testModifiedDefaultValues()
 
 void TestAbstractMetaClass::testInnerClassOfAPolymorphicOne()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {\n\
         class B {};\n\
         virtual void method();\n\
     };\n";
-    const char* xmlCode = R"XML(
+    const char xmlCode[] = R"XML(
     <typesystem package="Foo">
         <object-type name='A'>
             <value-type name='B'/>
@@ -361,7 +361,7 @@ void TestAbstractMetaClass::testSpecialFunctions()
 
 void TestAbstractMetaClass::testClassDefaultConstructors()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {};\n\
     \n\
     struct B {\n\
@@ -387,7 +387,7 @@ void TestAbstractMetaClass::testClassDefaultConstructors()
     struct F {\n\
         F(int, int);\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='int'/>\n\
         <value-type name='A'/>\n\
@@ -403,7 +403,7 @@ void TestAbstractMetaClass::testClassDefaultConstructors()
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 6);
 
-    AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A");
+    auto *classA = AbstractMetaClass::findClass(classes, u"A");
     QVERIFY(classA);
     QCOMPARE(classA->functions().size(), 2);
 
@@ -417,28 +417,28 @@ void TestAbstractMetaClass::testClassDefaultConstructors()
     QCOMPARE(ctors[1]->arguments().size(), 1);
     QCOMPARE(ctors[1]->minimalSignature(), u"A(A)");
 
-    AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, u"B");
+    auto *classB = AbstractMetaClass::findClass(classes, u"B");
     QVERIFY(classB);
     QCOMPARE(classB->functions().size(), 2);
     QCOMPARE(classB->functions().constFirst()->minimalSignature(), u"B()");
 
-    AbstractMetaClass* classC = AbstractMetaClass::findClass(classes, u"C");
+    auto *classC = AbstractMetaClass::findClass(classes, u"C");
     QVERIFY(classC);
     QCOMPARE(classC->functions().size(), 1);
     QCOMPARE(classC->functions().constFirst()->minimalSignature(), u"C(C)");
 
-    AbstractMetaClass* classD = AbstractMetaClass::findClass(classes, u"D");
+    auto *classD = AbstractMetaClass::findClass(classes, u"D");
     QVERIFY(classD);
     QCOMPARE(classD->functions().size(), 1);
     QCOMPARE(classD->functions().constFirst()->minimalSignature(), u"D(D)");
     QVERIFY(classD->functions().constFirst()->isPrivate());
 
-    AbstractMetaClass* classE = AbstractMetaClass::findClass(classes, u"E");
+    auto *classE = AbstractMetaClass::findClass(classes, u"E");
     QVERIFY(classE);
     QVERIFY(classE->hasPrivateDestructor());
     QCOMPARE(classE->functions().size(), 0);
 
-    AbstractMetaClass* classF = AbstractMetaClass::findClass(classes, u"F");
+    auto *classF = AbstractMetaClass::findClass(classes, u"F");
     QVERIFY(classF);
 
     ctors = classF->queryFunctions(FunctionQueryOption::AnyConstructor);
@@ -454,14 +454,14 @@ void TestAbstractMetaClass::testClassDefaultConstructors()
 
 void TestAbstractMetaClass::testClassInheritedDefaultConstructors()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {\n\
         A();\n\
     private: \n\
         A(const A&);\n\
     };\n\
     struct B : public A {};\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <object-type name='A'/>\n\
         <object-type name='B'/>\n\
@@ -471,7 +471,7 @@ void TestAbstractMetaClass::testClassInheritedDefaultConstructors()
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 2);
-    AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A");
+    auto *classA = AbstractMetaClass::findClass(classes, u"A");
     QVERIFY(classA);
 
     auto ctors = classA->queryFunctions(FunctionQueryOption::AnyConstructor);
@@ -485,7 +485,7 @@ void TestAbstractMetaClass::testClassInheritedDefaultConstructors()
     QCOMPARE(ctors[1]->minimalSignature(), u"A(A)");
     QVERIFY(ctors[1]->isPrivate());
 
-    AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, u"B");
+    auto *classB = AbstractMetaClass::findClass(classes, u"B");
     QVERIFY(classB);
 
     ctors = classB->queryFunctions(FunctionQueryOption::Constructors);
@@ -496,11 +496,11 @@ void TestAbstractMetaClass::testClassInheritedDefaultConstructors()
 
 void TestAbstractMetaClass::testAbstractClassDefaultConstructors()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {\n\
         virtual void method() = 0;\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <object-type name='A'/>\n\
     </typesystem>\n";
@@ -509,7 +509,7 @@ void TestAbstractMetaClass::testAbstractClassDefaultConstructors()
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 1);
-    AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A");
+    auto *classA = AbstractMetaClass::findClass(classes, u"A");
     QVERIFY(classA);
 
     const auto ctors = classA->queryFunctions(FunctionQueryOption::Constructors);
@@ -520,8 +520,8 @@ void TestAbstractMetaClass::testAbstractClassDefaultConstructors()
 
 void TestAbstractMetaClass::testObjectTypesMustNotHaveCopyConstructors()
 {
-    const char* cppCode ="struct A {};\n";
-    const char* xmlCode = "\
+    const char cppCode[] = "struct A {};\n";
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <object-type name='A'/>\n\
     </typesystem>\n";
@@ -530,7 +530,7 @@ void TestAbstractMetaClass::testObjectTypesMustNotHaveCopyConstructors()
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 1);
-    AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A");
+    auto *classA = AbstractMetaClass::findClass(classes, u"A");
     QVERIFY(classA);
 
     const auto ctors = classA->queryFunctions(FunctionQueryOption::Constructors);
@@ -541,7 +541,7 @@ void TestAbstractMetaClass::testObjectTypesMustNotHaveCopyConstructors()
 
 void TestAbstractMetaClass::testIsPolymorphic()
 {
-    const char* cppCode = "\
+    const char cppCode[] = "\
     class A\n\
     {\n\
     public:\n\
@@ -555,7 +555,7 @@ void TestAbstractMetaClass::testIsPolymorphic()
         B();\n\
         inline bool abc() const { return false; }\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='bool'/>\n\
         <value-type name='A'/>\n\
@@ -566,10 +566,10 @@ void TestAbstractMetaClass::testIsPolymorphic()
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 2);
-    AbstractMetaClass* b = AbstractMetaClass::findClass(classes, u"A");
+    auto *b = AbstractMetaClass::findClass(classes, u"A");
 
     QVERIFY(!b->isPolymorphic());
-    AbstractMetaClass* a = AbstractMetaClass::findClass(classes, u"B");
+    auto *a = AbstractMetaClass::findClass(classes, u"B");
     QVERIFY(!a->isPolymorphic());
 }
 
diff --git a/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp b/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp
index ba4e86088..072764155 100644
--- a/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp
@@ -48,8 +48,8 @@ void TestAbstractMetaType::parsing()
 
 void TestAbstractMetaType::testConstCharPtrType()
 {
-    const char* cppCode ="const char* justAtest();\n";
-    const char* xmlCode = "<typesystem package=\"Foo\">\n\
+    const char cppCode[] = "const char* justAtest();\n";
+    const char xmlCode[] = "<typesystem package=\"Foo\">\n\
         <primitive-type name='char'/>\n\
         <function signature='justAtest()' />\n\
     </typesystem>\n";
@@ -75,9 +75,9 @@ void TestAbstractMetaType::testConstCharPtrType()
 
 void TestAbstractMetaType::testApiVersionSupported()
 {
-    const char* cppCode ="class foo {}; class foo2 {};\n\
+    const char cppCode[] = "class foo {}; class foo2 {};\n\
                           void justAtest(); void justAtest3();\n";
-    const char* xmlCode = "<typesystem package='Foo'>\n\
+    const char xmlCode[] = "<typesystem package='Foo'>\n\
         <value-type name='foo' since='0.1'/>\n\
         <value-type name='foo2' since='1.0'/>\n\
         <value-type name='foo3' since='1.1'/>\n\
@@ -99,8 +99,8 @@ void TestAbstractMetaType::testApiVersionSupported()
 
 void TestAbstractMetaType::testApiVersionNotSupported()
 {
-    const char* cppCode ="class object {};\n";
-    const char* xmlCode = "<typesystem package='Foo'>\n\
+    const char cppCode[] = "class object {};\n";
+    const char xmlCode[] = "<typesystem package='Foo'>\n\
         <value-type name='object' since='0.1'/>\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode,
@@ -113,8 +113,8 @@ void TestAbstractMetaType::testApiVersionNotSupported()
 
 void TestAbstractMetaType::testCharType()
 {
-    const char* cppCode ="char justAtest(); class A {};\n";
-    const char* xmlCode = "<typesystem package=\"Foo\">\n\
+    const char cppCode[] = "char justAtest(); class A {};\n";
+    const char xmlCode[] = "<typesystem package=\"Foo\">\n\
     <primitive-type name='char'/>\n\
     <value-type name='A'/>\n\
     <function signature='justAtest()'/>\n\
@@ -147,13 +147,13 @@ void TestAbstractMetaType::testCharType()
 
 void TestAbstractMetaType::testTypedef()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {\n\
         void someMethod();\n\
     };\n\
     typedef A B;\n\
     typedef B C;\n";
-    const char* xmlCode = "<typesystem package=\"Foo\">\n\
+    const char xmlCode[] = "<typesystem package=\"Foo\">\n\
     <value-type name='C' />\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
@@ -168,7 +168,7 @@ void TestAbstractMetaType::testTypedef()
 
 void TestAbstractMetaType::testTypedefWithTemplates()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     template<typename T>\n\
     class A {};\n\
     \n\
@@ -176,7 +176,7 @@ void TestAbstractMetaType::testTypedefWithTemplates()
     typedef A<B> C;\n\
     \n\
     void func(C c);\n";
-    const char* xmlCode = "<typesystem package=\"Foo\">\n\
+    const char xmlCode[] = "<typesystem package=\"Foo\">\n\
     <container-type name='A' type='list'/>\n\
     <value-type name='B' />\n\
     <function signature='func(A&lt;B&gt;)'/>\n\
@@ -199,11 +199,11 @@ void TestAbstractMetaType::testTypedefWithTemplates()
 
 void TestAbstractMetaType::testObjectTypeUsedAsValue()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     class A {\n\
         void method(A);\n\
     };\n";
-    const char* xmlCode = "<typesystem package='Foo'>\n\
+    const char xmlCode[] = "<typesystem package='Foo'>\n\
     <object-type name='A'/>\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
diff --git a/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp b/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp
index c91358211..72cf34693 100644
--- a/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp
@@ -103,7 +103,7 @@ struct A {
 
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
     QVERIFY(!builder.isNull());
-    TypeDatabase* typeDb = TypeDatabase::instance();
+    auto *typeDb = TypeDatabase::instance();
     AbstractMetaClassList classes = builder->classes();
     const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A");
     QVERIFY(classA);
@@ -290,7 +290,7 @@ void TestAddFunction::testAddFunctionAtModuleLevel()
     const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A");
     QVERIFY(classA);
 
-    TypeDatabase* typeDb = TypeDatabase::instance();
+    auto *typeDb = TypeDatabase::instance();
 
     AddedFunctionList addedFuncs = typeDb->findGlobalUserFunctions(u"func"_s);
 
@@ -426,7 +426,7 @@ void TestAddFunction::testModifyAddedFunction()
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
-    AbstractMetaClass* foo = AbstractMetaClass::findClass(classes, u"Foo");
+    auto *foo = AbstractMetaClass::findClass(classes, u"Foo");
     const auto method = foo->findFunction(u"method");
     QVERIFY(!method.isNull());
     QCOMPARE(method->arguments().size(), 2);
@@ -453,7 +453,7 @@ void TestAddFunction::testAddFunctionOnTypedef()
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
-    AbstractMetaClass* foo = AbstractMetaClass::findClass(classes, u"FooInt");
+    auto *foo = AbstractMetaClass::findClass(classes, u"FooInt");
     QVERIFY(foo);
     QVERIFY(foo->hasNonPrivateConstructor());
     const auto &lst = foo->queryFunctions(FunctionQueryOption::AnyConstructor);
diff --git a/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp b/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp
index 1a02674ea..e7c3a0106 100644
--- a/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp
@@ -19,12 +19,12 @@ using namespace Qt::StringLiterals;
 
 void TestArrayArgument::testArrayArgumentWithSizeDefinedByInteger()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {\n\
         enum SomeEnum { Value0, Value1, NValues };\n\
         void method(double[3]);\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='double'/>\n\
         <object-type name='A'>\n\
@@ -93,12 +93,12 @@ void TestArrayArgument::testArraySignature()
 
 void TestArrayArgument::testArrayArgumentWithSizeDefinedByEnumValue()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {\n\
         enum SomeEnum { Value0, Value1, NValues };\n\
         void method(double[NValues]);\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='double'/>\n\
         <object-type name='A'>\n\
@@ -124,12 +124,12 @@ void TestArrayArgument::testArrayArgumentWithSizeDefinedByEnumValue()
 
 void TestArrayArgument::testArrayArgumentWithSizeDefinedByEnumValueFromGlobalEnum()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     enum SomeEnum { Value0, Value1, NValues };\n\
     struct A {\n\
         void method(double[NValues]);\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='double'/>\n\
         <enum-type name='SomeEnum'/>\n\
diff --git a/sources/shiboken6/ApiExtractor/tests/testcodeinjection.cpp b/sources/shiboken6/ApiExtractor/tests/testcodeinjection.cpp
index 261ff4a6c..c5d00345f 100644
--- a/sources/shiboken6/ApiExtractor/tests/testcodeinjection.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testcodeinjection.cpp
@@ -41,7 +41,7 @@ void TestCodeInjections::testReadFile()
     QFETCH(QString, snippet);
     QFETCH(QString, expected);
 
-    const char* cppCode ="struct A {};\n";
+    const char cppCode[] = "struct A {};\n";
     int argc = 0;
     char *argv[] = {nullptr};
     QCoreApplication app(argc, argv);
@@ -73,8 +73,8 @@ void TestCodeInjections::testReadFile()
 
 void TestCodeInjections::testInjectWithValidApiVersion()
 {
-    const char* cppCode ="struct A {};\n";
-    const char* xmlCode = "\
+    const char cppCode[] = "struct A {};\n";
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <value-type name='A'>\n\
             <inject-code class='target' since='1.0'>\n\
@@ -87,14 +87,14 @@ void TestCodeInjections::testInjectWithValidApiVersion()
                                                                 true, u"1.0"_s));
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
-    AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A");
+    auto *classA = AbstractMetaClass::findClass(classes, u"A");
     QCOMPARE(classA->typeEntry()->codeSnips().size(), 1);
 }
 
 void TestCodeInjections::testInjectWithInvalidApiVersion()
 {
-    const char* cppCode ="struct A {};\n";
-    const char* xmlCode  = "\
+    const char cppCode[] = "struct A {};\n";
+    const char xmlCode[]  = "\
     <typesystem package=\"Foo\">\n\
         <value-type name='A'>\n\
             <inject-code class='target' since='1.0'>\n\
diff --git a/sources/shiboken6/ApiExtractor/tests/testcontainer.cpp b/sources/shiboken6/ApiExtractor/tests/testcontainer.cpp
index 164409578..a4ac27cca 100644
--- a/sources/shiboken6/ApiExtractor/tests/testcontainer.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testcontainer.cpp
@@ -11,7 +11,7 @@
 
 void TestContainer::testContainerType()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     namespace std {\n\
     template<class T>\n\
     class list {\n\
@@ -20,7 +20,7 @@ void TestContainer::testContainerType()
     }\n\
     class A : public std::list<int> {\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <namespace-type name='std' generate='no' />\n\
         <container-type name='std::list' type='list' />\n\
@@ -32,7 +32,7 @@ void TestContainer::testContainerType()
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 2);
     //search for class A
-    AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A");
+    auto *classA = AbstractMetaClass::findClass(classes, u"A");
     QVERIFY(classA);
     auto baseContainer = classA->typeEntry()->baseContainerType();
     QVERIFY(baseContainer);
@@ -42,7 +42,7 @@ void TestContainer::testContainerType()
 
 void TestContainer::testListOfValueType()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     namespace std {\n\
     template<class T>\n\
     class list {\n\
@@ -52,7 +52,7 @@ void TestContainer::testListOfValueType()
     class ValueType {};\n\
     class A : public std::list<ValueType> {\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <namespace-type name='std' generate='no'/>\n\
         <container-type name='std::list' type='list'/>\n\
diff --git a/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp b/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp
index e5cb1329c..c17dda953 100644
--- a/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp
@@ -39,7 +39,7 @@ void TestConversionRuleTag::testConversionRuleTagWithFile()
     AbstractMetaClassList classes = builder->classes();
     const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A");
     QVERIFY(classA);
-    const ComplexTypeEntry* typeEntry = classA->typeEntry();
+    const ComplexTypeEntry *typeEntry = classA->typeEntry();
     QVERIFY(typeEntry->isValue());
     auto *vte = static_cast<const ValueTypeEntry *>(typeEntry);
     QVERIFY(vte->hasTargetConversionRule());
@@ -56,7 +56,7 @@ void TestConversionRuleTag::testConversionRuleTagReplace()
     struct B {\n\
         A createA();\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='int'/>\n\
         <primitive-type name='char'/>\n\
@@ -86,8 +86,8 @@ void TestConversionRuleTag::testConversionRuleTagReplace()
 
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
     QVERIFY(!builder.isNull());
-    TypeDatabase* typeDb = TypeDatabase::instance();
-    PrimitiveTypeEntry* typeA = typeDb->findPrimitiveType(u"A"_s);
+    auto *typeDb = TypeDatabase::instance();
+    auto *typeA = typeDb->findPrimitiveType(u"A"_s);
     QVERIFY(typeA);
 
     QVERIFY(typeA->hasCustomConversion());
@@ -114,7 +114,7 @@ void TestConversionRuleTag::testConversionRuleTagReplace()
     toNative = conversion->targetToNativeConversions().at(1);
     QCOMPARE(toNative.sourceTypeName(), u"B");
     QVERIFY(!toNative.isCustomType());
-    TypeEntry* typeB = typeDb->findType(u"B"_s);
+    auto *typeB = typeDb->findType(u"B"_s);
     QVERIFY(typeB);
     QCOMPARE(toNative.sourceType(), typeB);
     QCOMPARE(toNative.sourceTypeCheck(), u"CheckIfInputObjectIsB(%IN)");
@@ -137,7 +137,7 @@ void TestConversionRuleTag::testConversionRuleTagAdd()
         Date();\n\
         Date(int, int, int);\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='int'/>\n\
         <value-type name='Date'>\n\
@@ -182,7 +182,7 @@ if (!TargetDateTimeAPI) TargetDateTime_IMPORT;\n\
 void TestConversionRuleTag::testConversionRuleTagWithInsertTemplate()
 {
     const char cppCode[] = "struct A {};";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='int'/>\n\
         <!-- single line -->\n\
@@ -217,8 +217,8 @@ void TestConversionRuleTag::testConversionRuleTagWithInsertTemplate()
 
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
     QVERIFY(!builder.isNull());
-    TypeDatabase* typeDb = TypeDatabase::instance();
-    PrimitiveTypeEntry* typeA = typeDb->findPrimitiveType(u"A"_s);
+    auto *typeDb = TypeDatabase::instance();
+    auto *typeA = typeDb->findPrimitiveType(u"A"_s);
     QVERIFY(typeA);
 
     QVERIFY(typeA->hasCustomConversion());
diff --git a/sources/shiboken6/ApiExtractor/tests/testctorinformation.cpp b/sources/shiboken6/ApiExtractor/tests/testctorinformation.cpp
index 6e6a86d17..7579509ff 100644
--- a/sources/shiboken6/ApiExtractor/tests/testctorinformation.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testctorinformation.cpp
@@ -10,10 +10,10 @@
 
 void TestCtorInformation::testCtorIsPrivate()
 {
-    const char* cppCode = "class Control { public: Control() {} };\n\
+    const char cppCode[] = "class Control { public: Control() {} };\n\
                            class Subject { private: Subject() {} };\n\
                            class CtorLess { };\n";
-    const char* xmlCode = "<typesystem package='Foo'>\n\
+    const char xmlCode[] = "<typesystem package='Foo'>\n\
                                 <value-type name='Control'/>\n\
                                 <object-type name='Subject'/>\n\
                                 <value-type name='CtorLess'/>\n\
@@ -35,10 +35,10 @@ void TestCtorInformation::testCtorIsPrivate()
 
 void TestCtorInformation::testHasNonPrivateCtor()
 {
-    const char* cppCode = "template<typename T>\n\
+    const char cppCode[] = "template<typename T>\n\
                            struct Base { Base(double) {} };\n\
                            typedef Base<int> Derived;\n";
-    const char* xmlCode = "<typesystem package='Foo'>\n\
+    const char xmlCode[] = "<typesystem package='Foo'>\n\
                                 <primitive-type name='int'/>\n\
                                 <primitive-type name='double'/>\n\
                                 <object-type name='Base' generate='no'/>\n\
diff --git a/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.cpp b/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.cpp
index b6f06458d..2e07b8cba 100644
--- a/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.cpp
@@ -14,7 +14,7 @@
 
 using namespace Qt::StringLiterals;
 
-static const char* cppCode ="\
+static const char cppCode[] = "\
     struct ValueA {};\n\
     struct ValueB {};\n\
     struct ObjectA {};\n\
@@ -29,7 +29,7 @@ static const char* cppCode ="\
     void funcA();\n\
     void funcB();\n";
 
-static const char* xmlCode = "\
+static const char xmlCode[] = "\
 <typesystem package='Foo'>\n\
     <value-type name='ValueA'/>\n\
     <value-type name='ValueB'/>\n\
@@ -71,7 +71,7 @@ void TestDropTypeEntries::testDropEntries()
     QCOMPARE(globalEnums.size(), 1);
     QCOMPARE(globalEnums.constFirst().name(), u"EnumA");
 
-    TypeDatabase* td = TypeDatabase::instance();
+    auto *td = TypeDatabase::instance();
     QVERIFY(td->findType(u"funcA"_s));
     QVERIFY(!td->findType(u"funcB"_s));
 }
@@ -92,17 +92,17 @@ void TestDropTypeEntries::testDontDropEntries()
 
     QCOMPARE(builder->globalEnums().size(), 2);
 
-    TypeDatabase* td = TypeDatabase::instance();
+    auto *td = TypeDatabase::instance();
     QVERIFY(td->findType(u"funcA"_s));
     QVERIFY(td->findType(u"funcB"_s));
 }
 
-static const char* cppCode2 ="\
+static const char cppCode2[] = "\
     struct ValueA {\n\
         void func();\n\
     };\n";
 
-static const char* xmlCode2 = R"(
+static const char xmlCode2[] = R"(
 <typesystem package='Foo'>
     <value-type name='ValueA'>
         <modify-function signature='func()' remove='all'/>
diff --git a/sources/shiboken6/ApiExtractor/tests/testdtorinformation.cpp b/sources/shiboken6/ApiExtractor/tests/testdtorinformation.cpp
index add5a42da..95b33243e 100644
--- a/sources/shiboken6/ApiExtractor/tests/testdtorinformation.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testdtorinformation.cpp
@@ -94,12 +94,12 @@ protected:
 
 void TestDtorInformation::testDtorFromBaseIsVirtual()
 {
-    const char* cppCode = R"CPP(class ControlBase { public: ~ControlBase() {} };
+    const char cppCode[] = R"CPP(class ControlBase { public: ~ControlBase() {} };
 class Control : public ControlBase {};
 class SubjectBase { public: virtual ~SubjectBase() {} };
 class Subject : public SubjectBase {};
 )CPP";
-    const char* xmlCode = R"XML(<typesystem package="Foo"><value-type name="ControlBase"/>
+    const char xmlCode[] = R"XML(<typesystem package="Foo"><value-type name="ControlBase"/>
 <value-type name="Control"/>"
 <value-type name="SubjectBase"/>"
 <value-type name="Subject"/>
diff --git a/sources/shiboken6/ApiExtractor/tests/testenum.cpp b/sources/shiboken6/ApiExtractor/tests/testenum.cpp
index 0d0bdda90..e54f1ce38 100644
--- a/sources/shiboken6/ApiExtractor/tests/testenum.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testenum.cpp
@@ -20,7 +20,7 @@ using namespace Qt::StringLiterals;
 
 void TestEnum::testEnumCppSignature()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     enum GlobalEnum { A, B };\n\
     \n\
     struct A {\n\
@@ -28,7 +28,7 @@ void TestEnum::testEnumCppSignature()
         void method(ClassEnum);\n\
     };\n\
     void func(A::ClassEnum);\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <enum-type name='GlobalEnum'/>\n\
         <value-type name='A'>\n\
@@ -78,12 +78,12 @@ void TestEnum::testEnumCppSignature()
 
 void TestEnum::testEnumWithApiVersion()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {\n\
         enum ClassEnum { EnumA, EnumB };\n\
         enum ClassEnum2 { EnumC, EnumD };\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <value-type name='A'>\n\
             <enum-type name='ClassEnum' since='0.1'/>\n\
@@ -101,13 +101,13 @@ void TestEnum::testEnumWithApiVersion()
 
 void TestEnum::testAnonymousEnum()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     enum { Global0, Global1 };\n\
     struct A {\n\
         enum { A0, A1 };\n\
         enum { isThis = true, isThat = false };\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <!-- Uses the first value of the enum to identify it. -->\n\
         <enum-type identified-by-value='Global0'/>\n\
@@ -164,10 +164,10 @@ void TestEnum::testAnonymousEnum()
 
 void TestEnum::testGlobalEnums()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     enum EnumA { A0, A1 };\n\
     enum EnumB { B0 = 2, B1 = 0x4 };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <enum-type name='EnumA'/>\n\
         <enum-type name='EnumB'/>\n\
@@ -208,12 +208,12 @@ void TestEnum::testGlobalEnums()
 
 void TestEnum::testEnumValueFromNeighbourEnum()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     namespace A {\n\
         enum EnumA { ValueA0, ValueA1 };\n\
         enum EnumB { ValueB0 = A::ValueA1, ValueB1 = ValueA0 };\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <namespace-type name='A'>\n\
             <enum-type name='EnumA'/>\n\
@@ -259,7 +259,7 @@ void TestEnum::testEnumValueFromNeighbourEnum()
 
 void TestEnum::testEnumValueFromExpression()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {\n\
         enum EnumA : unsigned {\n\
             ValueA0 = 3u,\n\
@@ -275,7 +275,7 @@ void TestEnum::testEnumValueFromExpression()
             ValueB0 = ~3,\n\
         };\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <value-type name='A'>\n\
             <enum-type name='EnumA'/>\n\
@@ -347,14 +347,14 @@ void TestEnum::testEnumValueFromExpression()
 
 void TestEnum::testPrivateEnum()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     class A {\n\
     private:\n\
         enum PrivateEnum { Priv0 = 0x0f, Priv1 = 0xf0 };\n\
     public:\n\
         enum PublicEnum { Pub0 = Priv0, Pub1 = A::Priv1 };\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <value-type name='A'>\n\
             <enum-type name='PublicEnum'/>\n\
@@ -390,12 +390,12 @@ void TestEnum::testPrivateEnum()
 
 void TestEnum::testTypedefEnum()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     typedef enum EnumA {\n\
         A0,\n\
         A1,\n\
     } EnumA;\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <enum-type name='EnumA'/>\n\
     </typesystem>\n";
diff --git a/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp b/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp
index f540074e9..e54d3b914 100644
--- a/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp
@@ -10,8 +10,8 @@
 
 void TestExtraInclude::testClassExtraInclude()
 {
-    const char* cppCode ="struct A {};\n";
-    const char* xmlCode = "\
+    const char cppCode[] = "struct A {};\n";
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <value-type name='A'>\n\
             <extra-includes>\n\
@@ -33,8 +33,8 @@ void TestExtraInclude::testClassExtraInclude()
 
 void TestExtraInclude::testGlobalExtraIncludes()
 {
-    const char* cppCode ="struct A {};\n";
-    const char* xmlCode = "\
+    const char cppCode[] = "struct A {};\n";
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <extra-includes>\n\
             <include file-name='header1.h' location='global'/>\n\
@@ -48,7 +48,7 @@ void TestExtraInclude::testGlobalExtraIncludes()
     AbstractMetaClassList classes = builder->classes();
     QVERIFY(AbstractMetaClass::findClass(classes, u"A"));
 
-    TypeDatabase* td = TypeDatabase::instance();
+    auto *td = TypeDatabase::instance();
     const TypeSystemTypeEntry *module = td->defaultTypeSystemType();
     QVERIFY(module);
     QCOMPARE(module->name(), u"Foo");
diff --git a/sources/shiboken6/ApiExtractor/tests/testfunctiontag.cpp b/sources/shiboken6/ApiExtractor/tests/testfunctiontag.cpp
index 66c2e08c9..0e78d61bb 100644
--- a/sources/shiboken6/ApiExtractor/tests/testfunctiontag.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testfunctiontag.cpp
@@ -50,8 +50,8 @@ void TestFunctionTag::testFunctionTagForAllSignatures()
 
 void TestFunctionTag::testRenameGlobalFunction()
 {
-    const char* cppCode ="void global_function_with_ugly_name();\n";
-    const char* xmlCode = "\
+    const char cppCode[] = "void global_function_with_ugly_name();\n";
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <function signature='global_function_with_ugly_name()' rename='smooth'/>\n\
     </typesystem>\n";
diff --git a/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp
index ad5262418..eabd8b046 100644
--- a/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp
@@ -12,7 +12,7 @@
 
 void TestImplicitConversions::testWithPrivateCtors()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     class B;\n\
     class C;\n\
     class A {\n\
@@ -22,7 +22,7 @@ void TestImplicitConversions::testWithPrivateCtors()
     };\n\
     class B {};\n\
     class C {};\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <value-type name='A'/>\n\
         <value-type name='B'/>\n\
@@ -43,14 +43,14 @@ void TestImplicitConversions::testWithPrivateCtors()
 
 void TestImplicitConversions::testWithModifiedVisibility()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     class B;\n\
     class A {\n\
     public:\n\
         A(const B&);\n\
     };\n\
     class B {};\n";
-    const char* xmlCode = R"(
+    const char xmlCode[] = R"(
 <typesystem package='Foo'>
     <value-type name='A'>
         <modify-function signature='A(const B&amp;)' access='private'/>
@@ -73,7 +73,7 @@ void TestImplicitConversions::testWithModifiedVisibility()
 
 void TestImplicitConversions::testWithAddedCtor()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     class B;\n\
     class A {\n\
     public:\n\
@@ -81,7 +81,7 @@ void TestImplicitConversions::testWithAddedCtor()
     };\n\
     class B {};\n\
     class C {};\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <custom-type name='TARGETLANGTYPE'/>\n\
         <value-type name='A'>\n\
@@ -109,12 +109,12 @@ void TestImplicitConversions::testWithAddedCtor()
 
 void TestImplicitConversions::testWithExternalConversionOperator()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     class A {};\n\
     struct B {\n\
         operator A() const;\n\
     };\n";
-    const char* xmlCode = "\n\
+    const char xmlCode[] = "\n\
     <typesystem package='Foo'>\n\
         <value-type name='A'/>\n\
         <value-type name='B'/>\n\
@@ -123,8 +123,8 @@ void TestImplicitConversions::testWithExternalConversionOperator()
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 2);
-    AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A");
-    AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, u"B");
+    auto *classA = AbstractMetaClass::findClass(classes, u"A");
+    auto *classB = AbstractMetaClass::findClass(classes, u"B");
     const auto implicitConvs = classA->implicitConversions();
     QCOMPARE(implicitConvs.size(), 1);
     const auto &externalConvOps = classA->externalConversionOperators();
diff --git a/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp b/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp
index 416f9c792..3b7fe05d4 100644
--- a/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp
@@ -12,8 +12,8 @@
 
 void TestInsertTemplate::testInsertTemplateOnClassInjectCode()
 {
-    const char* cppCode ="struct A{};\n";
-    const char* xmlCode = "\
+    const char cppCode[] = "struct A{};\n";
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <template name='code_template'>\n\
         code template content\n\
@@ -37,8 +37,8 @@ void TestInsertTemplate::testInsertTemplateOnClassInjectCode()
 
 void TestInsertTemplate::testInsertTemplateOnModuleInjectCode()
 {
-    const char* cppCode ="";
-    const char* xmlCode = "\
+    const char cppCode[] = "";
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <template name='code_template'>\n\
         code template content\n\
diff --git a/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp
index 6c10dcbef..168f1a67b 100644
--- a/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp
@@ -20,7 +20,7 @@ using namespace Qt::StringLiterals;
 
 void TestModifyDocumentation::testModifyDocumentation()
 {
-    const char* cppCode ="struct B { void b(); }; class A {};\n";
+    const char cppCode[] = "struct B { void b(); }; class A {};\n";
     const char xmlCode[] =
 R"(<typesystem package="Foo">
     <value-type name='B'>
diff --git a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp
index 3c8a773e5..2b2525a8c 100644
--- a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp
@@ -28,7 +28,7 @@ void TestModifyFunction::testRenameArgument()
 {
     QFETCH(QByteArray, pattern);
 
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {\n\
         void method(int=0);\n\
     };\n";
@@ -57,12 +57,12 @@ void TestModifyFunction::testRenameArgument()
 
 void TestModifyFunction::testOwnershipTransfer()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {};\n\
     struct B {\n\
         virtual A* method();\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <object-type name='A' />\n\
         <object-type name='B'>\n\
@@ -87,7 +87,7 @@ void TestModifyFunction::testOwnershipTransfer()
 
 void TestModifyFunction::invalidateAfterUse()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {\n\
         virtual void call(int *a);\n\
     };\n\
@@ -101,7 +101,7 @@ void TestModifyFunction::invalidateAfterUse()
     };\n\
     struct E : D {\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='int'/>\n\
         <object-type name='A'>\n\
@@ -173,13 +173,13 @@ void TestModifyFunction::invalidateAfterUse()
 
 void TestModifyFunction::testWithApiVersion()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {};\n\
     struct B {\n\
         virtual A* method();\n\
         virtual B* methodB();\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <object-type name='A' />\n\
         <object-type name='B'>\n\
@@ -199,7 +199,7 @@ void TestModifyFunction::testWithApiVersion()
                                                                 false, u"0.1"_s));
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
-    AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, u"B");
+    auto *classB = AbstractMetaClass::findClass(classes, u"B");
     auto func = classB->findFunction(u"method");
 
     auto returnOwnership = func->argumentTargetOwnership(func->ownerClass(), 0);
@@ -269,10 +269,10 @@ struct A {
 
 void TestModifyFunction::testGlobalFunctionModification()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {};\n\
     void function(A* a = 0);\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='A'/>\n\
         <function signature='function(A*)'>\n\
diff --git a/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.cpp b/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.cpp
index af84ef864..a3f955602 100644
--- a/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.cpp
@@ -10,7 +10,7 @@
 
 void TestMultipleInheritance::testVirtualClass()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {\n\
         virtual ~A();\n\
         virtual void theBug();\n\
@@ -22,7 +22,7 @@ void TestMultipleInheritance::testVirtualClass()
     };\n\
     struct D : C {\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <object-type name='A' />\n\
         <object-type name='B' />\n\
diff --git a/sources/shiboken6/ApiExtractor/tests/testnamespace.cpp b/sources/shiboken6/ApiExtractor/tests/testnamespace.cpp
index 00af4d48d..248812048 100644
--- a/sources/shiboken6/ApiExtractor/tests/testnamespace.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testnamespace.cpp
@@ -15,7 +15,7 @@ using namespace Qt::StringLiterals;
 
 void NamespaceTest::testNamespaceMembers()
 {
-    const char* cppCode = "\
+    const char cppCode[] = "\
     namespace Namespace\n\
     {\n\
         enum Option {\n\
@@ -24,7 +24,7 @@ void NamespaceTest::testNamespaceMembers()
         };\n\
         void foo(Option opt);\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <namespace-type name='Namespace'>\n\
             <enum-type name='Option' />\n\
@@ -43,7 +43,7 @@ void NamespaceTest::testNamespaceMembers()
 
 void NamespaceTest::testNamespaceInnerClassMembers()
 {
-    const char* cppCode = "\
+    const char cppCode[] = "\
     namespace OuterNamespace\n\
     {\n\
         namespace InnerNamespace {\n\
@@ -52,7 +52,7 @@ void NamespaceTest::testNamespaceInnerClassMembers()
             };\n\
         };\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <namespace-type name='OuterNamespace'>\n\
             <namespace-type name='InnerNamespace'>\n\
diff --git a/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp b/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp
index 5b0fb954d..1dacb41f5 100644
--- a/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp
@@ -19,7 +19,7 @@ using namespace Qt::StringLiterals;
 
 void TestNestedTypes::testNestedTypesModifications()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     namespace OuterNamespace {\n\
         namespace InnerNamespace {\n\
             struct SomeClass {\n\
@@ -27,7 +27,7 @@ void TestNestedTypes::testNestedTypesModifications()
             };\n\
         };\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <namespace-type name='OuterNamespace'>\n\
             <namespace-type name='InnerNamespace'>\n\
@@ -78,11 +78,11 @@ void TestNestedTypes::testNestedTypesModifications()
 
 void TestNestedTypes::testDuplicationOfNestedTypes()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     namespace Namespace {\n\
         class SomeClass {};\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <namespace-type name='Namespace'>\n\
             <value-type name='SomeClass'>\n\
@@ -105,9 +105,9 @@ void TestNestedTypes::testDuplicationOfNestedTypes()
     QCOMPARE(cls1->name(), u"SomeClass");
     QCOMPARE(cls1->qualifiedCppName(), u"Namespace::SomeClass");
 
-    TypeEntry* t1 = TypeDatabase::instance()->findType(u"Namespace::SomeClass"_s);
+    auto *t1 = TypeDatabase::instance()->findType(u"Namespace::SomeClass"_s);
     QVERIFY(t1);
-    TypeEntry* t2 = TypeDatabase::instance()->findType(u"SomeClass"_s);
+    auto *t2 = TypeDatabase::instance()->findType(u"SomeClass"_s);
     QVERIFY(!t2);
 }
 
diff --git a/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp b/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp
index 4c277ef89..b7df94a62 100644
--- a/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp
@@ -12,11 +12,11 @@
 
 void TestNumericalTypedef::testNumericalTypedef()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     typedef double real;\n\
     void funcDouble(double);\n\
     void funcReal(real);\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='double'/>\n\
         <primitive-type name='real'/>\n\
@@ -50,11 +50,11 @@ void TestNumericalTypedef::testNumericalTypedef()
 
 void TestNumericalTypedef::testUnsignedNumericalTypedef()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     typedef unsigned short custom_ushort;\n\
     void funcUnsignedShort(unsigned short);\n\
     void funcUShort(custom_ushort);\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='short'/>\n\
         <primitive-type name='unsigned short'/>\n\
diff --git a/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.cpp b/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.cpp
index 30552ff0b..60f2a38dd 100644
--- a/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.cpp
@@ -14,10 +14,10 @@ using namespace Qt::StringLiterals;
 
 void TestPrimitiveTypeTag::testPrimitiveTypeDefaultConstructor()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {};\n\
     struct B {};\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <primitive-type name='A' default-constructor='A()'/>\n\
         <object-type name='B'/>\n\
@@ -30,7 +30,7 @@ void TestPrimitiveTypeTag::testPrimitiveTypeDefaultConstructor()
     const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B");
     QVERIFY(classB);
 
-    PrimitiveTypeEntry* typeEntry = TypeDatabase::instance()->findPrimitiveType(u"A"_s);
+    auto *typeEntry = TypeDatabase::instance()->findPrimitiveType(u"A"_s);
     QVERIFY(typeEntry);
     QVERIFY(typeEntry->hasDefaultConstructor());
     QCOMPARE(typeEntry->defaultConstructor(), u"A()");
diff --git a/sources/shiboken6/ApiExtractor/tests/testrefcounttag.cpp b/sources/shiboken6/ApiExtractor/tests/testrefcounttag.cpp
index 3ceac5fca..ef83d99fb 100644
--- a/sources/shiboken6/ApiExtractor/tests/testrefcounttag.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testrefcounttag.cpp
@@ -15,12 +15,12 @@ using namespace Qt::StringLiterals;
 
 void TestRefCountTag::testReferenceCountTag()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {};\n\
     struct B {\n\
         void keepObject(B* b);\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <object-type name='A'/>\n\
         <object-type name='B'>\n\
@@ -44,12 +44,12 @@ void TestRefCountTag::testReferenceCountTag()
 
 void TestRefCountTag::testWithApiVersion()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {};\n\
     struct B {\n\
         void keepObject(B*, B*);\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <object-type name='A'/>\n\
         <object-type name='B'>\n\
diff --git a/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp
index 34edbb795..74a0adcea 100644
--- a/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp
@@ -12,12 +12,12 @@
 
 void TestReferenceToPointer::testReferenceToPointerArgument()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {};\n\
     struct B {\n\
         void dummy(A*&);\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <object-type name='A'/>\n\
         <object-type name='B'/>\n\
diff --git a/sources/shiboken6/ApiExtractor/tests/testremovefield.cpp b/sources/shiboken6/ApiExtractor/tests/testremovefield.cpp
index 3ec348c2a..e0acb0e5b 100644
--- a/sources/shiboken6/ApiExtractor/tests/testremovefield.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testremovefield.cpp
@@ -10,12 +10,12 @@
 
 void TestRemoveField::testRemoveField()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {\n\
         int fieldA;\n\
         int fieldB;\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <primitive-type name='int'/>\n\
         <value-type name='A'>\n\
diff --git a/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.cpp b/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.cpp
index 9efa0d343..59528d517 100644
--- a/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.cpp
@@ -14,14 +14,14 @@
 // it should not appear in the implicity conversion list.
 void TestRemoveImplConv::testRemoveImplConv()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     struct A {};\n\
     struct B {};\n\
     struct C {\n\
         C(const A&);\n\
         C(const B&);\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package=\"Foo\">\n\
         <value-type name='A'/>\n\
         <value-type name='B'/>\n\
diff --git a/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.cpp b/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.cpp
index 0a75c4e6d..a6d929c8f 100644
--- a/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.cpp
@@ -15,7 +15,7 @@ using namespace Qt::StringLiterals;
 
 void TestRemoveOperatorMethod::testRemoveOperatorMethod()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     #include <stdint.h>\n\
     \n\
     struct Char {};\n\
@@ -37,7 +37,7 @@ void TestRemoveOperatorMethod::testRemoveOperatorMethod()
         A& operator>>(ByteArray&);\n\
         A& operator>>(String&);\n\
     };\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='char'/>\n\
         <primitive-type name='short'/>\n\
diff --git a/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp b/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp
index cdb0a39b6..948f9d3b7 100644
--- a/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp
@@ -25,7 +25,7 @@ void TestResolveType::initTestCase()
 
 void TestResolveType::testResolveReturnTypeFromParentScope()
 {
-    const char* cppCode = "\n\
+    const char cppCode[] = "\n\
     namespace A {\n\
         struct B {\n\
             struct C {};\n\
@@ -35,7 +35,7 @@ void TestResolveType::testResolveReturnTypeFromParentScope()
             C* method();\n\
         };\n\
     };";
-    const char* xmlCode = R"XML(
+    const char xmlCode[] = R"XML(
     <typesystem package='Foo'>
         <namespace-type name='A'>
             <value-type name='B'>
diff --git a/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp b/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp
index 440055233..0e191668b 100644
--- a/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp
@@ -27,7 +27,7 @@ void TestReverseOperators::testReverseSum()
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false));
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
-    AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A");
+    auto *classA = AbstractMetaClass::findClass(classes, u"A");
     QVERIFY(classA);
     QCOMPARE(classA->functions().size(), 4);
 
diff --git a/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp b/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp
index 24e07052f..321f4aa51 100644
--- a/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp
@@ -58,7 +58,7 @@ namespace Internet {
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
 
-    AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, u"Bookmarks");
+    auto *classB = AbstractMetaClass::findClass(classes, u"Bookmarks");
     QVERIFY(classB);
     const auto func = classB->findFunction(u"list");
     QVERIFY(!func.isNull());
@@ -96,7 +96,7 @@ namespace Namespace {
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
 
-    AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, u"B");
+    auto *classB = AbstractMetaClass::findClass(classes, u"B");
     QVERIFY(classB);
     QVERIFY(!classB->baseClass());
     QVERIFY(classB->baseClassName().isEmpty());
@@ -256,7 +256,7 @@ struct FooBars : public ListContainer<FooBar> {};
     QCOMPARE(classes.size(), 2);
     QCOMPARE(templates.size(), 1);
 
-    const AbstractMetaClass* foobars = AbstractMetaClass::findClass(classes, u"FooBars");
+    const auto *foobars = AbstractMetaClass::findClass(classes, u"FooBars");
     QCOMPARE(foobars->functions().size(), 4);
 
     const AbstractMetaClass *lc = templates.constFirst();
@@ -290,7 +290,7 @@ template<SomeEnum type> struct Future {};
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
 
-    AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, u"B");
+    auto *classB = AbstractMetaClass::findClass(classes, u"B");
     QVERIFY(classB);
     QVERIFY(!classB->baseClass());
     QVERIFY(classB->baseClassName().isEmpty());
@@ -329,7 +329,7 @@ template<SomeEnum type> struct Future {};
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
 
-    AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, u"Namespace::B");
+    auto *classB = AbstractMetaClass::findClass(classes, u"Namespace::B");
     QVERIFY(classB);
     QVERIFY(!classB->baseClass());
     QVERIFY(classB->baseClassName().isEmpty());
@@ -366,15 +366,15 @@ typedef BaseTemplateClass<TypeOne> TypeOneClass;
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 3);
 
-    const AbstractMetaClass* base = AbstractMetaClass::findClass(classes, u"BaseTemplateClass");
+    const auto *base = AbstractMetaClass::findClass(classes, u"BaseTemplateClass");
     QVERIFY(base);
-    const AbstractMetaClass* one = AbstractMetaClass::findClass(classes, u"TypeOneClass");
+    const auto *one = AbstractMetaClass::findClass(classes, u"TypeOneClass");
     QVERIFY(one);
     QCOMPARE(one->templateBaseClass(), base);
     QCOMPARE(one->functions().size(), base->functions().size());
     QVERIFY(one->isTypeDef());
-    const ComplexTypeEntry* oneType = one->typeEntry();
-    const ComplexTypeEntry* baseType = base->typeEntry();
+    const ComplexTypeEntry *oneType = one->typeEntry();
+    const ComplexTypeEntry *baseType = base->typeEntry();
     QCOMPARE(oneType->baseContainerType(), baseType);
     QCOMPARE(one->baseClassNames(), QStringList(u"BaseTemplateClass<TypeOne>"_s));
 
@@ -415,7 +415,7 @@ typedef Vector<int> IntVector;
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 1);
 
-    AbstractMetaClass* vector = AbstractMetaClass::findClass(classes, u"IntVector");
+    auto *vector = AbstractMetaClass::findClass(classes, u"IntVector");
     QVERIFY(vector);
     auto baseContainer = vector->typeEntry()->baseContainerType();
     QVERIFY(baseContainer);
diff --git a/sources/shiboken6/ApiExtractor/tests/testtyperevision.cpp b/sources/shiboken6/ApiExtractor/tests/testtyperevision.cpp
index 299993bbf..47c2327d8 100644
--- a/sources/shiboken6/ApiExtractor/tests/testtyperevision.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testtyperevision.cpp
@@ -18,10 +18,10 @@ using namespace Qt::StringLiterals;
 
 void TestTypeRevision::testRevisionAttr()
 {
-    const char* cppCode = "class Rev_0 {};"
+    const char cppCode[] = "class Rev_0 {};"
                           "class Rev_1 {};"
                           "class Rev_2 { public: enum Rev_3 { X }; enum Rev_5 { Y }; };";
-    const char* xmlCode = "<typesystem package=\"Foo\">"
+    const char xmlCode[] = "<typesystem package=\"Foo\">"
                         "<value-type name=\"Rev_0\"/>"
                         "<value-type name=\"Rev_1\" revision=\"1\"/>"
                         "<object-type name=\"Rev_2\" revision=\"2\">"
@@ -44,7 +44,7 @@ void TestTypeRevision::testRevisionAttr()
     auto rev3 = rev2->findEnum(u"Rev_3"_s);
     QVERIFY(rev3.has_value());
     QCOMPARE(rev3->typeEntry()->revision(), 3);
-    FlagsTypeEntry* rev4 = rev3->typeEntry()->flags();
+    FlagsTypeEntry *rev4 = rev3->typeEntry()->flags();
     QCOMPARE(rev4->revision(), 4);
     auto rev5 = rev2->findEnum(u"Rev_5"_s);
     QVERIFY(rev5.has_value());
diff --git a/sources/shiboken6/ApiExtractor/tests/testutil.h b/sources/shiboken6/ApiExtractor/tests/testutil.h
index 7fbc7e906..e19517e85 100644
--- a/sources/shiboken6/ApiExtractor/tests/testutil.h
+++ b/sources/shiboken6/ApiExtractor/tests/testutil.h
@@ -24,7 +24,7 @@ namespace TestUtil
     {
         ReportHandler::setSilent(silent);
         ReportHandler::startTimer();
-        TypeDatabase* td = TypeDatabase::instance(true);
+        auto *td = TypeDatabase::instance(true);
         if (apiVersion.isEmpty())
             TypeDatabase::clearApiVersions();
         else if (!TypeDatabase::setApiVersion(QStringLiteral("*"), apiVersion))
diff --git a/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.cpp b/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.cpp
index 73f2d44ca..06fbe9ee3 100644
--- a/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.cpp
@@ -9,13 +9,13 @@
 
 void TestValueTypeDefaultCtorTag::testValueTypeDefaultCtorTagArgument()
 {
-    const char* cppCode ="\n\
+    const char cppCode[] = "\n\
     struct A {\n\
         A(int,int);\n\
     };\n\
     struct B {};\n\
     ";
-    const char* xmlCode = "\n\
+    const char xmlCode[] = "\n\
     <typesystem package='Foo'>\n\
         <primitive-type name='int' />\n\
         <value-type name='A' default-constructor='A(0, 0)' />\n\
diff --git a/sources/shiboken6/ApiExtractor/typedatabase.cpp b/sources/shiboken6/ApiExtractor/typedatabase.cpp
index 8980984b3..a53af364a 100644
--- a/sources/shiboken6/ApiExtractor/typedatabase.cpp
+++ b/sources/shiboken6/ApiExtractor/typedatabase.cpp
@@ -179,7 +179,7 @@ TypeDatabase::~TypeDatabase()
     delete d;
 }
 
-TypeDatabase* TypeDatabase::instance(bool newInstance)
+TypeDatabase *TypeDatabase::instance(bool newInstance)
 {
     static TypeDatabase *db = nullptr;
     if (!db || newInstance) {
@@ -338,7 +338,7 @@ QStringList TypeDatabase::typesystemKeywords() const
 
 IncludeList TypeDatabase::extraIncludes(const QString& className) const
 {
-    ComplexTypeEntry* typeEntry = findComplexType(className);
+    ComplexTypeEntry *typeEntry = findComplexType(className);
     return typeEntry ? typeEntry->extraIncludes() : IncludeList();
 }
 
@@ -366,7 +366,7 @@ void TypeDatabase::addInlineNamespaceLookups(const NamespaceTypeEntry *n)
         d->m_entries.insert(ae->shortName(), ae);
 }
 
-ContainerTypeEntry* TypeDatabase::findContainerType(const QString &name) const
+ContainerTypeEntry *TypeDatabase::findContainerType(const QString &name) const
 {
     QString template_name = name;
 
@@ -374,7 +374,7 @@ ContainerTypeEntry* TypeDatabase::findContainerType(const QString &name) const
     if (pos > 0)
         template_name = name.left(pos);
 
-    TypeEntry* type_entry = findType(template_name);
+    auto *type_entry = findType(template_name);
     if (type_entry && type_entry->isContainer())
         return static_cast<ContainerTypeEntry*>(type_entry);
     return nullptr;
@@ -386,7 +386,7 @@ static bool inline useType(const TypeEntry *t)
         || static_cast<const PrimitiveTypeEntry *>(t)->preferredTargetLangType();
 }
 
-FunctionTypeEntry* TypeDatabase::findFunctionType(const QString& name) const
+FunctionTypeEntry *TypeDatabase::findFunctionType(const QString &name) const
 {
     const auto entries = d->findTypeRange(name);
     for (TypeEntry *entry : entries) {
@@ -426,12 +426,12 @@ QString TypeDatabase::defaultPackageName() const
     return d->m_typeSystemEntries.constFirst()->name();
 }
 
-TypeEntry* TypeDatabase::findType(const QString& name) const
+TypeEntry *TypeDatabase::findType(const QString &name) const
 {
     return d->findType(name);
 }
 
-TypeEntry* TypeDatabasePrivate::findType(const QString& name) const
+TypeEntry *TypeDatabasePrivate::findType(const QString &name) const
 {
     const auto entries = findTypeRange(name);
     for (TypeEntry *entry : entries) {
@@ -684,7 +684,7 @@ bool TypeDatabase::isReturnTypeRejected(const QString& className, const QString&
     return findRejection(d->m_rejections, TypeRejection::ReturnType, className, typeName, reason);
 }
 
-FlagsTypeEntry* TypeDatabase::findFlagsType(const QString &name) const
+FlagsTypeEntry *TypeDatabase::findFlagsType(const QString &name) const
 {
     TypeEntry *fte = findType(name);
     if (!fte) {
@@ -959,12 +959,12 @@ bool TypeDatabasePrivate::parseFile(const TypeDatabaseParserContextPtr &context,
     return ok;
 }
 
-bool TypeDatabase::parseFile(QIODevice* device, bool generate)
+bool TypeDatabase::parseFile(QIODevice *device, bool generate)
 {
     return d->parseFile(device, this, generate);
 }
 
-bool TypeDatabasePrivate::parseFile(QIODevice* device, TypeDatabase *db, bool generate)
+bool TypeDatabasePrivate::parseFile(QIODevice *device, TypeDatabase *db, bool generate)
 {
     const TypeDatabaseParserContextPtr context(new TypeDatabaseParserContext);
     context->db = db;
@@ -1076,7 +1076,7 @@ PrimitiveTypeEntry *TypeDatabase::findPrimitiveType(const QString& name) const
     return nullptr;
 }
 
-ComplexTypeEntry* TypeDatabase::findComplexType(const QString& name) const
+ComplexTypeEntry *TypeDatabase::findComplexType(const QString& name) const
 {
     const auto entries = d->findTypeRange(name);
     for (TypeEntry *entry : entries) {
@@ -1086,7 +1086,7 @@ ComplexTypeEntry* TypeDatabase::findComplexType(const QString& name) const
     return nullptr;
 }
 
-ObjectTypeEntry* TypeDatabase::findObjectType(const QString& name) const
+ObjectTypeEntry *TypeDatabase::findObjectType(const QString& name) const
 {
     const auto entries = d->findTypeRange(name);
     for (TypeEntry *entry : entries) {
@@ -1139,7 +1139,7 @@ void TypeDatabase::setDropTypeEntries(QStringList dropTypeEntries)
 static bool computeTypeIndexes = true;
 static int maxTypeIndex;
 
-static bool typeEntryLessThan(const TypeEntry* t1, const TypeEntry* t2)
+static bool typeEntryLessThan(const TypeEntry *t1, const TypeEntry *t2)
 {
     if (t1->revision() < t2->revision())
         return true;
@@ -1149,7 +1149,7 @@ static bool typeEntryLessThan(const TypeEntry* t1, const TypeEntry* t2)
 
 static void _computeTypeIndexes()
 {
-    TypeDatabase* tdb = TypeDatabase::instance();
+    auto *tdb = TypeDatabase::instance();
 
     TypeEntryList list;
 
diff --git a/sources/shiboken6/ApiExtractor/typesystem.cpp b/sources/shiboken6/ApiExtractor/typesystem.cpp
index 61c568202..e3dfd741e 100644
--- a/sources/shiboken6/ApiExtractor/typesystem.cpp
+++ b/sources/shiboken6/ApiExtractor/typesystem.cpp
@@ -848,7 +848,7 @@ public:
 
     QString m_defaultConstructor;
     CustomConversionPtr m_customConversion;
-    PrimitiveTypeEntry* m_referencedTypeEntry = nullptr;
+    PrimitiveTypeEntry *m_referencedTypeEntry = nullptr;
     uint m_preferredTargetLangType : 1;
 };
 
@@ -1241,7 +1241,7 @@ public:
     ComplexTypeEntry::CopyableFlag m_copyableFlag = ComplexTypeEntry::Unknown;
     QString m_hashFunction;
 
-    const ComplexTypeEntry* m_baseContainerType = nullptr;
+    const ComplexTypeEntry *m_baseContainerType = nullptr;
     // For class functions
     TypeSystem::ExceptionHandling m_exceptionHandling = TypeSystem::ExceptionHandling::Unspecified;
     TypeSystem::AllowThread m_allowThread = TypeSystem::AllowThread::Unspecified;
diff --git a/sources/shiboken6/ApiExtractor/typesystemparser.cpp b/sources/shiboken6/ApiExtractor/typesystemparser.cpp
index d2e709ec2..769cfe27d 100644
--- a/sources/shiboken6/ApiExtractor/typesystemparser.cpp
+++ b/sources/shiboken6/ApiExtractor/typesystemparser.cpp
@@ -3123,7 +3123,7 @@ bool TypeSystemParser::startElement(const ConditionalStreamReader &reader, Stack
     }
 
     if (!m_defaultPackage.isEmpty() && !versionRange.isNull()) {
-        TypeDatabase* td = TypeDatabase::instance();
+        auto *td = TypeDatabase::instance();
         if (!td->checkApiVersion(m_defaultPackage, versionRange)) {
             ++m_ignoreDepth;
             return true;
diff --git a/sources/shiboken6/ApiExtractor/typesystemparser_p.h b/sources/shiboken6/ApiExtractor/typesystemparser_p.h
index c14a46c04..3dab6f1b7 100644
--- a/sources/shiboken6/ApiExtractor/typesystemparser_p.h
+++ b/sources/shiboken6/ApiExtractor/typesystemparser_p.h
@@ -120,7 +120,7 @@ struct StackElementContext
     FunctionModificationList functionMods;
     FieldModificationList fieldMods;
     DocModificationList docModifications;
-    TypeEntry* entry = nullptr;
+    TypeEntry *entry = nullptr;
     int addedFunctionModificationIndex = -1;
 };
 
@@ -260,7 +260,7 @@ private:
     QString m_error;
     const TypeEntry::CodeGeneration m_generate;
 
-    EnumTypeEntry* m_currentEnum = nullptr;
+    EnumTypeEntry *m_currentEnum = nullptr;
     TemplateInstancePtr m_templateInstance;
     TemplateEntry *m_templateEntry = nullptr;
     ContextStack m_contextStack;
diff --git a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp
index a378a9e6f..61f736e74 100644
--- a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp
+++ b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp
@@ -167,7 +167,7 @@ void QtDocGenerator::writeFormattedText(TextStream &s, const QString &doc,
     s << '\n';
 }
 
-static void writeInheritedByList(TextStream& s, const AbstractMetaClass* metaClass,
+static void writeInheritedByList(TextStream &s, const AbstractMetaClass *metaClass,
                                  const AbstractMetaClassCList& allClasses)
 {
     AbstractMetaClassCList res;
@@ -258,7 +258,7 @@ void QtDocGenerator::generateClass(TextStream &s, const GeneratorContext &classC
     writeInjectDocumentation(s, TypeSystem::DocModificationAppend, metaClass, nullptr);
 }
 
-void QtDocGenerator::writeFunctionList(TextStream& s, const AbstractMetaClass* cppClass)
+void QtDocGenerator::writeFunctionList(TextStream &s, const AbstractMetaClass *cppClass)
 {
     QStringList functionList;
     QStringList virtualList;
@@ -314,7 +314,7 @@ void QtDocGenerator::writeFunctionList(TextStream& s, const AbstractMetaClass* c
     }
 }
 
-void QtDocGenerator::writeFunctionBlock(TextStream& s, const QString& title, QStringList& functions)
+void QtDocGenerator::writeFunctionBlock(TextStream &s, const QString& title, QStringList& functions)
 {
     if (!functions.isEmpty()) {
         s << title << '\n'
@@ -329,7 +329,7 @@ void QtDocGenerator::writeFunctionBlock(TextStream& s, const QString& title, QSt
     }
 }
 
-void QtDocGenerator::writeEnums(TextStream& s, const AbstractMetaClass* cppClass) const
+void QtDocGenerator::writeEnums(TextStream &s, const AbstractMetaClass *cppClass) const
 {
     static const QString section_title = u".. attribute:: "_s;
 
@@ -343,7 +343,7 @@ void QtDocGenerator::writeEnums(TextStream& s, const AbstractMetaClass* cppClass
 
 }
 
-void QtDocGenerator::writeFields(TextStream& s, const AbstractMetaClass* cppClass) const
+void QtDocGenerator::writeFields(TextStream &s, const AbstractMetaClass *cppClass) const
 {
     static const QString section_title = u".. attribute:: "_s;
 
@@ -353,7 +353,7 @@ void QtDocGenerator::writeFields(TextStream& s, const AbstractMetaClass* cppClas
     }
 }
 
-void QtDocGenerator::writeConstructors(TextStream& s, const AbstractMetaClass* cppClass) const
+void QtDocGenerator::writeConstructors(TextStream &s, const AbstractMetaClass *cppClass) const
 {
     static const QString sectionTitle = u".. class:: "_s;
 
@@ -409,7 +409,7 @@ void QtDocGenerator::writeConstructors(TextStream& s, const AbstractMetaClass* c
         writeFormattedDetailedText(s, func->documentation(), cppClass);
 }
 
-QString QtDocGenerator::parseArgDocStyle(const AbstractMetaClass* /* cppClass */,
+QString QtDocGenerator::parseArgDocStyle(const AbstractMetaClass * /* cppClass */,
                                          const AbstractMetaFunctionCPtr &func)
 {
     QString ret;
@@ -515,9 +515,9 @@ void QtDocGenerator::writeDocSnips(TextStream &s,
     }
 }
 
-bool QtDocGenerator::writeInjectDocumentation(TextStream& s,
+bool QtDocGenerator::writeInjectDocumentation(TextStream &s,
                                             TypeSystem::DocModificationMode mode,
-                                            const AbstractMetaClass* cppClass,
+                                            const AbstractMetaClass *cppClass,
                                             const AbstractMetaFunctionCPtr &func)
 {
     Indentation indentation(s);
@@ -555,7 +555,7 @@ bool QtDocGenerator::writeInjectDocumentation(TextStream& s,
     return didSomething;
 }
 
-QString QtDocGenerator::functionSignature(const AbstractMetaClass* cppClass,
+QString QtDocGenerator::functionSignature(const AbstractMetaClass *cppClass,
                                           const AbstractMetaFunctionCPtr &func)
 {
     QString funcName;
@@ -569,7 +569,7 @@ QString QtDocGenerator::functionSignature(const AbstractMetaClass* cppClass,
 }
 
 QString QtDocGenerator::translateToPythonType(const AbstractMetaType &type,
-                                              const AbstractMetaClass* cppClass) const
+                                              const AbstractMetaClass *cppClass) const
 {
     static const QStringList nativeTypes =
         {boolT(), floatT(), intT(), pyObjectT(), pyStrT()};
@@ -639,7 +639,7 @@ QString QtDocGenerator::getFuncName(const AbstractMetaFunctionCPtr& cppFunc)
     return result;
 }
 
-void QtDocGenerator::writeParameterType(TextStream& s, const AbstractMetaClass* cppClass,
+void QtDocGenerator::writeParameterType(TextStream &s, const AbstractMetaClass *cppClass,
                                         const AbstractMetaArgument &arg) const
 {
     s << ":param " << arg.name() << ": "
@@ -676,7 +676,7 @@ void QtDocGenerator::writeFunctionParametersType(TextStream &s, const AbstractMe
     s << '\n';
 }
 
-void QtDocGenerator::writeFunction(TextStream& s, const AbstractMetaClass* cppClass,
+void QtDocGenerator::writeFunction(TextStream &s, const AbstractMetaClass *cppClass,
                                    const AbstractMetaFunctionCPtr &func, bool indexed)
 {
     s << functionSignature(cppClass, func);
diff --git a/sources/shiboken6/generator/qtdoc/qtdocgenerator.h b/sources/shiboken6/generator/qtdoc/qtdocgenerator.h
index 0ca665251..08a359322 100644
--- a/sources/shiboken6/generator/qtdoc/qtdocgenerator.h
+++ b/sources/shiboken6/generator/qtdoc/qtdocgenerator.h
@@ -51,17 +51,17 @@ protected:
     bool finishGeneration() override;
 
 private:
-    void writeEnums(TextStream& s, const AbstractMetaClass* cppClass) const;
+    void writeEnums(TextStream &s, const AbstractMetaClass *cppClass) const;
 
     void writeFields(TextStream &s, const AbstractMetaClass *cppClass) const;
-    static QString functionSignature(const AbstractMetaClass* cppClass,
+    static QString functionSignature(const AbstractMetaClass *cppClass,
                                      const AbstractMetaFunctionCPtr &func);
-    void writeFunction(TextStream& s, const AbstractMetaClass* cppClass,
+    void writeFunction(TextStream &s, const AbstractMetaClass *cppClass,
                        const AbstractMetaFunctionCPtr &func, bool indexed = true);
     void writeFunctionParametersType(TextStream &s, const AbstractMetaClass *cppClass,
                                      const AbstractMetaFunctionCPtr &func) const;
-    static void writeFunctionList(TextStream& s, const AbstractMetaClass* cppClass);
-    static void writeFunctionBlock(TextStream& s, const QString& title,
+    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;
@@ -76,8 +76,8 @@ private:
     void writeFormattedDetailedText(TextStream &s, const Documentation &doc,
                                     const AbstractMetaClass *metaclass = nullptr) const;
 
-    bool writeInjectDocumentation(TextStream& s, TypeSystem::DocModificationMode mode,
-                                  const AbstractMetaClass* cppClass,
+    bool writeInjectDocumentation(TextStream &s, TypeSystem::DocModificationMode mode,
+                                  const AbstractMetaClass *cppClass,
                                   const AbstractMetaFunctionCPtr &func);
     static void writeDocSnips(TextStream &s, const CodeSnipList &codeSnips,
                               TypeSystem::CodeSnipPosition position, TypeSystem::Language language);