diff options
Diffstat (limited to 'src/assistant/help/qhelpengine.cpp')
| -rw-r--r-- | src/assistant/help/qhelpengine.cpp | 188 |
1 files changed, 67 insertions, 121 deletions
diff --git a/src/assistant/help/qhelpengine.cpp b/src/assistant/help/qhelpengine.cpp index bb1475fdf..e773018e5 100644 --- a/src/assistant/help/qhelpengine.cpp +++ b/src/assistant/help/qhelpengine.cpp @@ -1,126 +1,64 @@ -/**************************************************************************** -** -** 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 #include "qhelpengine.h" -#include "qhelpengine_p.h" -#include "qhelpdbreader_p.h" #include "qhelpcontentwidget.h" +#include "qhelpfilterengine.h" #include "qhelpindexwidget.h" #include "qhelpsearchengine.h" -#include "qhelpcollectionhandler_p.h" -#include "qhelpfilterengine.h" -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QPluginLoader> -#include <QtCore/QTimer> -#include <QtWidgets/QApplication> -#include <QtSql/QSqlQuery> +#include <QtCore/qtimer.h> QT_BEGIN_NAMESPACE -void QHelpEnginePrivate::init(const QString &collectionFile, - QHelpEngineCore *helpEngineCore) +class QHelpEnginePrivate { - QHelpEngineCorePrivate::init(collectionFile, helpEngineCore); +public: + QHelpEnginePrivate(QHelpEngineCore *helpEngineCore); - if (!contentModel) - contentModel = new QHelpContentModel(this); - if (!indexModel) - indexModel = new QHelpIndexModel(this); - - connect(helpEngineCore, &QHelpEngineCore::setupFinished, - this, &QHelpEnginePrivate::scheduleApplyCurrentFilter); - connect(helpEngineCore, &QHelpEngineCore::currentFilterChanged, - this, &QHelpEnginePrivate::scheduleApplyCurrentFilter); - connect(helpEngineCore->filterEngine(), &QHelpFilterEngine::filterActivated, - this, &QHelpEnginePrivate::scheduleApplyCurrentFilter); -} + QHelpContentModel *contentModel = nullptr; + QHelpContentWidget *contentWidget = nullptr; -void QHelpEnginePrivate::scheduleApplyCurrentFilter() -{ - if (!error.isEmpty()) - return; - - if (m_isApplyCurrentFilterScheduled) - return; - - m_isApplyCurrentFilterScheduled = true; - QTimer::singleShot(0, this, &QHelpEnginePrivate::applyCurrentFilter); -} + QHelpIndexModel *indexModel = nullptr; + QHelpIndexWidget *indexWidget = nullptr; -void QHelpEnginePrivate::applyCurrentFilter() -{ - m_isApplyCurrentFilterScheduled = false; - const QString filter = usesFilterEngine - ? q->filterEngine()->activeFilter() - : currentFilter; - contentModel->createContents(filter); - indexModel->createIndex(filter); -} + QHelpSearchEngine *searchEngine = nullptr; -void QHelpEnginePrivate::setContentsWidgetBusy() -{ -#if QT_CONFIG(cursor) - contentWidget->setCursor(Qt::WaitCursor); -#endif -} + bool m_isApplyCurrentFilterScheduled = false; + QHelpEngineCore *m_helpEngineCore = nullptr; +}; -void QHelpEnginePrivate::unsetContentsWidgetBusy() +QHelpEnginePrivate::QHelpEnginePrivate(QHelpEngineCore *helpEngineCore) + : m_helpEngineCore(helpEngineCore) { -#if QT_CONFIG(cursor) - contentWidget->unsetCursor(); -#endif -} - -void QHelpEnginePrivate::setIndexWidgetBusy() -{ -#if QT_CONFIG(cursor) - indexWidget->setCursor(Qt::WaitCursor); -#endif -} - -void QHelpEnginePrivate::unsetIndexWidgetBusy() -{ -#if QT_CONFIG(cursor) - indexWidget->unsetCursor(); -#endif + if (!contentModel) + contentModel = new QHelpContentModel(helpEngineCore); + if (!indexModel) + indexModel = new QHelpIndexModel(m_helpEngineCore); + + const auto applyCurrentFilter = [this] { + m_isApplyCurrentFilterScheduled = false; + contentModel->createContentsForCurrentFilter(); + indexModel->createIndexForCurrentFilter(); + }; + + const auto scheduleApplyCurrentFilter = [this, applyCurrentFilter] { + if (!m_helpEngineCore->error().isEmpty()) + return; + + if (m_isApplyCurrentFilterScheduled) + return; + + m_isApplyCurrentFilterScheduled = true; + QTimer::singleShot(0, m_helpEngineCore, applyCurrentFilter); + }; + + QObject::connect(m_helpEngineCore, &QHelpEngineCore::setupFinished, + m_helpEngineCore, scheduleApplyCurrentFilter); + QObject::connect(m_helpEngineCore, &QHelpEngineCore::currentFilterChanged, + m_helpEngineCore, scheduleApplyCurrentFilter); + QObject::connect(m_helpEngineCore->filterEngine(), &QHelpFilterEngine::filterActivated, + m_helpEngineCore, scheduleApplyCurrentFilter); } /*! @@ -138,16 +76,16 @@ void QHelpEnginePrivate::unsetIndexWidgetBusy() it will be created. */ QHelpEngine::QHelpEngine(const QString &collectionFile, QObject *parent) - : QHelpEngineCore(d = new QHelpEnginePrivate(), parent) -{ - d->init(collectionFile, this); -} + : QHelpEngineCore(collectionFile, parent) + , d(new QHelpEnginePrivate(this)) +{} /*! Destroys the help engine object. */ QHelpEngine::~QHelpEngine() { + delete d; } /*! @@ -172,12 +110,16 @@ QHelpIndexModel *QHelpEngine::indexModel() const QHelpContentWidget *QHelpEngine::contentWidget() { if (!d->contentWidget) { - d->contentWidget = new QHelpContentWidget(); + d->contentWidget = new QHelpContentWidget; d->contentWidget->setModel(d->contentModel); - connect(d->contentModel, &QHelpContentModel::contentsCreationStarted, - d, &QHelpEnginePrivate::setContentsWidgetBusy); - connect(d->contentModel, &QHelpContentModel::contentsCreated, - d, &QHelpEnginePrivate::unsetContentsWidgetBusy); +#if QT_CONFIG(cursor) + connect(d->contentModel, &QHelpContentModel::contentsCreationStarted, this, [this] { + d->contentWidget->setCursor(Qt::WaitCursor); + }); + connect(d->contentModel, &QHelpContentModel::contentsCreated, this, [this] { + d->contentWidget->unsetCursor(); + }); +#endif } return d->contentWidget; } @@ -188,12 +130,16 @@ QHelpContentWidget *QHelpEngine::contentWidget() QHelpIndexWidget *QHelpEngine::indexWidget() { if (!d->indexWidget) { - d->indexWidget = new QHelpIndexWidget(); + d->indexWidget = new QHelpIndexWidget; d->indexWidget->setModel(d->indexModel); - connect(d->indexModel, &QHelpIndexModel::indexCreationStarted, - d, &QHelpEnginePrivate::setIndexWidgetBusy); - connect(d->indexModel, &QHelpIndexModel::indexCreated, - d, &QHelpEnginePrivate::unsetIndexWidgetBusy); +#if QT_CONFIG(cursor) + connect(d->indexModel, &QHelpIndexModel::indexCreationStarted, this, [this] { + d->indexWidget->setCursor(Qt::WaitCursor); + }); + connect(d->indexModel, &QHelpIndexModel::indexCreated, this, [this] { + d->indexWidget->unsetCursor(); + }); +#endif } return d->indexWidget; } |