diff options
Diffstat (limited to 'src/linguist/shared/qrcreader.cpp')
| -rw-r--r-- | src/linguist/shared/qrcreader.cpp | 40 |
1 files changed, 6 insertions, 34 deletions
diff --git a/src/linguist/shared/qrcreader.cpp b/src/linguist/shared/qrcreader.cpp index ce729a7ff..2f450106f 100644 --- a/src/linguist/shared/qrcreader.cpp +++ b/src/linguist/shared/qrcreader.cpp @@ -1,42 +1,14 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "qrcreader.h" +#include "fmt.h" #include <QtCore/qcoreapplication.h> #include <QtCore/qfileinfo.h> #include <QtCore/qxmlstream.h> -class FMT { - Q_DECLARE_TR_FUNCTIONS(Linguist) -}; - -static bool isSupportedExtension(const QString &ext) +bool isSupportedExtension(const QString &ext) { return ext == QLatin1String("qml") || ext == QLatin1String("js") || ext == QLatin1String("qs") @@ -56,13 +28,13 @@ ReadQrcResult readQrcFile(const QString &resourceFile, const QString &content) QXmlStreamReader::TokenType t = reader.readNext(); switch (t) { case QXmlStreamReader::StartElement: - if (curDepth >= tagStack.count() || reader.name() != tagStack.at(curDepth)) { + if (curDepth >= tagStack.size() || reader.name() != tagStack.at(curDepth)) { result.errorString = FMT::tr("unexpected <%1> tag\n") .arg(reader.name().toString()); result.line = reader.lineNumber(); return result; } - if (++curDepth == tagStack.count()) + if (++curDepth == tagStack.size()) isFileTag = true; break; |