diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-08-02 16:07:49 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-10-17 09:58:47 +0000 |
commit | b868a1a4babd82ee652edfbd816c5aa6f9392c71 (patch) | |
tree | 6698f7646f2e7692ccde54f6bd7ee0e941cd1b84 /src | |
parent | 10b3e1eb28b9d4190bdb40bfde9ca2a629e0dd0c (diff) | |
download | qttools-b868a1a4babd82ee652edfbd816c5aa6f9392c71.tar.gz |
Obsolete readersAboutToBeInvalidated()
There is not anymore any "reader" for the content and index providers.
They were removed in commit 829f9dec6bff57e8b3f1afdc982778a9d573174f
in 5.11 branch, when introducing the index
and contents caches in qhc file.
Also currently readersAboutToBeInvalidated() wasn't used anymore anywhere,
so this patch just removes the emission of this signal.
Change-Id: Ie1a0f7535d497687ff74472528fffdc85cba3a3b
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/assistant/help/qhelpengine.cpp | 11 | ||||
-rw-r--r-- | src/assistant/help/qhelpengine_p.h | 3 | ||||
-rw-r--r-- | src/assistant/help/qhelpenginecore.cpp | 13 |
3 files changed, 5 insertions, 22 deletions
diff --git a/src/assistant/help/qhelpengine.cpp b/src/assistant/help/qhelpengine.cpp index 966c33354..28825e2ed 100644 --- a/src/assistant/help/qhelpengine.cpp +++ b/src/assistant/help/qhelpengine.cpp @@ -117,22 +117,12 @@ void QHelpEnginePrivate::unsetIndexWidgetBusy() #endif } -void QHelpEnginePrivate::stopDataCollection() -{ - contentModel->invalidateContents(true); - indexModel->invalidateIndex(true); -} - - - /*! \class QHelpEngine \since 4.4 \inmodule QtHelp \brief The QHelpEngine class provides access to contents and indices of the help engine. - - */ /*! @@ -152,7 +142,6 @@ QHelpEngine::QHelpEngine(const QString &collectionFile, QObject *parent) */ QHelpEngine::~QHelpEngine() { - d->stopDataCollection(); } /*! diff --git a/src/assistant/help/qhelpengine_p.h b/src/assistant/help/qhelpengine_p.h index b1f986d20..847715eb3 100644 --- a/src/assistant/help/qhelpengine_p.h +++ b/src/assistant/help/qhelpengine_p.h @@ -79,7 +79,6 @@ public: virtual void init(const QString &collectionFile, QHelpEngineCore *helpEngineCore); - void emitReadersAboutToBeInvalidated(); bool setup(); QHelpCollectionHandler *collectionHandler = nullptr; @@ -112,8 +111,6 @@ public: QHelpSearchEngine *searchEngine = nullptr; - void stopDataCollection(); - friend class QHelpContentProvider; friend class QHelpContentModel; friend class QHelpIndexProvider; diff --git a/src/assistant/help/qhelpenginecore.cpp b/src/assistant/help/qhelpenginecore.cpp index 238fbfce3..2fc1f6436 100644 --- a/src/assistant/help/qhelpenginecore.cpp +++ b/src/assistant/help/qhelpenginecore.cpp @@ -65,12 +65,6 @@ void QHelpEngineCorePrivate::init(const QString &collectionFile, QHelpEngineCorePrivate::~QHelpEngineCorePrivate() { delete collectionHandler; - emitReadersAboutToBeInvalidated(); -} - -void QHelpEngineCorePrivate::emitReadersAboutToBeInvalidated() -{ - emit q->readersAboutToBeInvalidated(); } bool QHelpEngineCorePrivate::setup() @@ -81,7 +75,6 @@ bool QHelpEngineCorePrivate::setup() needsSetup = false; emit q->setupStarted(); - emitReadersAboutToBeInvalidated(); const bool opened = collectionHandler->openCollectionFile(); if (opened) @@ -153,6 +146,11 @@ void QHelpEngineCorePrivate::errorReceived(const QString &msg) */ /*! + \fn void QHelpEngineCore::readersAboutToBeInvalidated() + \obsolete +*/ + +/*! \fn void QHelpEngineCore::currentFilterChanged(const QString &newFilter) This signal is emitted when the current filter is changed to @@ -218,7 +216,6 @@ void QHelpEngineCore::setCollectionFile(const QString &fileName) if (d->collectionHandler) { delete d->collectionHandler; d->collectionHandler = nullptr; - d->emitReadersAboutToBeInvalidated(); } d->init(fileName, this); d->needsSetup = true; |