diff options
Diffstat (limited to 'src/assistant/assistant/helpviewerimpl_qtb.cpp')
| -rw-r--r-- | src/assistant/assistant/helpviewerimpl_qtb.cpp | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/src/assistant/assistant/helpviewerimpl_qtb.cpp b/src/assistant/assistant/helpviewerimpl_qtb.cpp index fd1595ee8..c0c1fa092 100644 --- a/src/assistant/assistant/helpviewerimpl_qtb.cpp +++ b/src/assistant/assistant/helpviewerimpl_qtb.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 "helpviewerimpl.h" #include "helpviewerimpl_p.h" @@ -145,13 +120,13 @@ void HelpViewerImpl::doSetSource(const QUrl &url, QTextDocument::ResourceType ty if (HelpViewer::launchWithExternalApp(url)) return; - bool helpOrAbout = (url.toString() == QLatin1String("help")); + bool helpOrAbout = (url.toString() == "help"_L1); const QUrl resolvedUrl = (helpOrAbout ? LocalHelpFile : HelpEngineWrapper::instance().findFile(url)); QTextBrowser::doSetSource(resolvedUrl, type); if (!resolvedUrl.isValid()) { - helpOrAbout = (url.toString() == QLatin1String("about:blank")); + helpOrAbout = (url.toString() == "about:blank"_L1); setHtml(helpOrAbout ? AboutBlank : PageNotFoundMessage.arg(url.toString())); } emit loadFinished(true); @@ -373,7 +348,7 @@ QVariant HelpViewerImpl::loadResource(int type, const QUrl &name) if (type < 4) { const QUrl url = HelpEngineWrapper::instance().findFile(name); ba = HelpEngineWrapper::instance().fileData(url); - if (url.toString().endsWith(QLatin1String(".svg"), Qt::CaseInsensitive)) { + if (url.toString().endsWith(".svg"_L1, Qt::CaseInsensitive)) { QImage image; image.loadFromData(ba, "svg"); if (!image.isNull()) |