diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-09-24 16:19:40 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-25 11:48:18 +0200 |
commit | 49998cea897fa4c5d410ce07bd53f0d1ee0fd180 (patch) | |
tree | 02a43eb89cd6ec384e9ca4dcacddce17e025dca3 | |
parent | a64ab5ec4042ed898272c960396005b525fd68e9 (diff) |
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>
-rw-r--r-- | src/assistant/help/qhelpindexwidget.cpp | 4 | ||||
-rw-r--r-- | src/assistant/help/qhelpsearchindexreader_default.cpp | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/assistant/help/qhelpindexwidget.cpp b/src/assistant/help/qhelpindexwidget.cpp index c5f26a701..64c2e0538 100644 --- 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 a08845663..9e7d05054 100644 --- 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) { |