diff --git a/src/covermanager/deezercoverprovider.cpp b/src/covermanager/deezercoverprovider.cpp index bbf3291dc..45f3ef5de 100644 --- a/src/covermanager/deezercoverprovider.cpp +++ b/src/covermanager/deezercoverprovider.cpp @@ -221,10 +221,10 @@ void DeezerCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) QMap results; int i = 0; - for (const QJsonValue json_value : array_data) { + for (const QJsonValueRef json_value : array_data) { if (!json_value.isObject()) { - Error("Invalid Json reply, data array value is not a object.", json_value); + Error("Invalid Json reply, data array value is not a object."); continue; } QJsonObject json_obj = json_value.toObject(); diff --git a/src/covermanager/discogscoverprovider.cpp b/src/covermanager/discogscoverprovider.cpp index f531b512a..d38fd90a8 100644 --- a/src/covermanager/discogscoverprovider.cpp +++ b/src/covermanager/discogscoverprovider.cpp @@ -273,10 +273,10 @@ void DiscogsCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) array_results = value_results.toArray(); } - for (const QJsonValue value_result : array_results) { + for (const QJsonValueRef value_result : array_results) { if (!value_result.isObject()) { - Error("Invalid Json reply, results value is not a object.", value_result); + Error("Invalid Json reply, results value is not a object."); continue; } QJsonObject obj_result = value_result.toObject(); @@ -380,9 +380,9 @@ void DiscogsCoverProvider::HandleReleaseReply(QNetworkReply *reply, const int se QJsonArray array_artists = value_artists.toArray(); int i = 0; QString artist; - for (const QJsonValue value_artist : array_artists) { + for (const QJsonValueRef value_artist : array_artists) { if (!value_artist.isObject()) { - Error("Invalid Json reply, atists array value is not a object.", value_artist); + Error("Invalid Json reply, atists array value is not a object."); continue; } QJsonObject obj_artist = value_artist.toObject(); @@ -421,10 +421,10 @@ void DiscogsCoverProvider::HandleReleaseReply(QNetworkReply *reply, const int se return; } - for (const QJsonValue value_image : array_images) { + for (const QJsonValueRef value_image : array_images) { if (!value_image.isObject()) { - Error("Invalid Json reply, images array value is not an object.", value_image); + Error("Invalid Json reply, images array value is not an object."); continue; } QJsonObject obj_image = value_image.toObject(); diff --git a/src/covermanager/lastfmcoverprovider.cpp b/src/covermanager/lastfmcoverprovider.cpp index 59657e22d..4a6c4d205 100644 --- a/src/covermanager/lastfmcoverprovider.cpp +++ b/src/covermanager/lastfmcoverprovider.cpp @@ -230,10 +230,10 @@ void LastFmCoverProvider::QueryFinished(QNetworkReply *reply, const int id, cons } QJsonArray array_type = value_type.toArray(); - for (const QJsonValue value : array_type) { + for (const QJsonValueRef value : array_type) { if (!value.isObject()) { - Error("Invalid Json reply, value in albummatches/trackmatches array is not a object.", value); + Error("Invalid Json reply, value in albummatches/trackmatches array is not a object."); continue; } QJsonObject obj = value.toObject(); @@ -255,9 +255,9 @@ void LastFmCoverProvider::QueryFinished(QNetworkReply *reply, const int id, cons QJsonArray array_image = json_image.toArray(); QUrl url; LastFmImageSize size(LastFmImageSize::Unknown); - for (const QJsonValue value_image : array_image) { + for (const QJsonValueRef value_image : array_image) { if (!value_image.isObject()) { - Error("Invalid Json reply, album image value is not an object.", value_image); + Error("Invalid Json reply, album image value is not an object."); continue; } QJsonObject obj_image = value_image.toObject(); diff --git a/src/covermanager/musicbrainzcoverprovider.cpp b/src/covermanager/musicbrainzcoverprovider.cpp index edeeb1033..1a332d8bd 100644 --- a/src/covermanager/musicbrainzcoverprovider.cpp +++ b/src/covermanager/musicbrainzcoverprovider.cpp @@ -167,10 +167,10 @@ void MusicbrainzCoverProvider::HandleSearchReply(QNetworkReply *reply, const int return; } - for (const QJsonValue value_release : array_releases) { + for (const QJsonValueRef value_release : array_releases) { if (!value_release.isObject()) { - Error("Invalid Json reply, releases array value is not an object.", value_release); + Error("Invalid Json reply, releases array value is not an object."); continue; } QJsonObject obj_release = value_release.toObject(); @@ -187,9 +187,9 @@ void MusicbrainzCoverProvider::HandleSearchReply(QNetworkReply *reply, const int QJsonArray array_artists = json_artists.toArray(); int i = 0; QString artist; - for (const QJsonValue value_artist : array_artists) { + for (const QJsonValueRef value_artist : array_artists) { if (!value_artist.isObject()) { - Error("Invalid Json reply, artist is not a object.", value_artist); + Error("Invalid Json reply, artist is not a object."); continue; } QJsonObject obj_artist = value_artist.toObject(); diff --git a/src/covermanager/qobuzcoverprovider.cpp b/src/covermanager/qobuzcoverprovider.cpp index 3c1bd0204..ad22393af 100644 --- a/src/covermanager/qobuzcoverprovider.cpp +++ b/src/covermanager/qobuzcoverprovider.cpp @@ -217,10 +217,10 @@ void QobuzCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) { } QJsonArray array_items = value_items.toArray(); - for (const QJsonValue value : array_items) { + for (const QJsonValueRef value : array_items) { if (!value.isObject()) { - Error("Invalid Json reply, value in items is not a object.", value); + Error("Invalid Json reply, value in items is not a object."); continue; } QJsonObject item_obj = value.toObject(); diff --git a/src/covermanager/spotifycoverprovider.cpp b/src/covermanager/spotifycoverprovider.cpp index 9ace4ee1f..ed7a13b92 100644 --- a/src/covermanager/spotifycoverprovider.cpp +++ b/src/covermanager/spotifycoverprovider.cpp @@ -495,7 +495,7 @@ void SpotifyCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id, } CoverProviderSearchResults results; - for (const QJsonValue value_item : array_items) { + for (const QJsonValueRef value_item : array_items) { if (!value_item.isObject()) { continue; @@ -515,14 +515,14 @@ void SpotifyCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id, QString album = obj_album["name"].toString(); QStringList artists; - for (const QJsonValue value_artist : array_artists) { + for (const QJsonValueRef value_artist : array_artists) { if (!value_artist.isObject()) continue; QJsonObject obj_artist = value_artist.toObject(); if (!obj_artist.contains("name")) continue; artists << obj_artist["name"].toString(); } - for (const QJsonValue value_image : array_images) { + for (const QJsonValueRef value_image : array_images) { if (!value_image.isObject()) continue; QJsonObject obj_image = value_image.toObject(); if (!obj_image.contains("url") || !obj_image.contains("width") || !obj_image.contains("height")) continue; diff --git a/src/covermanager/tidalcoverprovider.cpp b/src/covermanager/tidalcoverprovider.cpp index eff6435d7..7288342b3 100644 --- a/src/covermanager/tidalcoverprovider.cpp +++ b/src/covermanager/tidalcoverprovider.cpp @@ -212,10 +212,10 @@ void TidalCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) { CoverProviderSearchResults results; int i = 0; - for (const QJsonValue value_item : array_items) { + for (const QJsonValueRef value_item : array_items) { if (!value_item.isObject()) { - Error("Invalid Json reply, items array item is not a object.", value_item); + Error("Invalid Json reply, items array item is not a object."); continue; } QJsonObject obj_item = value_item.toObject(); diff --git a/src/lyrics/auddlyricsprovider.cpp b/src/lyrics/auddlyricsprovider.cpp index 2c00d4ad9..baed4399b 100644 --- a/src/lyrics/auddlyricsprovider.cpp +++ b/src/lyrics/auddlyricsprovider.cpp @@ -106,7 +106,7 @@ void AuddLyricsProvider::HandleSearchReply(QNetworkReply *reply, const quint64 i } LyricsSearchResults results; - for (const QJsonValue value : json_result) { + for (const QJsonValueRef value : json_result) { if (!value.isObject()) { qLog(Error) << "AudDLyrics: Invalid Json reply, result is not an object."; qLog(Debug) << value; diff --git a/src/musicbrainz/acoustidclient.cpp b/src/musicbrainz/acoustidclient.cpp index be9bf6e3b..f873be52a 100644 --- a/src/musicbrainz/acoustidclient.cpp +++ b/src/musicbrainz/acoustidclient.cpp @@ -169,11 +169,11 @@ void AcoustidClient::RequestFinished(QNetworkReply *reply, const int request_id) // List of pairs QList id_source_list; - for (const QJsonValue v : json_results) { + for (const QJsonValueRef v : json_results) { QJsonObject r = v.toObject(); if (!r["recordings"].isUndefined()) { QJsonArray json_recordings = r["recordings"].toArray(); - for (const QJsonValue recording : json_recordings) { + for (const QJsonValueRef recording : json_recordings) { QJsonObject o = recording.toObject(); if (!o["id"].isUndefined()) { id_source_list << IdSource(o["id"].toString(), o["sources"].toInt()); diff --git a/src/qobuz/qobuzrequest.cpp b/src/qobuz/qobuzrequest.cpp index 3043a754f..be1015bdb 100644 --- a/src/qobuz/qobuzrequest.cpp +++ b/src/qobuz/qobuzrequest.cpp @@ -396,12 +396,12 @@ void QobuzRequest::ArtistsReplyReceived(QNetworkReply *reply, const int limit_re } int artists_received = 0; - for (const QJsonValue value_item : array_items) { + for (const QJsonValueRef value_item : array_items) { ++artists_received; if (!value_item.isObject()) { - Error("Invalid Json reply, item not a object.", value_item); + Error("Invalid Json reply, item not a object."); continue; } QJsonObject obj_item = value_item.toObject(); @@ -609,12 +609,12 @@ void QobuzRequest::AlbumsReceived(QNetworkReply *reply, const QString &artist_id } int albums_received = 0; - for (const QJsonValue value : array_items) { + for (const QJsonValueRef value : array_items) { ++albums_received; if (!value.isObject()) { - Error("Invalid Json reply, item not a object.", value); + Error("Invalid Json reply, item not a object."); continue; } QJsonObject obj_item = value.toObject(); @@ -907,10 +907,10 @@ void QobuzRequest::SongsReceived(QNetworkReply *reply, const QString &artist_id_ //bool multidisc = false; SongList songs; int songs_received = 0; - for (const QJsonValue value_item : array_items) { + for (const QJsonValueRef value_item : array_items) { if (!value_item.isObject()) { - Error("Invalid Json reply, track is not a object.", value_item); + Error("Invalid Json reply, track is not a object."); continue; } QJsonObject obj_item = value_item.toObject(); diff --git a/src/scrobbler/lastfmimport.cpp b/src/scrobbler/lastfmimport.cpp index b44500826..01ba1dfaa 100644 --- a/src/scrobbler/lastfmimport.cpp +++ b/src/scrobbler/lastfmimport.cpp @@ -356,7 +356,7 @@ void LastFMImport::GetRecentTracksRequestFinished(QNetworkReply *reply, const in QJsonArray array_track = json_obj["track"].toArray(); - for (const QJsonValue value_track : array_track) { + for (const QJsonValueRef value_track : array_track) { ++lastplayed_received_; @@ -518,7 +518,9 @@ void LastFMImport::GetTopTracksRequestFinished(QNetworkReply *reply, const int p else { QJsonArray array_track = json_obj["track"].toArray(); - for (const QJsonValue value_track : array_track) { + for (QJsonArray::iterator it = array_track.begin() ; it != array_track.end() ; ++it) { + + const QJsonValue &value_track = *it; ++playcount_received_; diff --git a/src/scrobbler/scrobblercache.cpp b/src/scrobbler/scrobblercache.cpp index ab40c0c04..517cc5963 100644 --- a/src/scrobbler/scrobblercache.cpp +++ b/src/scrobbler/scrobblercache.cpp @@ -110,7 +110,7 @@ void ScrobblerCache::ReadCache() { return; } - for (const QJsonValue value : json_array) { + for (const QJsonValueRef value : json_array) { if (!value.isObject()) { qLog(Error) << "Scrobbler cache JSON tracks array value is not an object."; qLog(Debug) << value; diff --git a/src/scrobbler/scrobblingapi20.cpp b/src/scrobbler/scrobblingapi20.cpp index fbd1ca8c7..e6b33d468 100644 --- a/src/scrobbler/scrobblingapi20.cpp +++ b/src/scrobbler/scrobblingapi20.cpp @@ -717,10 +717,10 @@ void ScrobblingAPI20::ScrobbleRequestFinished(QNetworkReply *reply, QList