diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-08-13 15:02:08 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2020-08-13 15:41:01 +0200 |
| commit | 72a6236185fe6884b7b30c4f348a19e2e7603cba (patch) | |
| tree | 2f605cd143e88cf647d520a9f33cc04e35b9e3a1 /src/assistant/help/qhelpcollectionhandler_p.h | |
| parent | 6ef42beb152dd74e74d8aaeaf644581fbd88dfb0 (diff) | |
Assistant: Fix compilation issues with QMultiMap
Fixes: QTBUG-86030
Change-Id: I87387a795dbf6609d8f22a84d93f95d68bbb646e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/assistant/help/qhelpcollectionhandler_p.h')
| -rw-r--r-- | src/assistant/help/qhelpcollectionhandler_p.h | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/assistant/help/qhelpcollectionhandler_p.h b/src/assistant/help/qhelpcollectionhandler_p.h index b83b8ba26..d00699366 100644 --- a/src/assistant/help/qhelpcollectionhandler_p.h +++ b/src/assistant/help/qhelpcollectionhandler_p.h @@ -147,20 +147,19 @@ public: QList<QStringList> filterAttributeSets(const QString &namespaceName) const; // use linksForIdentifier(const QString &, const QString &) instead - QMap<QString, QUrl> linksForIdentifier(const QString &id, - const QStringList &filterAttributes) const; + QMultiMap<QString, QUrl> linksForIdentifier(const QString &id, + const QStringList &filterAttributes) const; // use linksForKeyword(const QString &, const QString &) instead - QMap<QString, QUrl> linksForKeyword(const QString &keyword, - const QStringList &filterAttributes) const; + QMultiMap<QString, QUrl> linksForKeyword(const QString &keyword, + const QStringList &filterAttributes) const; // use documentsForIdentifier instead - QMap<QString, QUrl> linksForIdentifier(const QString &id, - const QString &filterName) const; + QMultiMap<QString, QUrl> linksForIdentifier(const QString &id, const QString &filterName) const; // use documentsForKeyword instead - QMap<QString, QUrl> linksForKeyword(const QString &keyword, - const QString &filterName) const; + QMultiMap<QString, QUrl> linksForKeyword(const QString &keyword, + const QString &filterName) const; // *** Legacy block end *** QStringList filters() const; @@ -218,14 +217,12 @@ signals: private: // legacy stuff - QMap<QString, QUrl> linksForField(const QString &fieldName, - const QString &fieldValue, - const QStringList &filterAttributes) const; + QMultiMap<QString, QUrl> linksForField(const QString &fieldName, const QString &fieldValue, + const QStringList &filterAttributes) const; QString namespaceVersion(const QString &namespaceName) const; - QMap<QString, QUrl> linksForField(const QString &fieldName, - const QString &fieldValue, - const QString &filterName) const; + QMultiMap<QString, QUrl> linksForField(const QString &fieldName, const QString &fieldValue, + const QString &filterName) const; QList<QHelpLink> documentsForField(const QString &fieldName, const QString &fieldValue, const QString &filterName) const; |