diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-04-25 08:57:20 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-04-25 12:13:49 +0200 |
| commit | 0ca1c4ba6ecc604c70353ab50008a1295ca49959 (patch) | |
| tree | 34ae34e9c6c8fb8520c1b0a637785b81a354cc90 /sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp | |
| parent | da43cf70a9d125576f3795d7088e0100a4035ce5 (diff) | |
shiboken6: Refactor AbstractMetaClass::findClass() 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: I2ce9f3b44b704a24c01249c60e8e7a5a01ab38ba
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp')
| -rw-r--r-- | sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp b/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp index c1a296233..974536f21 100644 --- a/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp @@ -121,7 +121,7 @@ struct A { QVERIFY(!builder.isNull()); TypeDatabase* typeDb = TypeDatabase::instance(); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); // default ctor, default copy ctor, func a() and the added functions QCOMPARE(classA->functions().size(), 5); @@ -164,7 +164,7 @@ void TestAddFunction::testAddFunctionConstructor() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); QCOMPARE(classA->functions().size(), 3); // default and added ctors const auto addedFunc = classA->functions().constLast(); @@ -187,7 +187,7 @@ void TestAddFunction::testAddFunctionTagDefaultValues() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); // default ctor, default copy ctor and the added function QCOMPARE(classA->functions().size(), 3); @@ -213,7 +213,7 @@ void TestAddFunction::testAddFunctionCodeSnippets() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); const auto addedFunc = classA->functions().constLast(); QVERIFY(addedFunc->hasInjectedCode()); @@ -243,7 +243,7 @@ void TestAddFunction::testAddFunctionWithoutParenteses() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); const auto addedFunc = classA->findFunction(QLatin1String("func")); QVERIFY(!addedFunc.isNull()); @@ -280,7 +280,7 @@ void TestAddFunction::testAddFunctionWithDefaultArgs() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); const auto addedFunc = classA->findFunction(QLatin1String("func")); QVERIFY(!addedFunc.isNull()); @@ -303,7 +303,7 @@ void TestAddFunction::testAddFunctionAtModuleLevel() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); TypeDatabase* typeDb = TypeDatabase::instance(); @@ -344,7 +344,7 @@ void TestAddFunction::testAddFunctionWithVarargs() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); const auto addedFunc = classA->findFunction(QLatin1String("func")); QVERIFY(!addedFunc.isNull()); @@ -368,7 +368,7 @@ void TestAddFunction::testAddStaticFunction() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); const auto addedFunc = classA->findFunction(QLatin1String("func")); QVERIFY(!addedFunc.isNull()); @@ -394,7 +394,7 @@ void TestAddFunction::testAddGlobalFunction() QVERIFY(!builder.isNull()); const auto globalFuncs = builder->globalFunctions(); QCOMPARE(globalFuncs.size(), 2); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(builder->classes(), QLatin1String("B")); + const AbstractMetaClass *classB = AbstractMetaClass::findClass(builder->classes(), u"B"); QVERIFY(classB); QVERIFY(!classB->findFunction(QLatin1String("globalFunc"))); QVERIFY(!classB->findFunction(QLatin1String("globalFunc2"))); @@ -442,7 +442,7 @@ void TestAddFunction::testModifyAddedFunction() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - AbstractMetaClass* foo = AbstractMetaClass::findClass(classes, QLatin1String("Foo")); + AbstractMetaClass* foo = AbstractMetaClass::findClass(classes, u"Foo"); const auto method = foo->findFunction(QLatin1String("method")); QVERIFY(!method.isNull()); QCOMPARE(method->arguments().size(), 2); @@ -469,7 +469,7 @@ void TestAddFunction::testAddFunctionOnTypedef() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - AbstractMetaClass* foo = AbstractMetaClass::findClass(classes, QLatin1String("FooInt")); + AbstractMetaClass* foo = AbstractMetaClass::findClass(classes, u"FooInt"); QVERIFY(foo); QVERIFY(foo->hasNonPrivateConstructor()); const auto &lst = foo->queryFunctions(FunctionQueryOption::AnyConstructor); |
