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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/assistant/help/qhelpcollectionhandler.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/assistant/help/qhelpcollectionhandler.cpp b/src/assistant/help/qhelpcollectionhandler.cpp index df104b13c..b59975808 100644 --- a/src/assistant/help/qhelpcollectionhandler.cpp +++ b/src/assistant/help/qhelpcollectionhandler.cpp @@ -2301,23 +2301,25 @@ static QUrl buildQUrl(const QString &ns, const QString &folder, return url; } -QMap<QString, QUrl> QHelpCollectionHandler::linksForIdentifier(const QString &id, - const QStringList &filterAttributes) const +QMultiMap<QString, QUrl> +QHelpCollectionHandler::linksForIdentifier(const QString &id, + const QStringList &filterAttributes) const { return linksForField(QLatin1String("Identifier"), id, filterAttributes); } -QMap<QString, QUrl> QHelpCollectionHandler::linksForKeyword(const QString &keyword, - const QStringList &filterAttributes) const +QMultiMap<QString, QUrl> +QHelpCollectionHandler::linksForKeyword(const QString &keyword, + const QStringList &filterAttributes) const { return linksForField(QLatin1String("Name"), keyword, filterAttributes); } -QMap<QString, QUrl> QHelpCollectionHandler::linksForField(const QString &fieldName, - const QString &fieldValue, - const QStringList &filterAttributes) const +QMultiMap<QString, QUrl> +QHelpCollectionHandler::linksForField(const QString &fieldName, const QString &fieldValue, + const QStringList &filterAttributes) const { - QMap<QString, QUrl> linkMap; + QMultiMap<QString, QUrl> linkMap; if (!isDBOpened()) return linkMap; @@ -2357,23 +2359,21 @@ QMap<QString, QUrl> QHelpCollectionHandler::linksForField(const QString &fieldNa if (title.isEmpty()) // generate a title + corresponding path title = fieldValue + QLatin1String(" : ") + m_query->value(3).toString(); - static_cast<QMultiMap<QString, QUrl> &>(linkMap).insert(title, buildQUrl( - m_query->value(1).toString(), - m_query->value(2).toString(), - m_query->value(3).toString(), - m_query->value(4).toString())); + linkMap.insert(title, + buildQUrl(m_query->value(1).toString(), m_query->value(2).toString(), + m_query->value(3).toString(), m_query->value(4).toString())); } return linkMap; } -QMap<QString, QUrl> QHelpCollectionHandler::linksForIdentifier(const QString &id, - const QString &filterName) const +QMultiMap<QString, QUrl> QHelpCollectionHandler::linksForIdentifier(const QString &id, + const QString &filterName) const { return linksForField(QLatin1String("Identifier"), id, filterName); } -QMap<QString, QUrl> QHelpCollectionHandler::linksForKeyword(const QString &keyword, - const QString &filterName) const +QMultiMap<QString, QUrl> QHelpCollectionHandler::linksForKeyword(const QString &keyword, + const QString &filterName) const { return linksForField(QLatin1String("Name"), keyword, filterName); } @@ -2390,14 +2390,14 @@ QList<QHelpLink> QHelpCollectionHandler::documentsForKeyword(const QString &keyw return documentsForField(QLatin1String("Name"), keyword, filterName); } -QMap<QString, QUrl> QHelpCollectionHandler::linksForField(const QString &fieldName, - const QString &fieldValue, - const QString &filterName) const +QMultiMap<QString, QUrl> QHelpCollectionHandler::linksForField(const QString &fieldName, + const QString &fieldValue, + const QString &filterName) const { - QMap<QString, QUrl> linkMap; + QMultiMap<QString, QUrl> linkMap; const auto documents = documentsForField(fieldName, fieldValue, filterName); for (const auto &document : documents) - static_cast<QMultiMap<QString, QUrl> &>(linkMap).insert(document.title, document.url); + linkMap.insert(document.title, document.url); return linkMap; } |