diff options
Diffstat (limited to 'src/qtattributionsscanner/jsongenerator.cpp')
| -rw-r--r-- | src/qtattributionsscanner/jsongenerator.cpp | 70 |
1 files changed, 24 insertions, 46 deletions
diff --git a/src/qtattributionsscanner/jsongenerator.cpp b/src/qtattributionsscanner/jsongenerator.cpp index 593a65295..2a194264e 100644 --- a/src/qtattributionsscanner/jsongenerator.cpp +++ b/src/qtattributionsscanner/jsongenerator.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the tools applications of the Qt Toolkit. -** -** $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 "jsongenerator.h" @@ -34,38 +9,41 @@ #include <iostream> +using namespace Qt::Literals::StringLiterals; + namespace JsonGenerator { static QJsonObject generate(Package package) { QJsonObject obj; - obj.insert(QStringLiteral("Id"), package.id); - obj.insert(QStringLiteral("Path"), package.path); - obj.insert(QStringLiteral("Files"), package.files.join(QLatin1Char(' '))); - obj.insert(QStringLiteral("QDocModule"), package.qdocModule); - obj.insert(QStringLiteral("Name"), package.name); - obj.insert(QStringLiteral("QtUsage"), package.qtUsage); - obj.insert(QStringLiteral("QtParts"), QJsonArray::fromStringList(package.qtParts)); + obj.insert(u"Id"_s, package.id); + obj.insert(u"Path"_s, package.path); + obj.insert(u"Files"_s, package.files.join(QLatin1Char(' '))); + obj.insert(u"QDocModule"_s, package.qdocModule); + obj.insert(u"Name"_s, package.name); + obj.insert(u"QtUsage"_s, package.qtUsage); + obj.insert(u"SecurityCritical"_s, package.securityCritical); + obj.insert(u"QtParts"_s, QJsonArray::fromStringList(package.qtParts)); - obj.insert(QStringLiteral("Description"), package.description); - obj.insert(QStringLiteral("Homepage"), package.homepage); - obj.insert(QStringLiteral("Version"), package.version); - obj.insert(QStringLiteral("DownloadLocation"), package.downloadLocation); + obj.insert(u"Description"_s, package.description); + obj.insert(u"Homepage"_s, package.homepage); + obj.insert(u"Version"_s, package.version); + obj.insert(u"DownloadLocation"_s, package.downloadLocation); - obj.insert(QStringLiteral("License"), package.license); - obj.insert(QStringLiteral("LicenseId"), package.licenseId); + obj.insert(u"License"_s, package.license); + obj.insert(u"LicenseId"_s, package.licenseId); if (package.licenseFiles.isEmpty()) - obj.insert(QStringLiteral("LicenseFile"), QString()); + obj.insert(u"LicenseFile"_s, QString()); else if (package.licenseFiles.size() == 1) - obj.insert(QStringLiteral("LicenseFile"), package.licenseFiles.first()); + obj.insert(u"LicenseFile"_s, package.licenseFiles.first()); else - obj.insert(QStringLiteral("LicenseFiles"), + obj.insert(u"LicenseFiles"_s, QJsonArray::fromStringList(package.licenseFiles)); - obj.insert(QStringLiteral("Copyright"), package.copyright); - obj.insert(QStringLiteral("CopyrightFile"), package.copyrightFile); - obj.insert(QStringLiteral("PackageComment"), package.packageComment); + obj.insert(u"Copyright"_s, package.copyright); + obj.insert(u"CopyrightFile"_s, package.copyrightFile); + obj.insert(u"PackageComment"_s, package.packageComment); return obj; } |