diff options
Diffstat (limited to 'src/assistant/assistant/centralwidget.cpp')
| -rw-r--r-- | src/assistant/assistant/centralwidget.cpp | 43 |
1 files changed, 10 insertions, 33 deletions
diff --git a/src/assistant/assistant/centralwidget.cpp b/src/assistant/assistant/centralwidget.cpp index 4f3d749f4..f0de921de 100644 --- a/src/assistant/assistant/centralwidget.cpp +++ b/src/assistant/assistant/centralwidget.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 Assistant 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 "centralwidget.h" @@ -53,6 +28,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + namespace { CentralWidget *staticCentralWidget = nullptr; } @@ -123,7 +100,7 @@ void TabBar::titleChanged() for (int i = 0; i < count(); ++i) { HelpViewer *data = tabData(i).value<HelpViewer*>(); QString title = data->title(); - title.replace(QLatin1Char('&'), QLatin1String("&&")); + title.replace(u'&', "&&"_L1); setTabText(i, title.isEmpty() ? tr("(Untitled)") : title); } } @@ -163,7 +140,7 @@ void TabBar::slotCustomContextMenuRequested(const QPoint &pos) HelpViewer *viewer = tabData(tab).value<HelpViewer*>(); QAction *newBookmark = menu.addAction(tr("Add Bookmark for this Page...")); const QString &url = viewer->source().toString(); - if (url.isEmpty() || url == QLatin1String("about:blank")) + if (url.isEmpty() || url == "about:blank"_L1) newBookmark->setEnabled(false); QAction *pickedAction = menu.exec(mapToGlobal(pos)); @@ -509,7 +486,7 @@ void CentralWidget::keyPressEvent(QKeyEvent *e) { TRACE_OBJ const QString &text = e->text(); - if (text.startsWith(QLatin1Char('/'))) { + if (text.startsWith(u'/')) { if (!m_findWidget->isVisible()) { m_findWidget->showAndClear(); } else { @@ -542,9 +519,9 @@ void CentralWidget::highlightSearchTerms() QHelpSearchEngine *searchEngine = HelpEngineWrapper::instance().searchEngine(); const QString searchInput = searchEngine->searchInput(); - const bool wholePhrase = searchInput.startsWith(QLatin1Char('"')) && - searchInput.endsWith(QLatin1Char('"')); - const QStringList &words = wholePhrase ? QStringList(searchInput.mid(1, searchInput.length() - 2)) : + const bool wholePhrase = searchInput.startsWith(u'"') && + searchInput.endsWith(u'"'); + const QStringList &words = wholePhrase ? QStringList(searchInput.mid(1, searchInput.size() - 2)) : searchInput.split(QRegularExpression("\\W+"), Qt::SkipEmptyParts); HelpViewer *viewer = currentHelpViewer(); for (const QString &word : words) |