diff options
Diffstat (limited to 'src/assistant/help/qhelp_global.cpp')
| -rw-r--r-- | src/assistant/help/qhelp_global.cpp | 69 |
1 files changed, 18 insertions, 51 deletions
diff --git a/src/assistant/help/qhelp_global.cpp b/src/assistant/help/qhelp_global.cpp index d86ce767b..bd4c85ff4 100644 --- a/src/assistant/help/qhelp_global.cpp +++ b/src/assistant/help/qhelp_global.cpp @@ -1,69 +1,34 @@ -/**************************************************************************** -** -** 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: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$ -** -****************************************************************************/ - -#include <QtCore/QCoreApplication> -#include <QtCore/QRegularExpression> -#include <QtCore/QMutexLocker> -#include <QtGui/QTextDocument> +// 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 "qhelp_global.h" +#include <QtCore/qcoreapplication.h> +#include <QtCore/qhash.h> +#include <QtCore/qmutex.h> +#include <QtGui/qtextdocument.h> + +QT_BEGIN_NAMESPACE + +using namespace Qt::StringLiterals; + QString QHelpGlobal::uniquifyConnectionName(const QString &name, void *pointer) { static QMutex mutex; QMutexLocker locker(&mutex); - - static QHash<QString,quint16> idHash; - - return QString::fromLatin1("%1-%2-%3"). - arg(name).arg(quintptr(pointer)).arg(++idHash[name]); + static QHash<QString, quint16> idHash; + return QString::asprintf("%ls-%p-%d", qUtf16Printable(name), pointer, ++idHash[name]); } QString QHelpGlobal::documentTitle(const QString &content) { QString title = QCoreApplication::translate("QHelp", "Untitled"); if (!content.isEmpty()) { - const int start = content.indexOf(QLatin1String("<title>"), 0, Qt::CaseInsensitive) + 7; - const int end = content.indexOf(QLatin1String("</title>"), 0, Qt::CaseInsensitive); + const int start = content.indexOf("<title>"_L1, 0, Qt::CaseInsensitive) + 7; + const int end = content.indexOf("</title>"_L1, 0, Qt::CaseInsensitive); if ((end - start) > 0) { title = content.mid(start, end - start); - if (Qt::mightBeRichText(title) || title.contains(QLatin1Char('&'))) { + if (Qt::mightBeRichText(title) || title.contains(u'&')) { QTextDocument doc; doc.setHtml(title); title = doc.toPlainText(); @@ -72,3 +37,5 @@ QString QHelpGlobal::documentTitle(const QString &content) } return title; } + +QT_END_NAMESPACE |