Reinvent deprecated qSort as Utils::sort

Change-Id: I4f6011cc2b6127037249aabc2426a88ad7108ebf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

4 files changed, 13 insertions, 13 deletions

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 5268fe6694..a08de8503e 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -50,6 +50,7 @@
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtversionmanager.h>
+#include <utils/algorithm.h>
 #include <utils/environment.h>
 #include <utils/sleep.h>
 
@@ -248,7 +249,7 @@ void AndroidConfig::updateNdkInformation() const
         const QString &fileName = it.next();
         m_availableNdkPlatforms.push_back(fileName.mid(fileName.lastIndexOf(QLatin1Char('-')) + 1).toInt());
     }
-    qSort(m_availableNdkPlatforms.begin(), m_availableNdkPlatforms.end(), qGreater<int>());
+    Utils::sort(m_availableNdkPlatforms, std::greater<int>());
 
     // detect toolchain host
     QStringList hostPatterns;
@@ -494,7 +495,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
         devices.push_back(dev);
     }
 
-    qSort(devices.begin(), devices.end(), androidDevicesLessThan);
+    Utils::sort(devices, androidDevicesLessThan);
     if (devices.isEmpty() && error)
         *error = QApplication::translate("AndroidConfiguration",
                                          "No devices found in output of: %1")
@@ -631,7 +632,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::androidVirtualDevices() const
         dev.type = AndroidDeviceInfo::Emulator;
         devices.push_back(dev);
     }
-    qSort(devices.begin(), devices.end(), androidDevicesLessThan);
+    Utils::sort(devices, androidDevicesLessThan);
 
     return devices;
 }
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index bdd9e7b6e7..55914e9ace 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -50,6 +50,7 @@
 #include <qtsupport/customexecutablerunconfiguration.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
+#include <utils/algorithm.h>
 
 #include <QDir>
 #include <QFileSystemWatcher>
@@ -868,7 +869,11 @@ QVector<AndroidManager::Library> AndroidManager::availableQtLibsWithDependencies
         }
         qtLibraries.push_back(library);
     }
-    qSort(qtLibraries.begin(), qtLibraries.end(), qtLibrariesLessThan);
+    Utils::sort(qtLibraries, [](const Library &a, const Library &b) -> bool {
+        if (a.level == b.level)
+            return a.name < b.name;
+        return a.level < b.level;
+    });
 
     return qtLibraries;
 
@@ -1171,13 +1176,6 @@ int AndroidManager::setLibraryLevel(const QString &library, LibrariesMap &mapLib
     return maxlevel + 1;
 }
 
-bool AndroidManager::qtLibrariesLessThan(const Library &a, const Library &b)
-{
-    if (a.level == b.level)
-        return a.name < b.name;
-    return a.level < b.level;
-}
-
 QString AndroidManager::libGnuStl(const QString &arch, const QString &ndkToolChainVersion)
 {
     return AndroidConfigurations::currentConfig().ndkLocation().toString()
diff --git a/src/plugins/android/androidmanager.h b/src/plugins/android/androidmanager.h
index 75b2fe2b72..ca5e35d63b 100644
--- a/src/plugins/android/androidmanager.h
+++ b/src/plugins/android/androidmanager.h
@@ -158,7 +158,7 @@ private:
 
     static QStringList dependencies(const Utils::FileName &readelfPath, const QString &lib);
     static int setLibraryLevel(const QString &library, LibrariesMap &mapLibs);
-    static bool qtLibrariesLessThan(const Library &a, const Library &b);
+
 };
 
 } // namespace Internal
diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index 338954849a..fa47a0b9eb 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -48,6 +48,7 @@
 #include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorsettings.h>
 #include <qmakeprojectmanager/qmakeproject.h>
+#include <utils/algorithm.h>
 
 #include <QLineEdit>
 #include <QFileInfo>
@@ -1348,7 +1349,7 @@ void PermissionsModel::setPermissions(const QStringList &permissions)
 {
     beginResetModel();
     m_permissions = permissions;
-    qSort(m_permissions);
+    Utils::sort(m_permissions);
     endResetModel();
 }