diff options
Diffstat (limited to 'src/assistant/help/qhelp_global.h')
| -rw-r--r-- | src/assistant/help/qhelp_global.h | 48 |
1 files changed, 7 insertions, 41 deletions
diff --git a/src/assistant/help/qhelp_global.h b/src/assistant/help/qhelp_global.h index c0354083d..b7367ee37 100644 --- a/src/assistant/help/qhelp_global.h +++ b/src/assistant/help/qhelp_global.h @@ -1,51 +1,14 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ +// 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 #ifndef QHELP_GLOBAL_H #define QHELP_GLOBAL_H #include <QtCore/qglobal.h> -#include <QtCore/QString> -#include <QtCore/QObject> QT_BEGIN_NAMESPACE +class QString; #ifdef QT_STATIC # define QHELP_EXPORT @@ -55,7 +18,10 @@ QT_BEGIN_NAMESPACE # define QHELP_EXPORT Q_DECL_IMPORT #endif -class QHELP_EXPORT QHelpGlobal { +// TODO Qt 7.0: Remove the class and make it a namespace with a collection of functions. +// Review, if they are still need to be public. +class QHELP_EXPORT QHelpGlobal +{ public: static QString uniquifyConnectionName(const QString &name, void *pointer); static QString documentTitle(const QString &content); |