1 files changed, 13 insertions, 12 deletions
diff --git a/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp b/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp
index 56d70336a..a600181a5 100644
--- a/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp
@@ -4,6 +4,7 @@
 #include "testvoidarg.h"
 #include <QtTest/QTest>
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
 #include <typesystem.h>
@@ -16,12 +17,12 @@ void TestVoidArg::testVoidParsedFunction()
         <value-type name='A'/>\n\
     </typesystem>";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
     AbstractMetaClassList classes = builder->classes();
-    const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A");
+    const auto classA = AbstractMetaClass::findClass(classes, "A");
     QVERIFY(classA);
-    const auto addedFunc = classA->findFunction(u"a");
-    QVERIFY(!addedFunc.isNull());
+    const auto addedFunc = classA->findFunction("a");
+    QVERIFY(addedFunc);
     QCOMPARE(addedFunc->arguments().size(), 0);
 }
 
@@ -35,12 +36,12 @@ void TestVoidArg::testVoidAddedFunction()
         </value-type>\n\
     </typesystem>";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
     AbstractMetaClassList classes = builder->classes();
-    const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A");
+    const auto classA = AbstractMetaClass::findClass(classes, "A");
     QVERIFY(classA);
-    const auto addedFunc = classA->findFunction(u"a");
-    QVERIFY(!addedFunc.isNull());
+    const auto addedFunc = classA->findFunction("a");
+    QVERIFY(addedFunc);
     QCOMPARE(addedFunc->arguments().size(), 0);
 
 }
@@ -53,12 +54,12 @@ void TestVoidArg::testVoidPointerParsedFunction()
         <value-type name='A' />\n\
     </typesystem>";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
     AbstractMetaClassList classes = builder->classes();
-    const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A");
+    const auto classA = AbstractMetaClass::findClass(classes, "A");
     QVERIFY(classA);
-    const auto addedFunc = classA->findFunction(u"a");
-    QVERIFY(!addedFunc.isNull());
+    const auto addedFunc = classA->findFunction("a");
+    QVERIFY(addedFunc);
     QCOMPARE(addedFunc->arguments().size(), 1);
 
 }