1 files changed, 23 insertions, 21 deletions

diff --git a/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp
index f600c3ea9..899d00ad4 100644
--- a/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp
@@ -3,14 +3,16 @@
 
 #include "testimplicitconversions.h"
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
+#include <abstractmetatype.h>
 #include <complextypeentry.h>
 #include <QtTest/QTest>
 
 void TestImplicitConversions::testWithPrivateCtors()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     class B;\n\
     class C;\n\
     class A {\n\
@@ -20,19 +22,19 @@ 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\
         <value-type name='C'/>\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 3);
 
-    const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A");
-    const AbstractMetaClass *classC = AbstractMetaClass::findClass(classes, u"C");
+    const auto classA = AbstractMetaClass::findClass(classes, "A");
+    const auto classC = AbstractMetaClass::findClass(classes, "C");
     const auto implicitConvs = classA->implicitConversions();
     QCOMPARE(implicitConvs.size(), 1);
     QCOMPARE(implicitConvs.constFirst()->arguments().constFirst().type().typeEntry(),
@@ -41,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'/>
@@ -57,11 +59,11 @@ void TestImplicitConversions::testWithModifiedVisibility()
 </typesystem>
 )";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 2);
-    const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A");
-    const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B");
+    const auto classA = AbstractMetaClass::findClass(classes, "A");
+    const auto classB = AbstractMetaClass::findClass(classes, "B");
     const auto implicitConvs = classA->implicitConversions();
     QCOMPARE(implicitConvs.size(), 1);
     QCOMPARE(implicitConvs.constFirst()->arguments().constFirst().type().typeEntry(),
@@ -71,7 +73,7 @@ void TestImplicitConversions::testWithModifiedVisibility()
 
 void TestImplicitConversions::testWithAddedCtor()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     class B;\n\
     class A {\n\
     public:\n\
@@ -79,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\
@@ -91,38 +93,38 @@ void TestImplicitConversions::testWithAddedCtor()
         <value-type name='C'/>\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 3);
 
-    const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A");
+    const auto classA = AbstractMetaClass::findClass(classes, "A");
     auto implicitConvs = classA->implicitConversions();
     QCOMPARE(implicitConvs.size(), 2);
 
     // Added constructors with custom types should never result in implicit converters.
-    const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B");
+    const auto classB = AbstractMetaClass::findClass(classes, "B");
     implicitConvs = classB->implicitConversions();
     QCOMPARE(implicitConvs.size(), 0);
 }
 
 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\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
     AbstractMetaClassList classes = builder->classes();
     QCOMPARE(classes.size(), 2);
-    AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A");
-    AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, u"B");
+    const auto classA = AbstractMetaClass::findClass(classes, "A");
+    const auto classB = AbstractMetaClass::findClass(classes, "B");
     const auto implicitConvs = classA->implicitConversions();
     QCOMPARE(implicitConvs.size(), 1);
     const auto &externalConvOps = classA->externalConversionOperators();
@@ -133,7 +135,7 @@ void TestImplicitConversions::testWithExternalConversionOperator()
         if (func->isConversionOperator())
             convOp = func;
     }
-    QVERIFY(!convOp.isNull());
+    QVERIFY(convOp);
     QCOMPARE(implicitConvs.constFirst(), convOp);
 }