diff options
Diffstat (limited to 'src/assistant/help/qcompressedhelpinfo.cpp')
| -rw-r--r-- | src/assistant/help/qcompressedhelpinfo.cpp | 57 |
1 files changed, 10 insertions, 47 deletions
diff --git a/src/assistant/help/qcompressedhelpinfo.cpp b/src/assistant/help/qcompressedhelpinfo.cpp index a3c5b75d5..8051fdddc 100644 --- a/src/assistant/help/qcompressedhelpinfo.cpp +++ b/src/assistant/help/qcompressedhelpinfo.cpp @@ -1,51 +1,16 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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$ -** -****************************************************************************/ +// Copyright (C) 2019 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 "qcompressedhelpinfo.h" #include "qhelpdbreader_p.h" -#include <QtCore/QThread> -#include <QtCore/QVersionNumber> +#include <QtCore/qversionnumber.h> QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + class QCompressedHelpInfoPrivate : public QSharedData { public: @@ -57,7 +22,6 @@ public: , m_version(other.m_version) , m_isNull(other.m_isNull) { } - ~QCompressedHelpInfoPrivate() = default; QString m_namespaceName; QString m_component; @@ -90,8 +54,7 @@ public: */ QCompressedHelpInfo::QCompressedHelpInfo() : d(new QCompressedHelpInfoPrivate) -{ -} +{} /*! Constructs a copy of \a other. @@ -167,9 +130,9 @@ bool QCompressedHelpInfo::isNull() const */ QCompressedHelpInfo QCompressedHelpInfo::fromCompressedHelpFile(const QString &documentationFileName) { - QHelpDBReader reader(documentationFileName, - QHelpGlobal::uniquifyConnectionName(QLatin1String("GetCompressedHelpInfo"), - QThread::currentThread()), nullptr); + void *pointer = const_cast<QString *>(&documentationFileName); + QHelpDBReader reader(documentationFileName, QHelpGlobal::uniquifyConnectionName( + "GetCompressedHelpInfo"_L1, pointer), nullptr); if (reader.init()) { QCompressedHelpInfo info; info.d->m_namespaceName = reader.namespaceName(); @@ -178,7 +141,7 @@ QCompressedHelpInfo QCompressedHelpInfo::fromCompressedHelpFile(const QString &d info.d->m_isNull = false; return info; } - return QCompressedHelpInfo(); + return {}; } QT_END_NAMESPACE |