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

5
src/plugins/texteditor/syntaxhighlighter.cpp
View File

@@ -33,6 +33,7 @@
#include "texteditorsettings.h"
#include "fontsettings.h"
#include <utils/algorithm.h>
#include <utils/qtcassert.h>
#include <qtimer.h>
@@ -659,7 +660,7 @@ void SyntaxHighlighter::setExtraAdditionalFormats(const QTextBlock& block,
if (block.layout() == 0 || blockLength == 0)
return;
qSort(formats.begin(), formats.end(), byStartOfRange);
Utils::sort(formats, byStartOfRange);
const QList<QTextLayout::FormatRange> all = block.layout()->additionalFormats();
QList<QTextLayout::FormatRange> previousSemanticFormats;
@@ -678,7 +679,7 @@ void SyntaxHighlighter::setExtraAdditionalFormats(const QTextBlock& block,
}
if (formats.size() == previousSemanticFormats.size()) {
qSort(previousSemanticFormats.begin(), previousSemanticFormats.end(), byStartOfRange);
Utils::sort(previousSemanticFormats, byStartOfRange);
int index = 0;
for (; index != formats.size(); ++index) {