1 files changed, 34 insertions, 34 deletions

diff --git a/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.cpp b/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.cpp
index 2e07b8cba..16f50e69d 100644
--- a/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.cpp
@@ -56,16 +56,16 @@ void TestDropTypeEntries::testDropEntries()
         u"Foo.NamespaceA.InnerNamespaceA"_s};
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false,
                                                                 QString(), droppedEntries));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
 
     AbstractMetaClassList classes = builder->classes();
-    QVERIFY(AbstractMetaClass::findClass(classes, u"ValueA"));
-    QVERIFY(!AbstractMetaClass::findClass(classes, u"ValueB"));
-    QVERIFY(AbstractMetaClass::findClass(classes, u"ObjectA"));
-    QVERIFY(!AbstractMetaClass::findClass(classes, u"ObjectB"));
-    QVERIFY(AbstractMetaClass::findClass(classes, u"NamespaceA"));
-    QVERIFY(!AbstractMetaClass::findClass(classes, u"NamespaceA::InnerClassA"));
-    QVERIFY(!AbstractMetaClass::findClass(classes, u"NamespaceB"));
+    QVERIFY(AbstractMetaClass::findClass(classes, "ValueA"));
+    QVERIFY(!AbstractMetaClass::findClass(classes, "ValueB"));
+    QVERIFY(AbstractMetaClass::findClass(classes, "ObjectA"));
+    QVERIFY(!AbstractMetaClass::findClass(classes, "ObjectB"));
+    QVERIFY(AbstractMetaClass::findClass(classes, "NamespaceA"));
+    QVERIFY(!AbstractMetaClass::findClass(classes, "NamespaceA::InnerClassA"));
+    QVERIFY(!AbstractMetaClass::findClass(classes, "NamespaceB"));
 
     AbstractMetaEnumList globalEnums = builder->globalEnums();
     QCOMPARE(globalEnums.size(), 1);
@@ -79,16 +79,16 @@ void TestDropTypeEntries::testDropEntries()
 void TestDropTypeEntries::testDontDropEntries()
 {
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
 
     AbstractMetaClassList classes = builder->classes();
-    QVERIFY(AbstractMetaClass::findClass(classes, u"ValueA"));
-    QVERIFY(AbstractMetaClass::findClass(classes, u"ValueB"));
-    QVERIFY(AbstractMetaClass::findClass(classes, u"ObjectA"));
-    QVERIFY(AbstractMetaClass::findClass(classes, u"ObjectB"));
-    QVERIFY(AbstractMetaClass::findClass(classes, u"NamespaceA"));
-    QVERIFY(AbstractMetaClass::findClass(classes, u"NamespaceA::InnerClassA"));
-    QVERIFY(AbstractMetaClass::findClass(classes, u"NamespaceB"));
+    QVERIFY(AbstractMetaClass::findClass(classes, "ValueA"));
+    QVERIFY(AbstractMetaClass::findClass(classes, "ValueB"));
+    QVERIFY(AbstractMetaClass::findClass(classes, "ObjectA"));
+    QVERIFY(AbstractMetaClass::findClass(classes, "ObjectB"));
+    QVERIFY(AbstractMetaClass::findClass(classes, "NamespaceA"));
+    QVERIFY(AbstractMetaClass::findClass(classes, "NamespaceA::InnerClassA"));
+    QVERIFY(AbstractMetaClass::findClass(classes, "NamespaceB"));
 
     QCOMPARE(builder->globalEnums().size(), 2);
 
@@ -115,21 +115,21 @@ void TestDropTypeEntries::testDropEntryWithChildTags()
     QStringList droppedEntries(u"Foo.ValueA"_s);
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode2, xmlCode2, false,
                                                                 QString(), droppedEntries));
-    QVERIFY(!builder.isNull());
-    QVERIFY(!AbstractMetaClass::findClass(builder->classes(), u"ValueA"));
+    QVERIFY(builder);
+    QVERIFY(!AbstractMetaClass::findClass(builder->classes(), "ValueA"));
 }
 
 
 void TestDropTypeEntries::testDontDropEntryWithChildTags()
 {
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode2, xmlCode2, false));
-    QVERIFY(!builder.isNull());
-    QVERIFY(AbstractMetaClass::findClass(builder->classes(), u"ValueA"));
+    QVERIFY(builder);
+    QVERIFY(AbstractMetaClass::findClass(builder->classes(), "ValueA"));
 }
 
 void TestDropTypeEntries::testConditionalParsing_data()
 {
-    const QString xml = QStringLiteral(R"(<?xml version="1.0" encoding="UTF-8"?>
+    const QString xml = R"(<?xml version="1.0" encoding="UTF-8"?>
 <root>
     <tag1>text</tag1>
     <?if keyword1?>
@@ -145,17 +145,17 @@ void TestDropTypeEntries::testConditionalParsing_data()
     <?if !keyword99?> <!-- Exclusion only -->
         <tag6>text</tag6>
     <?endif?>
-</root>)");
-
-    const QString root = QStringLiteral("root");
-    const QString tag1 = QStringLiteral("tag1");
-    const QString tag2 = QStringLiteral("tag2");
-    const QString tag3 = QStringLiteral("tag3");
-    const QString tag4 = QStringLiteral("tag4");
-    const QString tag5 = QStringLiteral("tag5");
-    const QString tag6 = QStringLiteral("tag6");
-    const QString keyword1 = QStringLiteral("keyword1");
-    const QString keyword2 = QStringLiteral("keyword2");
+</root>)"_L1;
+
+    constexpr auto root = "root"_L1;
+    constexpr auto tag1 = "tag1"_L1;
+    constexpr auto tag2 = "tag2"_L1;
+    constexpr auto tag3 = "tag3"_L1;
+    constexpr auto tag4 = "tag4"_L1;
+    constexpr auto tag5 = "tag5"_L1;
+    constexpr auto tag6 = "tag6"_L1;
+    constexpr auto keyword1 = "keyword1"_L1;
+    constexpr auto keyword2 = "keyword2"_L1;
 
     QTest::addColumn<QString>("xml");
     QTest::addColumn<QStringList>("keywords");
@@ -204,11 +204,11 @@ void TestDropTypeEntries::testConditionalParsing()
 
 void TestDropTypeEntries::testEntityParsing()
 {
-    const QString xml = QStringLiteral(R"(<?xml version="1.0" encoding="UTF-8"?>
+    const QString xml = R"(<?xml version="1.0" encoding="UTF-8"?>
 <root>
     <?entity testentity word1 word2?>
     <text>bla &testentity;</text>
-</root>)");
+</root>)"_L1;
 
     QString actual;
     ConditionalStreamReader reader(xml);