Integrate new filter engine

Adapt the code to deprecated usage of map as a multi map,
hence all cases replaced by QMultiMap.

Change-Id: I2d480467cd6e91d3e880555e6a21058dec056b3f
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

4 files changed, 5 insertions, 5 deletions

diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp
index f55ce3091b..41eea6c213 100644
--- a/src/shared/help/indexwindow.cpp
+++ b/src/shared/help/indexwindow.cpp
@@ -196,7 +196,7 @@ void IndexWindow::disableSearchLineEdit()
 void IndexWindow::open(const QModelIndex &index, bool newPage)
 {
     QString keyword = m_filteredIndexModel->data(index, Qt::DisplayRole).toString();
-    QMap<QString, QUrl> links = LocalHelpManager::helpEngine().indexModel()->linksForKeyword(keyword);
+    QMultiMap<QString, QUrl> links = LocalHelpManager::helpEngine().indexModel()->linksForKeyword(keyword);
     emit linksActivated(links, keyword, newPage);
 }
 
diff --git a/src/shared/help/indexwindow.h b/src/shared/help/indexwindow.h
index 1b44c1f576..8b1dec0872 100644
--- a/src/shared/help/indexwindow.h
+++ b/src/shared/help/indexwindow.h
@@ -88,7 +88,7 @@ public:
     void setOpenInNewPageActionVisible(bool visible);
 
 signals:
-    void linksActivated(const QMap<QString, QUrl> &links,
+    void linksActivated(const QMultiMap<QString, QUrl> &links,
         const QString &keyword, bool newPage);
 
 private:
diff --git a/src/shared/help/topicchooser.cpp b/src/shared/help/topicchooser.cpp
index b7e5db7f3f..44852da95b 100644
--- a/src/shared/help/topicchooser.cpp
+++ b/src/shared/help/topicchooser.cpp
@@ -33,7 +33,7 @@
 #include <QSortFilterProxyModel>
 
 TopicChooser::TopicChooser(QWidget *parent, const QString &keyword,
-        const QMap<QString, QUrl> &links)
+        const QMultiMap<QString, QUrl> &links)
     : QDialog(parent)
     , m_filterModel(new QSortFilterProxyModel(this))
 {
@@ -49,7 +49,7 @@ TopicChooser::TopicChooser(QWidget *parent, const QString &keyword,
     m_filterModel->setSourceModel(model);
     m_filterModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
 
-    QMap<QString, QUrl>::const_iterator it = links.constBegin();
+    QMultiMap<QString, QUrl>::const_iterator it = links.constBegin();
     for (; it != links.constEnd(); ++it) {
         m_links.append(it.value());
         QStandardItem *item = new QStandardItem(it.key());
diff --git a/src/shared/help/topicchooser.h b/src/shared/help/topicchooser.h
index 88c6fa90b6..8f278428c7 100644
--- a/src/shared/help/topicchooser.h
+++ b/src/shared/help/topicchooser.h
@@ -42,7 +42,7 @@ class TopicChooser : public QDialog
 
 public:
     TopicChooser(QWidget *parent, const QString &keyword,
-        const QMap<QString, QUrl> &links);
+        const QMultiMap<QString, QUrl> &links);
 
     QUrl link() const;