diff options
Diffstat (limited to 'src/kmap2qmap/main.cpp')
| -rw-r--r-- | src/kmap2qmap/main.cpp | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/src/kmap2qmap/main.cpp b/src/kmap2qmap/main.cpp index 57cfdd9ff..0a73d3c2c 100644 --- a/src/kmap2qmap/main.cpp +++ b/src/kmap2qmap/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 QtGui module 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 <cstdio> @@ -134,7 +109,8 @@ static const struct symbol_map_t symbol_map[] = { { "twosuperior", Qt::Key_twosuperior }, { "threesuperior", Qt::Key_threesuperior }, { "acute", Qt::Key_acute }, - { "mu", Qt::Key_mu }, + { "micro", Qt::Key_micro }, + { "mu", Qt::Key_micro }, // Old name, deprecated since Qt 6.6 { "paragraph", Qt::Key_paragraph }, { "periodcentered", Qt::Key_periodcentered }, { "cedilla", Qt::Key_cedilla }, @@ -641,7 +617,7 @@ bool KeymapParser::parseKmap(QFile *f) searchpath << d; searchpath << QDir::current(); - for (const QDir &path : qAsConst(searchpath)) { + for (const QDir &path : std::as_const(searchpath)) { QFile f2(path.filePath(incname)); //qWarning(" -- trying to include %s", qPrintable(f2.fileName())); if (f2.open(QIODevice::ReadOnly)) { |