diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-08-24 17:49:44 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-24 21:37:09 +0200 |
commit | 1fcc136e74f85a6eeac6508b7138a375e8ced1c5 (patch) | |
tree | 33f974b73fa3c2d269b0183fb46109fbd50a3909 /src/assistant/help/qhelpenginecore.cpp | |
parent | c3ca1f972e402281d3ec42498d3051767449a41b (diff) |
Remove deprecated functionality
Required to get the module to compile against a new qtbase
Change-Id: I4f7c6f10c94da640c1f1eec0bbbbc22bbd7cb2ea
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/assistant/help/qhelpenginecore.cpp')
-rw-r--r-- | src/assistant/help/qhelpenginecore.cpp | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/src/assistant/help/qhelpenginecore.cpp b/src/assistant/help/qhelpenginecore.cpp index d3026dc49..81e224b37 100644 --- a/src/assistant/help/qhelpenginecore.cpp +++ b/src/assistant/help/qhelpenginecore.cpp @@ -611,30 +611,6 @@ QByteArray QHelpEngineCore::fileData(const QUrl &url) const return d->collectionHandler->fileData(url); } -#if QT_DEPRECATED_SINCE(5, 15) -/*! - \obsolete - - Use documentsForIdentifier() instead. - - Returns a map of the documents found for the \a id. The map contains the - document titles and their URLs. The returned map contents depend on - the current filter, and therefore only the identifiers registered for - the current filter will be returned. -*/ -QMultiMap<QString, QUrl> QHelpEngineCore::linksForIdentifier(const QString &id) const -{ - if (!d->setup()) - return QMultiMap<QString, QUrl>(); - - if (d->usesFilterEngine) - return d->collectionHandler->linksForIdentifier(id, d->filterEngine->activeFilter()); - - // obsolete - return d->collectionHandler->linksForIdentifier(id, filterAttributes(d->currentFilter)); -} -#endif - /*! \since 5.15 @@ -665,30 +641,6 @@ QList<QHelpLink> QHelpEngineCore::documentsForIdentifier(const QString &id, cons return d->collectionHandler->documentsForIdentifier(id, filterName); } -#if QT_DEPRECATED_SINCE(5, 15) -/*! - \obsolete - - Use documentsForKeyword() instead. - - Returns a map of all the documents found for the \a keyword. The map - contains the document titles and URLs. The returned map contents depend - on the current filter, and therefore only the keywords registered for - the current filter will be returned. -*/ -QMultiMap<QString, QUrl> QHelpEngineCore::linksForKeyword(const QString &keyword) const -{ - if (!d->setup()) - return QMultiMap<QString, QUrl>(); - - if (d->usesFilterEngine) - return d->collectionHandler->linksForKeyword(keyword, d->filterEngine->activeFilter()); - - // obsolete - return d->collectionHandler->linksForKeyword(keyword, filterAttributes(d->currentFilter)); -} -#endif - /*! \since 5.15 |