CleanUp usage of QtAlgorithms

Change-Id: I61be20554014f90c2e1313167a3e3c869e26c35e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

12 files changed, 25 insertions, 46 deletions

diff --git a/src/plugins/clangcodemodel/unit.cpp b/src/plugins/clangcodemodel/unit.cpp
index fe98601442..85486169cb 100644
--- a/src/plugins/clangcodemodel/unit.cpp
+++ b/src/plugins/clangcodemodel/unit.cpp
@@ -36,7 +36,6 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QVector>
 #include <QtCore/QSharedData>
-#include <QtAlgorithms>
 
 #ifdef DEBUG_UNIT_COUNT
 #  include <QAtomicInt>
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index a4df02000c..650564da4c 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -72,7 +72,6 @@
 #include <QRegExp>
 #include <QTextStream>
 #include <QTimer>
-#include <QtAlgorithms>
 #include <QStack>
 
 #include <QApplication>
@@ -6417,7 +6416,7 @@ void FakeVimHandler::Private::indentText(const Range &range, QChar typedChar)
     int beginBlock = document()->findBlock(range.beginPos).blockNumber();
     int endBlock = document()->findBlock(range.endPos).blockNumber();
     if (beginBlock > endBlock)
-        qSwap(beginBlock, endBlock);
+        std::swap(beginBlock, endBlock);
 
     // Don't remember current indentation in last text insertion.
     const QString lastInsertion = m_buffer->lastInsertion;
@@ -6438,7 +6437,7 @@ void FakeVimHandler::Private::shiftRegionRight(int repeat)
     int endLine = lineForPosition(position());
     int targetPos = anchor();
     if (beginLine > endLine) {
-        qSwap(beginLine, endLine);
+        std::swap(beginLine, endLine);
         targetPos = position();
     }
     if (hasConfig(ConfigStartOfLine))
diff --git a/src/plugins/macros/actionmacrohandler.cpp b/src/plugins/macros/actionmacrohandler.cpp
index 515ee78cde..ebe489ecd8 100644
--- a/src/plugins/macros/actionmacrohandler.cpp
+++ b/src/plugins/macros/actionmacrohandler.cpp
@@ -46,7 +46,6 @@
 #include <QShortcut>
 #include <QSignalMapper>
 #include <QStringList>
-#include <QtAlgorithms>
 
 using namespace Core;
 
diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp
index 6d4fc43f82..5a9e3e03c1 100644
--- a/src/plugins/projectexplorer/projectfilewizardextension.cpp
+++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp
@@ -53,7 +53,6 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/editorconfiguration.h>
 
-#include <QtAlgorithms>
 #include <QPointer>
 #include <QDebug>
 #include <QFileInfo>
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
index a81f7d7887..22fdb7a40d 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
@@ -40,7 +40,6 @@
 
 #include <QDebug>
 #include <QMessageBox>
-#include <QtAlgorithms>
 
 enum {
     debug = false
diff --git a/src/plugins/qmljseditor/qmljshighlighter.cpp b/src/plugins/qmljseditor/qmljshighlighter.cpp
index 871b8c2018..8ce15adae4 100644
--- a/src/plugins/qmljseditor/qmljshighlighter.cpp
+++ b/src/plugins/qmljseditor/qmljshighlighter.cpp
@@ -30,7 +30,6 @@
 #include "qmljshighlighter.h"
 
 #include <QSet>
-#include <QtAlgorithms>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp
index 4cda129c2e..dce5e4b811 100644
--- a/src/plugins/qmljstools/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp
@@ -60,7 +60,6 @@
 #include <QTextStream>
 #include <QTimer>
 #include <QRegExp>
-#include <QtAlgorithms>
 #include <QLibraryInfo>
 #include <qglobal.h>
 
diff --git a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp
index 3cad3bdb9f..fa029f8df2 100644
--- a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp
+++ b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp
@@ -280,7 +280,7 @@ bool BasicProposalItemListModel::isSortable(const QString &prefix) const
 
 void BasicProposalItemListModel::sort(const QString &prefix)
 {
-    qStableSort(m_currentItems.begin(), m_currentItems.end(), ContentLessThan(prefix));
+    std::stable_sort(m_currentItems.begin(), m_currentItems.end(), ContentLessThan(prefix));
 }
 
 int BasicProposalItemListModel::persistentId(int index) const
diff --git a/src/plugins/texteditor/snippets/snippetscollection.cpp b/src/plugins/texteditor/snippets/snippetscollection.cpp
index 3fea0ba23a..f4fc400fdf 100644
--- a/src/plugins/texteditor/snippets/snippetscollection.cpp
+++ b/src/plugins/texteditor/snippets/snippetscollection.cpp
@@ -41,7 +41,6 @@
 #include <QDir>
 #include <QDebug>
 #include <QXmlStreamReader>
-#include <QtAlgorithms>
 
 #include <iterator>
 #include <algorithm>
@@ -51,29 +50,16 @@ using namespace Internal;
 
 namespace {
 
-struct SnippetComp
+static bool snippetComp(const Snippet &a, const Snippet &b)
 {
-    bool operator()(const Snippet &a, const Snippet &b) const
-    {
-        const int comp = a.trigger().toLower().localeAwareCompare(b.trigger().toLower());
-        if (comp < 0)
-            return true;
-        else if (comp == 0 &&
-                 a.complement().toLower().localeAwareCompare(b.complement().toLower()) < 0)
-            return true;
-        return false;
-    }
-};
-SnippetComp snippetComp;
-
-struct RemovedSnippetPred
-{
-    bool operator()(const Snippet &s) const
-    {
-        return s.isRemoved();
-    }
-};
-RemovedSnippetPred removedSnippetPred;
+    const int comp = a.trigger().toLower().localeAwareCompare(b.trigger().toLower());
+    if (comp < 0)
+        return true;
+    else if (comp == 0 &&
+             a.complement().toLower().localeAwareCompare(b.complement().toLower()) < 0)
+        return true;
+    return false;
+}
 
 } // Anonymous
 
@@ -140,8 +126,8 @@ SnippetsCollection::Hint SnippetsCollection::computeInsertionHint(const Snippet
 {
     const int group = groupIndex(snippet.groupId());
     QList<Snippet> &snippets = m_snippets[group];
-    QList<Snippet>::iterator it = qUpperBound(
-        snippets.begin(), m_activeSnippetsEnd.at(group), snippet, snippetComp);
+    QList<Snippet>::iterator it = std::upper_bound(snippets.begin(), m_activeSnippetsEnd.at(group),
+                                                   snippet, snippetComp);
     return Hint(static_cast<int>(std::distance(snippets.begin(), it)), it);
 }
 
@@ -175,12 +161,12 @@ SnippetsCollection::Hint SnippetsCollection::computeReplacementHint(int index,
 {
     const int group = groupIndex(snippet.groupId());
     QList<Snippet> &snippets = m_snippets[group];
-    QList<Snippet>::iterator it = qLowerBound(
-        snippets.begin(), m_activeSnippetsEnd.at(group), snippet, snippetComp);
+    QList<Snippet>::iterator it = std::lower_bound(snippets.begin(), m_activeSnippetsEnd.at(group),
+                                                    snippet, snippetComp);
     int hintIndex = static_cast<int>(std::distance(snippets.begin(), it));
     if (index < hintIndex - 1)
         return Hint(hintIndex - 1, it);
-    it = qUpperBound(it, m_activeSnippetsEnd.at(group), snippet, snippetComp);
+    it = std::upper_bound(it, m_activeSnippetsEnd.at(group), snippet, snippetComp);
     hintIndex = static_cast<int>(std::distance(snippets.begin(), it));
     if (index > hintIndex)
         return Hint(hintIndex, it);
@@ -249,7 +235,7 @@ void SnippetsCollection::updateActiveSnippetsEnd(int groupIndex)
 {
     m_activeSnippetsEnd[groupIndex] = std::find_if(m_snippets[groupIndex].begin(),
                                                    m_snippets[groupIndex].end(),
-                                                   removedSnippetPred);
+                                                   [](const Snippet &s) { return s.isRemoved(); });
 }
 
 void SnippetsCollection::restoreRemovedSnippets(const QString &groupId)
@@ -258,7 +244,7 @@ void SnippetsCollection::restoreRemovedSnippets(const QString &groupId)
     // Reverting the snippet can still bring it to the original version
     const int group = groupIndex(groupId);
     QVector<Snippet> toRestore(std::distance(m_activeSnippetsEnd[group], m_snippets[group].end()));
-    qCopy(m_activeSnippetsEnd[group], m_snippets[group].end(), toRestore.begin());
+    std::copy(m_activeSnippetsEnd[group], m_snippets[group].end(), toRestore.begin());
     m_snippets[group].erase(m_activeSnippetsEnd[group], m_snippets[group].end());
     foreach (Snippet snippet, toRestore) {
         snippet.setIsRemoved(false);
diff --git a/src/plugins/valgrind/xmlprotocol/error.cpp b/src/plugins/valgrind/xmlprotocol/error.cpp
index c5da6e4c50..d3cc095559 100644
--- a/src/plugins/valgrind/xmlprotocol/error.cpp
+++ b/src/plugins/valgrind/xmlprotocol/error.cpp
@@ -38,7 +38,7 @@
 #include <QTextStream>
 #include <QVector>
 
-#include <QtAlgorithms>
+#include <algorithm>
 
 namespace Valgrind {
 namespace XmlProtocol {
@@ -95,7 +95,7 @@ Error::Error(const Error &other) :
 
 void Error::swap(Error &other)
 {
-    qSwap(d, other.d);
+    std::swap(d, other.d);
 }
 
 Error &Error::operator=(const Error &other)
diff --git a/src/plugins/valgrind/xmlprotocol/frame.cpp b/src/plugins/valgrind/xmlprotocol/frame.cpp
index 611aaf30be..6ecd9660c9 100644
--- a/src/plugins/valgrind/xmlprotocol/frame.cpp
+++ b/src/plugins/valgrind/xmlprotocol/frame.cpp
@@ -31,7 +31,8 @@
 #include "frame.h"
 
 #include <QString>
-#include <QtAlgorithms>
+
+#include <algorithm>
 
 namespace Valgrind {
 namespace XmlProtocol {
@@ -91,7 +92,7 @@ bool Frame::operator!=(const Frame &other) const
 
 void Frame::swap(Frame &other)
 {
-    qSwap(d, other.d);
+    std::swap(d, other.d);
 }
 
 quint64 Frame::instructionPointer() const
diff --git a/src/plugins/vcsbase/diffhighlighter.cpp b/src/plugins/vcsbase/diffhighlighter.cpp
index f0a628d0fb..780308de5c 100644
--- a/src/plugins/vcsbase/diffhighlighter.cpp
+++ b/src/plugins/vcsbase/diffhighlighter.cpp
@@ -34,7 +34,6 @@
 #include <utils/qtcassert.h>
 
 #include <QDebug>
-#include <QtAlgorithms>
 #include <QRegExp>
 
 /*!
@@ -82,7 +81,7 @@ enum FoldingState {
     Location
 };
 
-}; // namespace Internal;
+} // namespace Internal;
 
 static inline QTextCharFormat invertedColorFormat(const QTextCharFormat &in)
 {