summaryrefslogtreecommitdiff
path: root/src/libs/extensionsystem/pluginmanager.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2016-08-03 23:29:58 +0300
committerOrgad Shaneh <orgads@gmail.com>2016-08-09 13:41:25 +0000
commit670e54345c6ede1b5edac7a5351736c1c98e0f6c (patch)
tree6b64bead973269b6156f8304b65492b04751faeb /src/libs/extensionsystem/pluginmanager.cpp
parentd4b3789db497390d16ebd3ab7b61d0d93dc9c244 (diff)
downloadqt-creator-670e54345c6ede1b5edac7a5351736c1c98e0f6c.tar.gz
Remove use of deprecated Qt algorithms
Change-Id: Ib35cffa2d5762874feea9b1d4df7f569c0e5f496 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/libs/extensionsystem/pluginmanager.cpp')
-rw-r--r--src/libs/extensionsystem/pluginmanager.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index cf8fd1b85e..554861729c 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -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();
}