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

9
src/libs/extensionsystem/pluginmanager.cpp
View File

@@ -275,11 +275,6 @@ using namespace ExtensionSystem::Internal;
static Internal::PluginManagerPrivate *d = 0;
static PluginManager *m_instance = 0;
static bool lessThanByPluginName(const PluginSpec *one, const PluginSpec *two)
{
return one->name() < two->name();
}
/*!
Gets the unique plugin manager instance.
*/
@@ -588,7 +583,7 @@ static QStringList subList(const QStringList &in, const QString &key)
QStringList rc;
// Find keyword and copy arguments until end or next keyword
const QStringList::const_iterator inEnd = in.constEnd();
QStringList::const_iterator it = qFind(in.constBegin(), inEnd, key);
QStringList::const_iterator it = std::find(in.constBegin(), inEnd, key);
if (it != inEnd) {
const QChar nextIndicator = QLatin1Char(':');
for (++it; it != inEnd && !it->startsWith(nextIndicator); ++it)
@@ -1468,7 +1463,7 @@ void PluginManagerPrivate::readPluginPaths()
}
resolveDependencies();
// ensure deterministic plugin load order by sorting
qSort(pluginSpecs.begin(), pluginSpecs.end(), lessThanByPluginName);
Utils::sort(pluginSpecs, &PluginSpec::name);
emit q->pluginsChanged();
}