1 files changed, 20 insertions, 40 deletions

diff --git a/sources/shiboken6/ApiExtractor/tests/testfunctiontag.cpp b/sources/shiboken6/ApiExtractor/tests/testfunctiontag.cpp
index f58ea6f64..18eaf5774 100644
--- a/sources/shiboken6/ApiExtractor/tests/testfunctiontag.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testfunctiontag.cpp
@@ -1,38 +1,18 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of Qt for Python.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "testfunctiontag.h"
-#include <QtTest/QTest>
 #include "testutil.h"
 #include <abstractmetafunction.h>
 #include <modifications.h>
 #include <typesystem.h>
 
+#include <qtcompat.h>
+
+#include <QtTest/QTest>
+
+using namespace Qt::StringLiterals;
+
 void TestFunctionTag::testFunctionTagForSpecificSignature()
 {
     const char cppCode[] = "void globalFunction(int); void globalFunction(float); void dummy();\n";
@@ -43,9 +23,9 @@ void TestFunctionTag::testFunctionTagForSpecificSignature()
         <function signature='globalFunction(int)'/>\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
 
-    const TypeEntry *func = TypeDatabase::instance()->findType(QLatin1String("globalFunction"));
+    TypeEntryCPtr func = TypeDatabase::instance()->findType(u"globalFunction"_s);
     QVERIFY(func);
     QCOMPARE(builder->globalFunctions().size(), 1);
 }
@@ -61,24 +41,24 @@ void TestFunctionTag::testFunctionTagForAllSignatures()
         <function signature='globalFunction(float)'/>\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
 
-    const TypeEntry *func = TypeDatabase::instance()->findType(QLatin1String("globalFunction"));
+    TypeEntryCPtr func = TypeDatabase::instance()->findType(u"globalFunction"_s);
     QVERIFY(func);
     QCOMPARE(builder->globalFunctions().size(), 2);
 }
 
 void TestFunctionTag::testRenameGlobalFunction()
 {
-    const char* cppCode ="void global_function_with_ugly_name();\n";
-    const char* xmlCode = "\
+    const char cppCode[] = "void global_function_with_ugly_name();\n";
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <function signature='global_function_with_ugly_name()' rename='smooth'/>\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
 
-    const TypeEntry *func = TypeDatabase::instance()->findType(QLatin1String("global_function_with_ugly_name"));
+    TypeEntryCPtr func = TypeDatabase::instance()->findType(u"global_function_with_ugly_name"_s);
     QVERIFY(func);
 
     QCOMPARE(builder->globalFunctions().size(), 1);
@@ -88,11 +68,11 @@ void TestFunctionTag::testRenameGlobalFunction()
     QCOMPARE(metaFunc->modifications().size(), 1);
     QVERIFY(metaFunc->modifications().constFirst().isRenameModifier());
     QCOMPARE(metaFunc->modifications().constFirst().renamedToName(),
-             QLatin1String("smooth"));
+             u"smooth");
 
-    QCOMPARE(metaFunc->name(), QLatin1String("smooth"));
-    QCOMPARE(metaFunc->originalName(), QLatin1String("global_function_with_ugly_name"));
-    QCOMPARE(metaFunc->minimalSignature(), QLatin1String("global_function_with_ugly_name()"));
+    QCOMPARE(metaFunc->name(), u"smooth");
+    QCOMPARE(metaFunc->originalName(), u"global_function_with_ugly_name");
+    QCOMPARE(metaFunc->minimalSignature(), u"global_function_with_ugly_name()");
 }
 
 QTEST_APPLESS_MAIN(TestFunctionTag)