1 files changed, 36 insertions, 59 deletions

diff --git a/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp
index 9dcdec975..899d00ad4 100644
--- a/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp
@@ -1,41 +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 "testimplicitconversions.h"
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
-#include <typesystem.h>
+#include <abstractmetatype.h>
+#include <complextypeentry.h>
 #include <QtTest/QTest>
 
 void TestImplicitConversions::testWithPrivateCtors()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     class B;\n\
     class C;\n\
     class A {\n\
@@ -45,35 +22,35 @@ void TestImplicitConversions::testWithPrivateCtors()
     };\n\
     class B {};\n\
     class C {};\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <value-type name='A'/>\n\
         <value-type name='B'/>\n\
         <value-type name='C'/>\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
     AbstractMetaClassList classes = builder->classes();
-    QCOMPARE(classes.count(), 3);
+    QCOMPARE(classes.size(), 3);
 
-    const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A"));
-    const AbstractMetaClass *classC = AbstractMetaClass::findClass(classes, QLatin1String("C"));
+    const auto classA = AbstractMetaClass::findClass(classes, "A");
+    const auto classC = AbstractMetaClass::findClass(classes, "C");
     const auto implicitConvs = classA->implicitConversions();
-    QCOMPARE(implicitConvs.count(), 1);
+    QCOMPARE(implicitConvs.size(), 1);
     QCOMPARE(implicitConvs.constFirst()->arguments().constFirst().type().typeEntry(),
              classC->typeEntry());
 }
 
 void TestImplicitConversions::testWithModifiedVisibility()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     class B;\n\
     class A {\n\
     public:\n\
         A(const B&);\n\
     };\n\
     class B {};\n";
-    const char* xmlCode = R"(
+    const char xmlCode[] = R"(
 <typesystem package='Foo'>
     <value-type name='A'>
         <modify-function signature='A(const B&amp;)' access='private'/>
@@ -82,13 +59,13 @@ void TestImplicitConversions::testWithModifiedVisibility()
 </typesystem>
 )";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
     AbstractMetaClassList classes = builder->classes();
-    QCOMPARE(classes.count(), 2);
-    const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A"));
-    const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, QLatin1String("B"));
+    QCOMPARE(classes.size(), 2);
+    const auto classA = AbstractMetaClass::findClass(classes, "A");
+    const auto classB = AbstractMetaClass::findClass(classes, "B");
     const auto implicitConvs = classA->implicitConversions();
-    QCOMPARE(implicitConvs.count(), 1);
+    QCOMPARE(implicitConvs.size(), 1);
     QCOMPARE(implicitConvs.constFirst()->arguments().constFirst().type().typeEntry(),
              classB->typeEntry());
 }
@@ -96,7 +73,7 @@ void TestImplicitConversions::testWithModifiedVisibility()
 
 void TestImplicitConversions::testWithAddedCtor()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     class B;\n\
     class A {\n\
     public:\n\
@@ -104,7 +81,7 @@ void TestImplicitConversions::testWithAddedCtor()
     };\n\
     class B {};\n\
     class C {};\n";
-    const char* xmlCode = "\
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <custom-type name='TARGETLANGTYPE'/>\n\
         <value-type name='A'>\n\
@@ -116,49 +93,49 @@ void TestImplicitConversions::testWithAddedCtor()
         <value-type name='C'/>\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
     AbstractMetaClassList classes = builder->classes();
-    QCOMPARE(classes.count(), 3);
+    QCOMPARE(classes.size(), 3);
 
-    const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A"));
+    const auto classA = AbstractMetaClass::findClass(classes, "A");
     auto implicitConvs = classA->implicitConversions();
-    QCOMPARE(implicitConvs.count(), 2);
+    QCOMPARE(implicitConvs.size(), 2);
 
     // Added constructors with custom types should never result in implicit converters.
-    const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, QLatin1String("B"));
+    const auto classB = AbstractMetaClass::findClass(classes, "B");
     implicitConvs = classB->implicitConversions();
-    QCOMPARE(implicitConvs.count(), 0);
+    QCOMPARE(implicitConvs.size(), 0);
 }
 
 void TestImplicitConversions::testWithExternalConversionOperator()
 {
-    const char* cppCode ="\
+    const char cppCode[] = "\
     class A {};\n\
     struct B {\n\
         operator A() const;\n\
     };\n";
-    const char* xmlCode = "\n\
+    const char xmlCode[] = "\n\
     <typesystem package='Foo'>\n\
         <value-type name='A'/>\n\
         <value-type name='B'/>\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
     AbstractMetaClassList classes = builder->classes();
-    QCOMPARE(classes.count(), 2);
-    AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, QLatin1String("A"));
-    AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, QLatin1String("B"));
+    QCOMPARE(classes.size(), 2);
+    const auto classA = AbstractMetaClass::findClass(classes, "A");
+    const auto classB = AbstractMetaClass::findClass(classes, "B");
     const auto implicitConvs = classA->implicitConversions();
-    QCOMPARE(implicitConvs.count(), 1);
+    QCOMPARE(implicitConvs.size(), 1);
     const auto &externalConvOps = classA->externalConversionOperators();
-    QCOMPARE(externalConvOps.count(), 1);
+    QCOMPARE(externalConvOps.size(), 1);
 
     AbstractMetaFunctionCPtr convOp;
     for (const auto &func : classB->functions()) {
         if (func->isConversionOperator())
             convOp = func;
     }
-    QVERIFY(!convOp.isNull());
+    QVERIFY(convOp);
     QCOMPARE(implicitConvs.constFirst(), convOp);
 }