Add missing const
This commit is contained in:
@@ -22,6 +22,7 @@
|
||||
#include "config.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <utility>
|
||||
|
||||
#include <QtGlobal>
|
||||
#include <QObject>
|
||||
@@ -161,16 +162,16 @@ void AcoustidClient::RequestFinished(QNetworkReply *reply, const int request_id)
|
||||
// -then sort results by number of sources (the results are originally
|
||||
// unsorted but results with more sources are likely to be more accurate)
|
||||
// -keep only the ids, as sources where useful only to sort the results
|
||||
QJsonArray json_results = json_object[QLatin1String("results")].toArray();
|
||||
const QJsonArray json_results = json_object[QLatin1String("results")].toArray();
|
||||
|
||||
// List of <id, nb of sources> pairs
|
||||
QList<IdSource> id_source_list;
|
||||
|
||||
for (const QJsonValueRef v : json_results) {
|
||||
for (const QJsonValue &v : json_results) {
|
||||
QJsonObject r = v.toObject();
|
||||
if (!r[QLatin1String("recordings")].isUndefined()) {
|
||||
QJsonArray json_recordings = r[QLatin1String("recordings")].toArray();
|
||||
for (const QJsonValueRef recording : json_recordings) {
|
||||
const QJsonArray json_recordings = r[QLatin1String("recordings")].toArray();
|
||||
for (const QJsonValue &recording : json_recordings) {
|
||||
QJsonObject o = recording.toObject();
|
||||
if (!o[QLatin1String("id")].isUndefined()) {
|
||||
id_source_list << IdSource(o[QLatin1String("id")].toString(), o[QLatin1String("sources")].toInt());
|
||||
@@ -183,11 +184,10 @@ void AcoustidClient::RequestFinished(QNetworkReply *reply, const int request_id)
|
||||
|
||||
QStringList id_list;
|
||||
id_list.reserve(id_source_list.count());
|
||||
for (const IdSource &is : id_source_list) {
|
||||
for (const IdSource &is : std::as_const(id_source_list)) {
|
||||
id_list << is.id_;
|
||||
}
|
||||
|
||||
emit Finished(request_id, id_list);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "config.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <utility>
|
||||
|
||||
#include <QObject>
|
||||
#include <QSet>
|
||||
@@ -213,7 +214,7 @@ void MusicBrainzClient::RequestFinished(QNetworkReply *reply, const int id, cons
|
||||
ResultList res;
|
||||
while (!reader.atEnd()) {
|
||||
if (reader.readNext() == QXmlStreamReader::StartElement && reader.name().toString() == QLatin1String("recording")) {
|
||||
ResultList tracks = ParseTrack(&reader);
|
||||
const ResultList tracks = ParseTrack(&reader);
|
||||
for (const Result &track : tracks) {
|
||||
if (!track.title_.isEmpty()) {
|
||||
res << track;
|
||||
@@ -230,7 +231,7 @@ void MusicBrainzClient::RequestFinished(QNetworkReply *reply, const int id, cons
|
||||
ResultList ret;
|
||||
QList<PendingResults> result_list_list = pending_results_.take(id);
|
||||
std::sort(result_list_list.begin(), result_list_list.end());
|
||||
for (const PendingResults &result_list : result_list_list) {
|
||||
for (const PendingResults &result_list : std::as_const(result_list_list)) {
|
||||
ret << result_list.results_;
|
||||
}
|
||||
emit Finished(id, UniqueResults(ret, UniqueResultsSortOption::KeepOriginalOrder), error);
|
||||
@@ -292,7 +293,7 @@ void MusicBrainzClient::DiscIdRequestFinished(const QString &discid, QNetworkRep
|
||||
if (token == QXmlStreamReader::StartElement && name == QLatin1String("medium")) {
|
||||
// Get the medium with a matching discid.
|
||||
if (MediumHasDiscid(discid, &reader)) {
|
||||
ResultList tracks = ParseMedium(&reader);
|
||||
const ResultList tracks = ParseMedium(&reader);
|
||||
for (const Result &track : tracks) {
|
||||
if (!track.title_.isEmpty()) {
|
||||
ret << track;
|
||||
@@ -387,6 +388,7 @@ MusicBrainzClient::Result MusicBrainzClient::ParseTrackFromDisc(QXmlStreamReader
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
}
|
||||
|
||||
MusicBrainzClient::ResultList MusicBrainzClient::ParseTrack(QXmlStreamReader *reader) {
|
||||
@@ -426,11 +428,13 @@ MusicBrainzClient::ResultList MusicBrainzClient::ParseTrack(QXmlStreamReader *re
|
||||
else {
|
||||
std::stable_sort(releases.begin(), releases.end());
|
||||
ret.reserve(releases.count());
|
||||
for (const Release &release : releases) {
|
||||
for (const Release &release : std::as_const(releases)) {
|
||||
ret << release.CopyAndMergeInto(result);
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
||||
}
|
||||
|
||||
// Parse the artist. Multiple artists are joined together with the joinphrase from musicbrainz.
|
||||
|
||||
@@ -154,4 +154,3 @@ void TagFetcher::TagsFetched(const int index, const MusicBrainzClient::ResultLis
|
||||
emit ResultAvailable(original_song, songs_guessed, error);
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user