diff options
Diffstat (limited to 'src/assistant/help/qhelpsearchindexreader_p.h')
| -rw-r--r-- | src/assistant/help/qhelpsearchindexreader_p.h | 68 |
1 files changed, 14 insertions, 54 deletions
diff --git a/src/assistant/help/qhelpsearchindexreader_p.h b/src/assistant/help/qhelpsearchindexreader_p.h index 883446fea..835c44f97 100644 --- a/src/assistant/help/qhelpsearchindexreader_p.h +++ b/src/assistant/help/qhelpsearchindexreader_p.h @@ -1,41 +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: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 QHELPSEARCHINDEXREADER_H #define QHELPSEARCHINDEXREADER_H @@ -51,18 +15,17 @@ // We mean it. // -#include "qhelpsearchengine.h" +#include "qhelpsearchresult.h" -#include <QtCore/QList> -#include <QtCore/QMutex> -#include <QtCore/QThread> +#include <QtCore/qlist.h> +#include <QtCore/qmutex.h> +#include <QtCore/qthread.h> QT_BEGIN_NAMESPACE -class QHelpEngineCore; - namespace fulltextsearch { +// TODO: Employ QFuture / QtConcurrent::run() ? class QHelpSearchIndexReader : public QThread { Q_OBJECT @@ -71,10 +34,8 @@ public: ~QHelpSearchIndexReader() override; void cancelSearching(); - void search(const QString &collectionFile, - const QString &indexFilesFolder, - const QString &searchInput, - bool usesFilterEngine = false); + void search(const QString &collectionFile, const QString &indexFilesFolder, + const QString &searchInput, bool usesFilterEngine = false); int searchResultCount() const; QList<QHelpSearchResult> searchResults(int start, int end) const; @@ -82,7 +43,9 @@ signals: void searchingStarted(); void searchingFinished(int searchResultCount); -protected: +private: + void run() override; + mutable QMutex m_mutex; QList<QHelpSearchResult> m_searchResults; bool m_cancel = false; @@ -90,13 +53,10 @@ protected: QString m_searchInput; QString m_indexFilesFolder; bool m_usesFilterEngine = false; - -private: - void run() override = 0; }; -} // namespace fulltextsearch +} // namespace fulltextsearch QT_END_NAMESPACE -#endif // QHELPSEARCHINDEXREADER_H +#endif // QHELPSEARCHINDEXREADER_H |