From 3d8431182e97c9c87220e8d8ddfcd3abde22e31d Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 25 Apr 2022 11:48:22 +0200 Subject: shiboken6: Refactor AbstractMetaClass::findFunction[s]() to use QStringView UTF-16 string literals can then be passed as search strings. Pick-to: 6.3 6.2 Task-number: QTBUG-98434 Change-Id: Id3ce2934840ec56b3e2c4e070ed47321a264afa9 Reviewed-by: Christian Tismer --- .../ApiExtractor/abstractmetafunction.cpp | 2 +- .../shiboken6/ApiExtractor/abstractmetafunction.h | 2 +- .../shiboken6/ApiExtractor/abstractmetalang.cpp | 4 +-- sources/shiboken6/ApiExtractor/abstractmetalang.h | 4 +-- .../ApiExtractor/tests/testabstractmetaclass.cpp | 2 +- .../ApiExtractor/tests/testaddfunction.cpp | 20 +++++++------- .../ApiExtractor/tests/testmodifyfunction.cpp | 32 +++++++++++----------- .../shiboken6/ApiExtractor/tests/testnamespace.cpp | 4 +-- .../ApiExtractor/tests/testrefcounttag.cpp | 4 +-- .../ApiExtractor/tests/testreferencetopointer.cpp | 2 +- .../ApiExtractor/tests/testresolvetype.cpp | 2 +- .../shiboken6/ApiExtractor/tests/testtemplates.cpp | 12 ++++---- .../shiboken6/ApiExtractor/tests/testvoidarg.cpp | 6 ++-- .../shiboken6/generator/shiboken/cppgenerator.cpp | 2 +- 14 files changed, 49 insertions(+), 49 deletions(-) diff --git a/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp b/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp index 3476ceb82..89cd2306b 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp +++ b/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp @@ -1305,7 +1305,7 @@ QString AbstractMetaFunction::modifiedName() const AbstractMetaFunctionCPtr AbstractMetaFunction::find(const AbstractMetaFunctionCList &haystack, - const QString &needle) + QStringView needle) { for (const auto &f : haystack) { if (f->name() == needle) diff --git a/sources/shiboken6/ApiExtractor/abstractmetafunction.h b/sources/shiboken6/ApiExtractor/abstractmetafunction.h index 327cc2afe..c92ef6404 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetafunction.h +++ b/sources/shiboken6/ApiExtractor/abstractmetafunction.h @@ -394,7 +394,7 @@ public: bool isCallOperator() const; static AbstractMetaFunctionCPtr - find(const AbstractMetaFunctionCList &haystack, const QString &needle); + find(const AbstractMetaFunctionCList &haystack, QStringView needle); bool matches(OperatorQueryOptions) const; diff --git a/sources/shiboken6/ApiExtractor/abstractmetalang.cpp b/sources/shiboken6/ApiExtractor/abstractmetalang.cpp index 5ec45be9f..09e9c1381 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetalang.cpp +++ b/sources/shiboken6/ApiExtractor/abstractmetalang.cpp @@ -562,12 +562,12 @@ bool AbstractMetaClass::hasFunction(const QString &str) const return !findFunction(str).isNull(); } -AbstractMetaFunctionCPtr AbstractMetaClass::findFunction(const QString &functionName) const +AbstractMetaFunctionCPtr AbstractMetaClass::findFunction(QStringView functionName) const { return AbstractMetaFunction::find(d->m_functions, functionName); } -AbstractMetaFunctionCList AbstractMetaClass::findFunctions(const QString &functionName) const +AbstractMetaFunctionCList AbstractMetaClass::findFunctions(QStringView functionName) const { AbstractMetaFunctionCList result; std::copy_if(d->m_functions.cbegin(), d->m_functions.cend(), diff --git a/sources/shiboken6/ApiExtractor/abstractmetalang.h b/sources/shiboken6/ApiExtractor/abstractmetalang.h index cb4bc0985..23a34e7e1 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetalang.h +++ b/sources/shiboken6/ApiExtractor/abstractmetalang.h @@ -94,8 +94,8 @@ public: void setFunctions(const AbstractMetaFunctionCList &functions); void addFunction(const AbstractMetaFunctionCPtr &function); bool hasFunction(const QString &str) const; - AbstractMetaFunctionCPtr findFunction(const QString& functionName) const; - AbstractMetaFunctionCList findFunctions(const QString& functionName) const; + AbstractMetaFunctionCPtr findFunction(QStringView functionName) const; + AbstractMetaFunctionCList findFunctions(QStringView functionName) const; AbstractMetaFunctionCPtr findOperatorBool() const; // Find a Qt-style isNull() method suitable for nb_bool AbstractMetaFunctionCPtr findQtIsNullMethod() const; diff --git a/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp index 5889088b7..f5de6077a 100644 --- a/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp @@ -328,7 +328,7 @@ void TestAbstractMetaClass::testForwardDeclaredInnerClass() QVERIFY(classA); const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"A::B"); QVERIFY(classB); - const auto fooF = classB->findFunction(QLatin1String("foo")); + const auto fooF = classB->findFunction(u"foo"); QVERIFY(!fooF.isNull()); } diff --git a/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp b/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp index 974536f21..9eb49d6fc 100644 --- a/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp @@ -126,7 +126,7 @@ struct A { // default ctor, default copy ctor, func a() and the added functions QCOMPARE(classA->functions().size(), 5); - auto addedFunc = classA->findFunction(QLatin1String("b")); + auto addedFunc = classA->findFunction(u"b"); QVERIFY(addedFunc); QCOMPARE(addedFunc->access(), Access::Protected); QCOMPARE(addedFunc->functionType(), AbstractMetaFunction::NormalFunction); @@ -147,7 +147,7 @@ struct A { QCOMPARE(args.at(1).defaultValueExpression(), u"4.6"); QCOMPARE(args.at(2).type().typeEntry(), typeDb->findType(QLatin1String("B"))); - auto addedCallOperator = classA->findFunction(QLatin1String("operator()")); + auto addedCallOperator = classA->findFunction(u"operator()"); QVERIFY(addedCallOperator); } @@ -245,7 +245,7 @@ void TestAddFunction::testAddFunctionWithoutParenteses() AbstractMetaClassList classes = builder->classes(); const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); - const auto addedFunc = classA->findFunction(QLatin1String("func")); + const auto addedFunc = classA->findFunction(u"func"); QVERIFY(!addedFunc.isNull()); QVERIFY(addedFunc->hasInjectedCode()); const auto snips = addedFunc->injectedCodeSnips(TypeSystem::CodeSnipPositionAny, @@ -282,7 +282,7 @@ void TestAddFunction::testAddFunctionWithDefaultArgs() AbstractMetaClassList classes = builder->classes(); const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); - const auto addedFunc = classA->findFunction(QLatin1String("func")); + const auto addedFunc = classA->findFunction(u"func"); QVERIFY(!addedFunc.isNull()); const AbstractMetaArgument &arg = addedFunc->arguments().at(1); QCOMPARE(arg.defaultValueExpression(), u"2"); @@ -346,7 +346,7 @@ void TestAddFunction::testAddFunctionWithVarargs() AbstractMetaClassList classes = builder->classes(); const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); - const auto addedFunc = classA->findFunction(QLatin1String("func")); + const auto addedFunc = classA->findFunction(u"func"); QVERIFY(!addedFunc.isNull()); const AbstractMetaArgument &arg = addedFunc->arguments().constLast(); QVERIFY(arg.type().isVarargs()); @@ -370,7 +370,7 @@ void TestAddFunction::testAddStaticFunction() AbstractMetaClassList classes = builder->classes(); const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); - const auto addedFunc = classA->findFunction(QLatin1String("func")); + const auto addedFunc = classA->findFunction(u"func"); QVERIFY(!addedFunc.isNull()); QVERIFY(addedFunc->isStatic()); } @@ -396,8 +396,8 @@ void TestAddFunction::testAddGlobalFunction() QCOMPARE(globalFuncs.size(), 2); const AbstractMetaClass *classB = AbstractMetaClass::findClass(builder->classes(), u"B"); QVERIFY(classB); - QVERIFY(!classB->findFunction(QLatin1String("globalFunc"))); - QVERIFY(!classB->findFunction(QLatin1String("globalFunc2"))); + QVERIFY(!classB->findFunction(u"globalFunc")); + QVERIFY(!classB->findFunction(u"globalFunc2")); QVERIFY(!globalFuncs[0]->injectedCodeSnips().isEmpty()); QVERIFY(!globalFuncs[1]->injectedCodeSnips().isEmpty()); } @@ -443,7 +443,7 @@ void TestAddFunction::testModifyAddedFunction() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); AbstractMetaClass* foo = AbstractMetaClass::findClass(classes, u"Foo"); - const auto method = foo->findFunction(QLatin1String("method")); + const auto method = foo->findFunction(u"method"); QVERIFY(!method.isNull()); QCOMPARE(method->arguments().size(), 2); const AbstractMetaArgument &arg = method->arguments().at(1); @@ -476,7 +476,7 @@ void TestAddFunction::testAddFunctionOnTypedef() for (const auto &f : lst) QVERIFY(f->signature().startsWith(f->name())); QCOMPARE(lst.size(), 2); - const auto method = foo->findFunction(QLatin1String("method")); + const auto method = foo->findFunction(u"method"); QVERIFY(!method.isNull()); } diff --git a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp index ef4a9c559..3646d626b 100644 --- a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp @@ -67,7 +67,7 @@ void TestModifyFunction::testRenameArgument() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - const auto func = classA->findFunction(QLatin1String("method")); + const auto func = classA->findFunction(u"method"); QVERIFY(!func.isNull()); QCOMPARE(func->argumentName(1), u"otherArg"); @@ -95,7 +95,7 @@ void TestModifyFunction::testOwnershipTransfer() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); - const auto func = classB->findFunction(QLatin1String("method")); + const auto func = classB->findFunction(u"method"); QVERIFY(!func.isNull()); QCOMPARE(func->argumentTargetOwnership(func->ownerClass(), 0), @@ -145,44 +145,44 @@ void TestModifyFunction::invalidateAfterUse() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); - auto func = classB->findFunction(QLatin1String("call")); + auto func = classB->findFunction(u"call"); QCOMPARE(func->modifications().size(), 1); QCOMPARE(func->modifications().at(0).argument_mods().size(), 1); QVERIFY(func->modifications().at(0).argument_mods().at(0).resetAfterUse()); const AbstractMetaClass *classC = AbstractMetaClass::findClass(classes, u"C"); QVERIFY(classC); - func = classC->findFunction(QLatin1String("call")); + func = classC->findFunction(u"call"); QCOMPARE(func->modifications().size(), 1); QCOMPARE(func->modifications().at(0).argument_mods().size(), 1); QVERIFY(func->modifications().at(0).argument_mods().at(0).resetAfterUse()); - func = classC->findFunction(QLatin1String("call2")); + func = classC->findFunction(u"call2"); QCOMPARE(func->modifications().size(), 1); QCOMPARE(func->modifications().at(0).argument_mods().size(), 1); QVERIFY(func->modifications().at(0).argument_mods().at(0).resetAfterUse()); const AbstractMetaClass *classD = AbstractMetaClass::findClass(classes, u"D"); QVERIFY(classD); - func = classD->findFunction(QLatin1String("call")); + func = classD->findFunction(u"call"); QCOMPARE(func->modifications().size(), 1); QCOMPARE(func->modifications().at(0).argument_mods().size(), 1); QVERIFY(func->modifications().at(0).argument_mods().at(0).resetAfterUse()); - func = classD->findFunction(QLatin1String("call2")); + func = classD->findFunction(u"call2"); QCOMPARE(func->modifications().size(), 1); QCOMPARE(func->modifications().at(0).argument_mods().size(), 1); QVERIFY(func->modifications().at(0).argument_mods().at(0).resetAfterUse()); const AbstractMetaClass *classE = AbstractMetaClass::findClass(classes, u"E"); QVERIFY(classE); - func = classE->findFunction(QLatin1String("call")); + func = classE->findFunction(u"call"); QVERIFY(func); QCOMPARE(func->modifications().size(), 1); QCOMPARE(func->modifications().at(0).argument_mods().size(), 1); QVERIFY(func->modifications().at(0).argument_mods().at(0).resetAfterUse()); - func = classE->findFunction(QLatin1String("call2")); + func = classE->findFunction(u"call2"); QVERIFY(func); QCOMPARE(func->modifications().size(), 1); QCOMPARE(func->modifications().at(0).argument_mods().size(), 1); @@ -218,12 +218,12 @@ void TestModifyFunction::testWithApiVersion() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, u"B"); - auto func = classB->findFunction(QLatin1String("method")); + auto func = classB->findFunction(u"method"); auto returnOwnership = func->argumentTargetOwnership(func->ownerClass(), 0); QCOMPARE(returnOwnership, TypeSystem::CppOwnership); - func = classB->findFunction(QLatin1String("methodB")); + func = classB->findFunction(u"methodB"); returnOwnership = func->argumentTargetOwnership(func->ownerClass(), 0); QVERIFY(returnOwnership != TypeSystem::CppOwnership); } @@ -260,27 +260,27 @@ struct A { QVERIFY(classA); // Nothing specified, true - const auto f1 = classA->findFunction(QLatin1String("f1")); + const auto f1 = classA->findFunction(u"f1"); QVERIFY(!f1.isNull()); QVERIFY(!f1->allowThread()); // 'auto' specified, should be false for nontrivial function - const auto f2 = classA->findFunction(QLatin1String("f2")); + const auto f2 = classA->findFunction(u"f2"); QVERIFY(!f2.isNull()); QVERIFY(f2->allowThread()); // 'no' specified, should be false - const auto f3 = classA->findFunction(QLatin1String("f3")); + const auto f3 = classA->findFunction(u"f3"); QVERIFY(!f3.isNull()); QVERIFY(!f3->allowThread()); // Nothing specified, should be false for simple getter - const auto getter1 = classA->findFunction(QLatin1String("getter1")); + const auto getter1 = classA->findFunction(u"getter1"); QVERIFY(!getter1.isNull()); QVERIFY(!getter1->allowThread()); // Forced to true simple getter - const auto getter2 = classA->findFunction(QLatin1String("getter2")); + const auto getter2 = classA->findFunction(u"getter2"); QVERIFY(!getter2.isNull()); QVERIFY(getter2->allowThread()); // Forced to true simple getter } diff --git a/sources/shiboken6/ApiExtractor/tests/testnamespace.cpp b/sources/shiboken6/ApiExtractor/tests/testnamespace.cpp index 72c751270..34aa5eff5 100644 --- a/sources/shiboken6/ApiExtractor/tests/testnamespace.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testnamespace.cpp @@ -57,7 +57,7 @@ void NamespaceTest::testNamespaceMembers() QVERIFY(ns); auto metaEnum = ns->findEnum(QLatin1String("Option")); QVERIFY(metaEnum.has_value()); - const auto func = ns->findFunction(QLatin1String("foo")); + const auto func = ns->findFunction(u"foo"); QVERIFY(!func.isNull()); } @@ -89,7 +89,7 @@ void NamespaceTest::testNamespaceInnerClassMembers() QVERIFY(ins); const AbstractMetaClass *sc = AbstractMetaClass::findClass(classes, u"OuterNamespace::InnerNamespace::SomeClass"); QVERIFY(sc); - const auto meth = sc->findFunction(QLatin1String("method")); + const auto meth = sc->findFunction(u"method"); QVERIFY(!meth.isNull()); } diff --git a/sources/shiboken6/ApiExtractor/tests/testrefcounttag.cpp b/sources/shiboken6/ApiExtractor/tests/testrefcounttag.cpp index 3ef2bafbc..e8243643d 100644 --- a/sources/shiboken6/ApiExtractor/tests/testrefcounttag.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testrefcounttag.cpp @@ -55,7 +55,7 @@ void TestRefCountTag::testReferenceCountTag() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); - const auto func = classB->findFunction(QLatin1String("keepObject")); + const auto func = classB->findFunction(u"keepObject"); QVERIFY(!func.isNull()); const auto refCount = func->modifications().constFirst().argument_mods().constFirst().referenceCounts().constFirst(); @@ -89,7 +89,7 @@ void TestRefCountTag::testWithApiVersion() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); - const auto func = classB->findFunction(QLatin1String("keepObject")); + const auto func = classB->findFunction(u"keepObject"); QVERIFY(!func.isNull()); const auto refCount = func->modifications().constFirst().argument_mods().constFirst().referenceCounts().constFirst(); diff --git a/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp index df0a0889a..ca99a05ba 100644 --- a/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp @@ -50,7 +50,7 @@ void TestReferenceToPointer::testReferenceToPointerArgument() AbstractMetaClassList classes = builder->classes(); const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); QVERIFY(classB); - const auto func = classB->findFunction(QLatin1String("dummy")); + const auto func = classB->findFunction(u"dummy"); QVERIFY(!func.isNull()); QCOMPARE(func->arguments().constFirst().type().minimalSignature(), u"A*&"); } diff --git a/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp b/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp index 2616951f4..bfea490e4 100644 --- a/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp @@ -66,7 +66,7 @@ void TestResolveType::testResolveReturnTypeFromParentScope() AbstractMetaClassList classes = builder->classes(); const AbstractMetaClass *classD = AbstractMetaClass::findClass(classes, u"A::D"); QVERIFY(classD); - const auto meth = classD->findFunction(QLatin1String("method")); + const auto meth = classD->findFunction(u"method"); QVERIFY(!meth.isNull()); QVERIFY(meth); } diff --git a/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp b/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp index 3e7967317..bc4230816 100644 --- a/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp @@ -78,7 +78,7 @@ namespace Internet { AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, u"Bookmarks"); QVERIFY(classB); - const auto func = classB->findFunction(QLatin1String("list")); + const auto func = classB->findFunction(u"list"); QVERIFY(!func.isNull()); AbstractMetaType funcType = func->type(); QVERIFY(!funcType.isVoid()); @@ -118,7 +118,7 @@ namespace Namespace { QVERIFY(classB); QVERIFY(!classB->baseClass()); QVERIFY(classB->baseClassName().isEmpty()); - const auto func = classB->findFunction(QLatin1String("foo")); + const auto func = classB->findFunction(u"foo"); QVERIFY(!func.isNull()); AbstractMetaType argType = func->arguments().constFirst().type(); QCOMPARE(argType.instantiations().size(), 1); @@ -441,11 +441,11 @@ typedef Vector IntVector; ContainerTypeEntry::ListContainer); QCOMPARE(vector->functions().size(), 4); - const auto method = vector->findFunction(QLatin1String("method")); + const auto method = vector->findFunction(u"method"); QVERIFY(!method.isNull()); QCOMPARE(method->signature(), u"method(const Vector & vector)"); - const auto otherMethod = vector->findFunction(QLatin1String("otherMethod")); + const auto otherMethod = vector->findFunction(u"otherMethod"); QVERIFY(!otherMethod.isNull()); QCOMPARE(otherMethod->signature(), u"otherMethod()"); QVERIFY(!otherMethod->type().isVoid()); @@ -575,12 +575,12 @@ void TestTemplates::testTemplateTypeDefs() QCOMPARE(xmlOptionalInt->templateBaseClass(), optional); // Check whether the value() method now has an 'int' return - const auto valueMethod = optionalInt->findFunction(QLatin1String("value")); + const auto valueMethod = optionalInt->findFunction(u"value"); QVERIFY(!valueMethod.isNull()); QCOMPARE(valueMethod->type().cppSignature(), u"int"); // ditto for typesystem XML - const auto xmlValueMethod = xmlOptionalInt->findFunction(QLatin1String("value")); + const auto xmlValueMethod = xmlOptionalInt->findFunction(u"value"); QVERIFY(!xmlValueMethod.isNull()); QCOMPARE(xmlValueMethod->type().cppSignature(), u"int"); diff --git a/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp b/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp index f0628200b..b3a065552 100644 --- a/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp @@ -45,7 +45,7 @@ void TestVoidArg::testVoidParsedFunction() AbstractMetaClassList classes = builder->classes(); const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); - const auto addedFunc = classA->findFunction(QLatin1String("a")); + const auto addedFunc = classA->findFunction(u"a"); QVERIFY(!addedFunc.isNull()); QCOMPARE(addedFunc->arguments().size(), 0); } @@ -64,7 +64,7 @@ void TestVoidArg::testVoidAddedFunction() AbstractMetaClassList classes = builder->classes(); const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); - const auto addedFunc = classA->findFunction(QLatin1String("a")); + const auto addedFunc = classA->findFunction(u"a"); QVERIFY(!addedFunc.isNull()); QCOMPARE(addedFunc->arguments().size(), 0); @@ -82,7 +82,7 @@ void TestVoidArg::testVoidPointerParsedFunction() AbstractMetaClassList classes = builder->classes(); const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); - const auto addedFunc = classA->findFunction(QLatin1String("a")); + const auto addedFunc = classA->findFunction(u"a"); QVERIFY(!addedFunc.isNull()); QCOMPARE(addedFunc->arguments().size(), 1); diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp index b2f49fb8b..a7ce16ca4 100644 --- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp +++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp @@ -4527,7 +4527,7 @@ void CppGenerator::writeClassDefinition(TextStream &s, if (!metaClass->typeEntry()->hashFunction().isEmpty()) tp_hash = u'&' + cpythonBaseName(metaClass) + QLatin1String("_HashFunc"); - const auto callOp = metaClass->findFunction(QLatin1String("operator()")); + const auto callOp = metaClass->findFunction(u"operator()"); if (!callOp.isNull() && !callOp->isModifiedRemoved()) tp_call = u'&' + cpythonFunctionName(callOp); -- cgit v1.2.3