1 files changed, 13 insertions, 38 deletions

diff --git a/sources/shiboken6/ApiExtractor/codesniphelpers.cpp b/sources/shiboken6/ApiExtractor/codesniphelpers.cpp
index f9bae0a65..775cf10af 100644
--- a/sources/shiboken6/ApiExtractor/codesniphelpers.cpp
+++ b/sources/shiboken6/ApiExtractor/codesniphelpers.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part 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) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "codesniphelpers.h"
 
@@ -51,9 +26,9 @@ QString CodeSnipHelpers::dedent(const QString &code)
     if (code.isEmpty())
         return code;
     // Right trim if indent=0, or trim if single line
-    if (!code.at(0).isSpace() || !code.contains(QLatin1Char('\n')))
+    if (!code.at(0).isSpace() || !code.contains(u'\n'))
         return code.trimmed();
-    const auto lines = QStringView{code}.split(QLatin1Char('\n'));
+    const auto lines = QStringView{code}.split(u'\n');
     int spacesToRemove = std::numeric_limits<int>::max();
     for (const auto &line : lines) {
         if (!isEmpty(line)) {
@@ -68,35 +43,35 @@ QString CodeSnipHelpers::dedent(const QString &code)
     for (const auto &line : lines) {
         if (!isEmpty(line) && spacesToRemove < line.size())
             result += line.mid(spacesToRemove).toString();
-        result += QLatin1Char('\n');
+        result += u'\n';
     }
     return result;
 }
 
 QString CodeSnipHelpers::fixSpaces(QString code)
 {
-    code.remove(QLatin1Char('\r'));
+    code.remove(u'\r');
     // Check for XML <tag>\n<space>bla...
-    if (code.startsWith(QLatin1String("\n ")))
+    if (code.startsWith(u"\n "))
         code.remove(0, 1);
     while (!code.isEmpty() && code.back().isSpace())
         code.chop(1);
     code = dedent(code);
-    if (!code.isEmpty() && !code.endsWith(QLatin1Char('\n')))
-        code.append(QLatin1Char('\n'));
+    if (!code.isEmpty() && !code.endsWith(u'\n'))
+        code.append(u'\n');
     return code;
 }
 
 // Prepend a line to the code, observing indentation
 void CodeSnipHelpers::prependCode(QString *code, QString firstLine)
 {
-    while (!code->isEmpty() && code->front() == QLatin1Char('\n'))
+    while (!code->isEmpty() && code->front() == u'\n')
         code->remove(0, 1);
     if (!code->isEmpty() && code->front().isSpace()) {
         const int indent = firstNonBlank(*code);
-        firstLine.prepend(QString(indent, QLatin1Char(' ')));
+        firstLine.prepend(QString(indent, u' '));
     }
-    if (!firstLine.endsWith(QLatin1Char('\n')))
-        firstLine += QLatin1Char('\n');
+    if (!firstLine.endsWith(u'\n'))
+        firstLine += u'\n';
     code->prepend(firstLine);
 }