Replace qSort/qStableSort/qSwap

src/musicbrainz/acoustidclient.cpp

@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include <stdbool.h>
+#include <algorithm>
 
 #include <QObject>
 #include <QList>
@@ -46,6 +47,8 @@
 #include "core/network.h"
 #include "core/timeconstants.h"
 
+using std::stable_sort;
+
 const char *AcoustidClient::kClientId = "0qjUoxbowg";
 const char *AcoustidClient::kUrl = "http://api.acoustid.org/v2/lookup";
 const int AcoustidClient::kDefaultTimeout = 5000;  // msec
@@ -153,7 +156,7 @@ void AcoustidClient::RequestFinished(QNetworkReply *reply, int request_id) {
     }
   }
 
-  qStableSort(id_source_list);
+  std::stable_sort(id_source_list.begin(), id_source_list.end());
 
   QList<QString> id_list;
   for (const IdSource& is : id_source_list) {

src/musicbrainz/musicbrainzclient.cpp

@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include <algorithm>
+
 #include <QObject>
 #include <QList>
 #include <QPair>
@@ -44,6 +46,9 @@
 #include "core/utilities.h"
 #include "musicbrainzclient.h"
 
+using std::sort;
+using std::stable_sort;
+
 const char *MusicBrainzClient::kTrackUrl = "http://musicbrainz.org/ws/2/recording/";
 const char *MusicBrainzClient::kDiscUrl = "http://musicbrainz.org/ws/2/discid/";
 const char *MusicBrainzClient::kDateRegex = "^[12]\\d{3}";
@@ -220,7 +225,7 @@ void MusicBrainzClient::RequestFinished(QNetworkReply *reply, int id, int reques
     // Merge the results we have
     ResultList ret;
     QList<PendingResults> result_list_list = pending_results_.take(id);
-    qSort(result_list_list);
+    std::sort(result_list_list.begin(), result_list_list.end());
     for (const PendingResults &result_list : result_list_list) {
       ret << result_list.results_;
     }
@@ -242,6 +247,7 @@ bool MusicBrainzClient::MediumHasDiscid(const QString &discid, QXmlStreamReader
   }
   qLog(Debug) << "Reached end of xml stream without encountering </disc-list>";
   return false;
+
 }
 
 MusicBrainzClient::ResultList MusicBrainzClient::ParseMedium(QXmlStreamReader *reader) {
@@ -330,7 +336,7 @@ MusicBrainzClient::ResultList MusicBrainzClient::ParseTrack(QXmlStreamReader *re
     ret << result;
   }
   else {
-    qStableSort(releases);
+    std::stable_sort(releases.begin(), releases.end());
     for (const Release &release : releases) {
       ret << release.CopyAndMergeInto(result);
     }
@@ -401,7 +407,7 @@ MusicBrainzClient::ResultList MusicBrainzClient::UniqueResults(const ResultList&
   ResultList ret;
   if (opt == SortResults) {
     ret = QSet<Result>::fromList(results).toList();
-    qSort(ret);
+    std::sort(ret.begin(), ret.end());
   }
   else {  // KeepOriginalOrder
     // Qt doesn't provide a ordered set (QSet "stores values in an unspecified order" according to Qt documentation).