diff options
Diffstat (limited to 'src/shared/fontpanel/fontpanel.cpp')
| -rw-r--r-- | src/shared/fontpanel/fontpanel.cpp | 52 |
1 files changed, 9 insertions, 43 deletions
diff --git a/src/shared/fontpanel/fontpanel.cpp b/src/shared/fontpanel/fontpanel.cpp index 7bd51aa54..9a0d892d6 100644 --- a/src/shared/fontpanel/fontpanel.cpp +++ b/src/shared/fontpanel/fontpanel.cpp @@ -1,41 +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:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** 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 LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "fontpanel.h" @@ -49,6 +13,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + FontPanel::FontPanel(QWidget *parentWidget) : QGroupBox(parentWidget), m_previewLineEdit(new QLineEdit), @@ -66,7 +32,7 @@ FontPanel::FontPanel(QWidget *parentWidget) : auto writingSystems = QFontDatabase::writingSystems(); writingSystems.push_front(QFontDatabase::Any); - for (QFontDatabase::WritingSystem ws : qAsConst(writingSystems)) + for (QFontDatabase::WritingSystem ws : std::as_const(writingSystems)) m_writingSystemComboBox->addItem(QFontDatabase::writingSystemName(ws), QVariant(ws)); connect(m_writingSystemComboBox, &QComboBox::currentIndexChanged, this, &FontPanel::slotWritingSystemChanged); @@ -98,9 +64,9 @@ QFont FontPanel::selectedFont() const const QString family = rc.family(); rc.setPointSize(pointSize()); const QString styleDescription = styleString(); - if (styleDescription.contains(QLatin1String("Italic"))) + if (styleDescription.contains("Italic"_L1)) rc.setStyle(QFont::StyleItalic); - else if (styleDescription.contains(QLatin1String("Oblique"))) + else if (styleDescription.contains("Oblique"_L1)) rc.setStyle(QFont::StyleOblique); else rc.setStyle(QFont::StyleNormal); @@ -216,7 +182,7 @@ void FontPanel::updateFamily(const QString &family) m_styleComboBox->setEnabled(hasStyles); int normalIndex = -1; - const QString normalStyle = QLatin1String("Normal"); + const QString normalStyle = "Normal"_L1; if (hasStyles) { for (const QString &style : styles) { @@ -277,7 +243,7 @@ void FontPanel::updatePointSizes(const QString &family, const QString &styleStri // try to maintain selection or select closest. if (hasSizes) { QString n; - for (int pointSize : qAsConst(pointSizes)) + for (int pointSize : std::as_const(pointSizes)) m_pointSizeComboBox->addItem(n.setNum(pointSize), QVariant(pointSize)); const int closestIndex = closestPointSizeIndex(oldPointSize); if (closestIndex != -1) |