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

Remove use of deprecated Qt algorithms

Browse Source 
Change-Id: Ib35cffa2d5762874feea9b1d4df7f569c0e5f496
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2016-08-03 23:29:58 +03:00
committed by Orgad Shaneh
parent d4b3789db4
commit 670e54345c
33 changed files with 103 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
View File

@@ -34,6 +34,7 @@
#include "qmljsviewercontext.h"
#include <cplusplus/cppmodelmanagerbase.h>
#include <utils/algorithm.h>
#include <utils/hostosinfo.h>
#include <utils/runextensions.h>
@@ -439,9 +440,9 @@ void ModelManagerInterface::iterateQrcFiles(ProjectExplorer::Project *project,
} else {
pInfos = projectInfos();
if (resources == ActiveQrcResources) // make the result predictable
qSort(pInfos.begin(), pInfos.end(), &pInfoLessThanActive);
Utils::sort(pInfos, &pInfoLessThanActive);
else
qSort(pInfos.begin(), pInfos.end(), &pInfoLessThanAll);
Utils::sort(pInfos, &pInfoLessThanAll);
}
QSet<QString> pathsChecked;

7
src/libs/qmljs/qmljsscanner.cpp
View File

@@ -25,6 +25,8 @@
#include <qmljs/qmljsscanner.h>
#include <algorithm>
using namespace QmlJS;
namespace {
@@ -410,10 +412,7 @@ int Scanner::state() const
bool Scanner::isKeyword(const QString &text) const
{
if (qBinaryFind(begin(js_keywords), end(js_keywords), text) != end(js_keywords))
return true;
return false;
return std::binary_search(begin(js_keywords), end(js_keywords), text);
}
QStringList Scanner::keywords()