diff options
Diffstat (limited to 'src/linguist/lrelease/main.cpp')
| -rw-r--r-- | src/linguist/lrelease/main.cpp | 39 |
1 files changed, 8 insertions, 31 deletions
diff --git a/src/linguist/lrelease/main.cpp b/src/linguist/lrelease/main.cpp index 49ff0cd62..86fc7066d 100644 --- a/src/linguist/lrelease/main.cpp +++ b/src/linguist/lrelease/main.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Linguist 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 "translator.h" @@ -47,6 +22,8 @@ QT_USE_NAMESPACE +using namespace Qt::StringLiterals; + static void printOut(const QString & out) { QTextStream stream(stdout); @@ -94,7 +71,7 @@ Options: Do not explain what is being done -version Display the version of lrelease and exit -)"_qs); +)"_s); } static bool loadTsFile(Translator &tor, const QString &tsFileName, bool /* verbose */) @@ -153,9 +130,9 @@ static bool releaseTsFile(const QString& tsFileName, return false; QString qmFileName = tsFileName; - for (const Translator::FileFormat &fmt : qAsConst(Translator::registeredFileFormats())) { + for (const Translator::FileFormat &fmt : std::as_const(Translator::registeredFileFormats())) { if (qmFileName.endsWith(QLatin1Char('.') + fmt.extension)) { - qmFileName.chop(fmt.extension.length() + 1); + qmFileName.chop(fmt.extension.size() + 1); break; } } @@ -283,7 +260,7 @@ int main(int argc, char **argv) inputFiles = translationsFromProjects(projectDescription); } - for (const QString &inputFile : qAsConst(inputFiles)) { + for (const QString &inputFile : std::as_const(inputFiles)) { if (outputFile.isEmpty()) { if (!releaseTsFile(inputFile, cd, removeIdentical)) return 1; |