diff options
Diffstat (limited to 'src/assistant/help/qhelpsearchengine.h')
| -rw-r--r-- | src/assistant/help/qhelpsearchengine.h | 81 |
1 files changed, 14 insertions, 67 deletions
diff --git a/src/assistant/help/qhelpsearchengine.h b/src/assistant/help/qhelpsearchengine.h index f1ddb1634..f782e6174 100644 --- a/src/assistant/help/qhelpsearchengine.h +++ b/src/assistant/help/qhelpsearchengine.h @@ -1,93 +1,40 @@ -/**************************************************************************** -** -** 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 QHELPSEARCHENGINE_H #define QHELPSEARCHENGINE_H #include <QtHelp/qhelp_global.h> +#include <QtHelp/qhelpsearchresult.h> -#include <QtCore/QMap> -#include <QtCore/QUrl> -#include <QtCore/QObject> -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QtCore/qobject.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE class QHelpEngineCore; -class QHelpSearchQueryWidget; class QHelpSearchEnginePrivate; -class QHelpSearchResultData; +class QHelpSearchQueryWidget; class QHelpSearchResultWidget; +#if QT_DEPRECATED_SINCE(6, 7) class QHELP_EXPORT QHelpSearchQuery { public: enum FieldName { DEFAULT = 0, FUZZY, WITHOUT, PHRASE, ALL, ATLEAST }; + QT_DEPRECATED_VERSION_X_6_7("Use QString instead") QHelpSearchQuery() : fieldName(DEFAULT) { wordList.clear(); } + QT_DEPRECATED_VERSION_X_6_7("Use QString instead") QHelpSearchQuery(FieldName field, const QStringList &wordList_) : fieldName(field), wordList(wordList_) {} FieldName fieldName; QStringList wordList; }; - -class QHELP_EXPORT QHelpSearchResult -{ -public: - QHelpSearchResult(); - QHelpSearchResult(const QHelpSearchResult &other); - QHelpSearchResult(const QUrl &url, const QString &title, const QString &snippet); - ~QHelpSearchResult(); - - QHelpSearchResult &operator=(const QHelpSearchResult &other); - - QString title() const; - QUrl url() const; - QString snippet() const; - -private: - QSharedDataPointer<QHelpSearchResultData> d; -}; +#endif // QT_DEPRECATED_SINCE(6, 7) class QHELP_EXPORT QHelpSearchEngine : public QObject { @@ -97,8 +44,8 @@ public: explicit QHelpSearchEngine(QHelpEngineCore *helpEngine, QObject *parent = nullptr); ~QHelpSearchEngine(); - QHelpSearchQueryWidget* queryWidget(); - QHelpSearchResultWidget* resultWidget(); + QHelpSearchQueryWidget *queryWidget(); + QHelpSearchResultWidget *resultWidget(); #if QT_DEPRECATED_SINCE(5, 9) typedef QPair<QString, QString> SearchHit; @@ -142,4 +89,4 @@ private: QT_END_NAMESPACE -#endif // QHELPSEARCHENGINE_H +#endif // QHELPSEARCHENGINE_H |