1 files changed, 24 insertions, 47 deletions

diff --git a/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp b/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp
index de2f30135..9eef7ec47 100644
--- a/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp
@@ -1,45 +1,22 @@
-/****************************************************************************
-**
-** 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 "testnumericaltypedef.h"
 #include <QtTest/QTest>
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
+#include <abstractmetatype.h>
 #include <typesystem.h>
 
 void TestNumericalTypedef::testNumericalTypedef()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     typedef double real;\n\
     void funcDouble(double);\n\
     void funcReal(real);\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='double'/>\n\
         <primitive-type name='real'/>\n\
@@ -47,37 +24,37 @@ void TestNumericalTypedef::testNumericalTypedef()
         <function signature='funcReal(real)'/>\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
 
     QCOMPARE(builder->globalFunctions().size(), 2);
     auto funcDouble = builder->globalFunctions().constFirst();
     auto funcReal = builder->globalFunctions().constLast();
     QVERIFY(funcReal);
 
-    if (funcDouble->name() == QLatin1String("funcReal"))
+    if (funcDouble->name() == u"funcReal")
         std::swap(funcDouble, funcReal);
 
-    QCOMPARE(funcDouble->minimalSignature(), QLatin1String("funcDouble(double)"));
-    QCOMPARE(funcReal->minimalSignature(), QLatin1String("funcReal(real)"));
+    QCOMPARE(funcDouble->minimalSignature(), u"funcDouble(double)");
+    QCOMPARE(funcReal->minimalSignature(), u"funcReal(real)");
 
     const AbstractMetaType doubleType = funcDouble->arguments().constFirst().type();
-    QCOMPARE(doubleType.cppSignature(), QLatin1String("double"));
+    QCOMPARE(doubleType.cppSignature(), u"double");
     QVERIFY(doubleType.isPrimitive());
-    QVERIFY(doubleType.typeEntry()->isCppPrimitive());
+    QVERIFY(isCppPrimitive(doubleType.typeEntry()));
 
     const AbstractMetaType realType = funcReal->arguments().constFirst().type();
-    QCOMPARE(realType.cppSignature(), QLatin1String("real"));
+    QCOMPARE(realType.cppSignature(), u"real");
     QVERIFY(realType.isPrimitive());
-    QVERIFY(realType.typeEntry()->isCppPrimitive());
+    QVERIFY(isCppPrimitive(realType.typeEntry()));
 }
 
 void TestNumericalTypedef::testUnsignedNumericalTypedef()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     typedef unsigned short custom_ushort;\n\
     void funcUnsignedShort(unsigned short);\n\
     void funcUShort(custom_ushort);\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='short'/>\n\
         <primitive-type name='unsigned short'/>\n\
@@ -86,27 +63,27 @@ void TestNumericalTypedef::testUnsignedNumericalTypedef()
         <function signature='funcUShort(custom_ushort)'/>\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
 
     QCOMPARE(builder->globalFunctions().size(), 2);
     auto funcUnsignedShort = builder->globalFunctions().constFirst();
     auto funcUShort = builder->globalFunctions().constLast();
 
-    if (funcUnsignedShort->name() == QLatin1String("funcUShort"))
+    if (funcUnsignedShort->name() == u"funcUShort")
         std::swap(funcUnsignedShort, funcUShort);
 
-    QCOMPARE(funcUnsignedShort->minimalSignature(), QLatin1String("funcUnsignedShort(unsigned short)"));
-    QCOMPARE(funcUShort->minimalSignature(), QLatin1String("funcUShort(custom_ushort)"));
+    QCOMPARE(funcUnsignedShort->minimalSignature(), u"funcUnsignedShort(unsigned short)");
+    QCOMPARE(funcUShort->minimalSignature(), u"funcUShort(custom_ushort)");
 
     const AbstractMetaType unsignedShortType = funcUnsignedShort->arguments().constFirst().type();
-    QCOMPARE(unsignedShortType.cppSignature(), QLatin1String("unsigned short"));
+    QCOMPARE(unsignedShortType.cppSignature(), u"unsigned short");
     QVERIFY(unsignedShortType.isPrimitive());
-    QVERIFY(unsignedShortType.typeEntry()->isCppPrimitive());
+    QVERIFY(isCppPrimitive(unsignedShortType.typeEntry()));
 
     const AbstractMetaType ushortType = funcUShort->arguments().constFirst().type();
-    QCOMPARE(ushortType.cppSignature(), QLatin1String("custom_ushort"));
+    QCOMPARE(ushortType.cppSignature(), u"custom_ushort");
     QVERIFY(ushortType.isPrimitive());
-    QVERIFY(ushortType.typeEntry()->isCppPrimitive());
+    QVERIFY(isCppPrimitive(ushortType.typeEntry()));
 }
 
 QTEST_APPLESS_MAIN(TestNumericalTypedef)