Remove QtAlgorithms usage from Qt Assistant.

QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html

Change-Id: I6f02d91289c3f455d8643b145fb2c6477863056c
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

diff --git a/src/assistant/help/qhelpindexwidget.cpp b/src/assistant/help/qhelpindexwidget.cpp
index c5f26a7..64c2e05 100644 (file)
--- a/src/assistant/help/qhelpindexwidget.cpp
+++ b/src/assistant/help/qhelpindexwidget.cpp
@@ -49,6 +49,8 @@
 #include <QtWidgets/QListView>
 #include <QtWidgets/QHeaderView>
 
+#include <algorithm>
+
 QT_BEGIN_NAMESPACE
 
 class QHelpIndexProvider : public QThread
@@ -192,7 +194,7 @@ void QHelpIndexProvider::run()
     }
     m_mutex.lock();
     m_indices = indicesSet.values();
-    qSort(m_indices.begin(), m_indices.end(), caseInsensitiveLessThan);
+    std::sort(m_indices.begin(), m_indices.end(), caseInsensitiveLessThan);
     m_mutex.unlock();
 }
 

diff --git a/src/assistant/help/qhelpsearchindexreader_default.cpp b/src/assistant/help/qhelpsearchindexreader_default.cpp
index a088456..9e7d050 100644 (file)
--- a/src/assistant/help/qhelpsearchindexreader_default.cpp
+++ b/src/assistant/help/qhelpsearchindexreader_default.cpp
@@ -50,6 +50,8 @@
 #include <QtCore/QDataStream>
 #include <QtCore/QTextStream>
 
+#include <algorithm>
+
 QT_BEGIN_NAMESPACE
 
 namespace fulltextsearch {
@@ -276,7 +278,7 @@ void Reader::searchInIndex(const QStringList &terms)
             }
         }
     }
-    qSort(termList);
+    ::std::sort(termList.begin(), termList.end());
 }
 
 QVector<DocumentInfo> Reader::hits()
@@ -307,7 +309,7 @@ QVector<DocumentInfo> Reader::hits()
         }
     }
 
-    qSort(documents);
+    ::std::sort(documents.begin(), documents.end());
     return documents;
 }
 
@@ -405,7 +407,7 @@ QVector<Document> Reader::setupDummyTerm(const QStringList &terms,
     QVector<Document> maxList(0);
     if ( !termList.count() )
         return maxList;
-    qSort(termList);
+    ::std::sort(termList.begin(), termList.end());
 
     maxList = termList.takeLast().documents;
     for(QList<Term>::Iterator it = termList.begin(); it != termList.end(); ++it) {