feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Reinvent deprecated qSort as Utils::sort

Browse Source 
Change-Id: I4f6011cc2b6127037249aabc2426a88ad7108ebf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Nikita Baryshnikov
2014-06-16 18:25:52 +04:00
committed by hjk
parent eefd0f4332
commit 12103e0f67
75 changed files with 275 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmljseditor/qmljscompletionassist.cpp
View File

@@ -59,7 +59,6 @@
#include <QFile>
#include <QFileInfo>
#include <QDir>
#include <QtAlgorithms>
#include <QDirIterator>
#include <QStringList>
#include <QIcon>
@@ -1034,7 +1033,7 @@ void QmlJSAssistProposalModel::filter(const QString &prefix)
void QmlJSAssistProposalModel::sort(const QString &prefix)
{
qSort(currentItems().first, currentItems().second, QmlJSLessThan(prefix));
std::sort(currentItems().first, currentItems().second, QmlJSLessThan(prefix));
}
bool QmlJSAssistProposalModel::keepPerfectMatch(TextEditor::AssistReason reason) const

5
src/plugins/qmljseditor/qmljssemantichighlighter.cpp
View File

@@ -45,6 +45,7 @@
#include <texteditor/basetextdocument.h>
#include <texteditor/texteditorconstants.h>
#include <texteditor/fontsettings.h>
#include <utils/algorithm.h>
#include <utils/qtcassert.h>
#include <QFutureInterface>
@@ -444,7 +445,7 @@ private:
addMessages(m_semanticInfo.semanticMessages, m_semanticInfo.document);
addMessages(m_semanticInfo.staticAnalysisMessages, m_semanticInfo.document);
qSort(m_delayedUses.begin(), m_delayedUses.end(), sortByLinePredicate);
Utils::sort(m_delayedUses, sortByLinePredicate);
}
m_currentDelayedUse = 0;
@@ -513,7 +514,7 @@ private:
if (m_uses.isEmpty())
return;
qSort(m_uses.begin(), m_uses.end(), sortByLinePredicate);
Utils::sort(m_uses, sortByLinePredicate);
reportResults(m_uses);
m_uses.clear();
m_uses.reserve(chunkSize);