diff options
Diffstat (limited to 'src/linguist/lupdate/ui.cpp')
-rw-r--r-- | src/linguist/lupdate/ui.cpp | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/src/linguist/lupdate/ui.cpp b/src/linguist/lupdate/ui.cpp index 1737b5342..1092035ae 100644 --- a/src/linguist/lupdate/ui.cpp +++ b/src/linguist/lupdate/ui.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 "lupdate.h" @@ -39,6 +14,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + class UiReader : public XmlParser { public: @@ -192,7 +169,7 @@ bool loadUI(Translator &translator, const QString &filename, ConversionData &cd) UiReader uiReader(translator, cd, reader); bool result = uiReader.parse(); if (!result) - cd.appendError(u"Parse error in UI file"_qs); + cd.appendError(u"Parse error in UI file"_s); return result; } |