1 files changed, 19 insertions, 43 deletions

diff --git a/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp b/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp
index fda6614f0..23cf0f9ea 100644
--- a/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp
@@ -1,42 +1,19 @@
-/****************************************************************************
-**
-** 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 "testinserttemplate.h"
 #include <QtTest/QTest>
 #include "testutil.h"
 #include <abstractmetalang.h>
+#include <codesnip.h>
 #include <modifications.h>
-#include <typesystem.h>
+#include <complextypeentry.h>
+#include <typesystemtypeentry.h>
 
 void TestInsertTemplate::testInsertTemplateOnClassInjectCode()
 {
-    const char* cppCode ="struct A{};\n";
-    const char* xmlCode = "\
+    const char cppCode[] = "struct A{};\n";
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <template name='code_template'>\n\
         code template content\n\
@@ -48,20 +25,20 @@ void TestInsertTemplate::testInsertTemplateOnClassInjectCode()
         </value-type>\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
     AbstractMetaClassList classes = builder->classes();
-    QCOMPARE(classes.count(), 1);
-    const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A"));
+    QCOMPARE(classes.size(), 1);
+    const auto classA = AbstractMetaClass::findClass(classes, "A");
     QVERIFY(classA);
-    QCOMPARE(classA->typeEntry()->codeSnips().count(), 1);
+    QCOMPARE(classA->typeEntry()->codeSnips().size(), 1);
     QString code = classA->typeEntry()->codeSnips().constFirst().code();
-    QVERIFY(code.contains(QLatin1String("code template content")));
+    QVERIFY(code.contains(u"code template content"));
 }
 
 void TestInsertTemplate::testInsertTemplateOnModuleInjectCode()
 {
-    const char* cppCode ="";
-    const char* xmlCode = "\
+    const char cppCode[] = "";
+    const char xmlCode[] = "\
     <typesystem package='Foo'>\n\
         <template name='code_template'>\n\
         code template content\n\
@@ -71,17 +48,16 @@ void TestInsertTemplate::testInsertTemplateOnModuleInjectCode()
         </inject-code>\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false));
-    QVERIFY(!builder.isNull());
+    QVERIFY(builder);
     AbstractMetaClassList classes = builder->classes();
     QVERIFY(classes.isEmpty());
 
-    const TypeSystemTypeEntry *module = TypeDatabase::instance()->defaultTypeSystemType();
+    TypeSystemTypeEntryCPtr module = TypeDatabase::instance()->defaultTypeSystemType();
     QVERIFY(module);
-    QCOMPARE(module->name(), QLatin1String("Foo"));
-    QVERIFY(module);
-    QCOMPARE(module->codeSnips().count(), 1);
+    QCOMPARE(module->name(), u"Foo");
+    QCOMPARE(module->codeSnips().size(), 1);
     QString code = module->codeSnips().constFirst().code().trimmed();
-    QVERIFY(code.contains(QLatin1String("code template content")));
+    QVERIFY(code.contains(u"code template content"));
 }
 
 QTEST_APPLESS_MAIN(TestInsertTemplate)