From 1291dadbd6af99c6cdb9637bbeaf5700bcd7c22a Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 21 Aug 2020 22:39:01 +0200 Subject: [PATCH] Replace use of QStringRef --- src/lyrics/chartlyricsprovider.cpp | 2 +- src/lyrics/lololyricsprovider.cpp | 2 +- src/musicbrainz/musicbrainzclient.cpp | 39 ++++++++++++++------------- src/playlistparsers/wplparser.cpp | 11 ++++---- src/playlistparsers/xspfparser.cpp | 4 +-- 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/src/lyrics/chartlyricsprovider.cpp b/src/lyrics/chartlyricsprovider.cpp index 5907b307c..7fb8d4209 100644 --- a/src/lyrics/chartlyricsprovider.cpp +++ b/src/lyrics/chartlyricsprovider.cpp @@ -109,7 +109,7 @@ void ChartLyricsProvider::HandleSearchReply(QNetworkReply *reply, const quint64 while (!reader.atEnd()) { QXmlStreamReader::TokenType type = reader.readNext(); - QStringRef name = reader.name(); + QString name = reader.name().toString(); if (type == QXmlStreamReader::StartElement) { if (name == "GetLyricResult") { result = LyricsSearchResult(); diff --git a/src/lyrics/lololyricsprovider.cpp b/src/lyrics/lololyricsprovider.cpp index b2056e063..7a586aa89 100644 --- a/src/lyrics/lololyricsprovider.cpp +++ b/src/lyrics/lololyricsprovider.cpp @@ -115,7 +115,7 @@ void LoloLyricsProvider::HandleSearchReply(QNetworkReply *reply, const quint64 i QString status; while (!reader.atEnd()) { QXmlStreamReader::TokenType type = reader.readNext(); - QStringRef name = reader.name(); + QString name = reader.name().toString(); if (type == QXmlStreamReader::StartElement) { if (name == "result") { status.clear(); diff --git a/src/musicbrainz/musicbrainzclient.cpp b/src/musicbrainz/musicbrainzclient.cpp index 10f6166ee..25db86d47 100644 --- a/src/musicbrainz/musicbrainzclient.cpp +++ b/src/musicbrainz/musicbrainzclient.cpp @@ -220,7 +220,7 @@ void MusicBrainzClient::RequestFinished(QNetworkReply *reply, const int id, cons QXmlStreamReader reader(data); ResultList res; while (!reader.atEnd()) { - if (reader.readNext() == QXmlStreamReader::StartElement && reader.name() == "recording") { + if (reader.readNext() == QXmlStreamReader::StartElement && reader.name().toString() == "recording") { ResultList tracks = ParseTrack(&reader); for (const Result &track : tracks) { if (!track.title_.isEmpty()) { @@ -274,7 +274,7 @@ void MusicBrainzClient::DiscIdRequestFinished(const QString &discid, QNetworkRep while (!reader.atEnd()) { QXmlStreamReader::TokenType type = reader.readNext(); if (type == QXmlStreamReader::StartElement) { - QStringRef name = reader.name(); + QString name = reader.name().toString(); if (name == "title") { album = reader.readElementText(); } @@ -296,7 +296,8 @@ void MusicBrainzClient::DiscIdRequestFinished(const QString &discid, QNetworkRep while (!reader.atEnd()) { QXmlStreamReader::TokenType token = reader.readNext(); - if (token == QXmlStreamReader::StartElement && reader.name() == "medium") { + QString name = reader.name().toString(); + if (token == QXmlStreamReader::StartElement && name == "medium") { // Get the medium with a matching discid. if (MediumHasDiscid(discid, &reader)) { ResultList tracks = ParseMedium(&reader); @@ -310,7 +311,7 @@ void MusicBrainzClient::DiscIdRequestFinished(const QString &discid, QNetworkRep Utilities::ConsumeCurrentElement(&reader); } } - else if (token == QXmlStreamReader::EndElement && reader.name() == "medium-list") { + else if (token == QXmlStreamReader::EndElement && name == "medium-list") { break; } } @@ -330,11 +331,12 @@ bool MusicBrainzClient::MediumHasDiscid(const QString &discid, QXmlStreamReader while (!reader->atEnd()) { QXmlStreamReader::TokenType type = reader->readNext(); + QString name = reader->name().toString(); - if (type == QXmlStreamReader::StartElement && reader->name() == "disc" && reader->attributes().value("id").toString() == discid) { + if (type == QXmlStreamReader::StartElement && name == "disc" && reader->attributes().value("id").toString() == discid) { return true; } - else if (type == QXmlStreamReader::EndElement && reader->name() == "disc-list") { + else if (type == QXmlStreamReader::EndElement && name == "disc-list") { return false; } } @@ -348,16 +350,17 @@ MusicBrainzClient::ResultList MusicBrainzClient::ParseMedium(QXmlStreamReader *r ResultList ret; while (!reader->atEnd()) { QXmlStreamReader::TokenType type = reader->readNext(); + QString name = reader->name().toString(); if (type == QXmlStreamReader::StartElement) { - if (reader->name() == "track") { + if (name == "track") { Result result; result = ParseTrackFromDisc(reader); ret << result; } } - if (type == QXmlStreamReader::EndElement && reader->name() == "track-list") { + if (type == QXmlStreamReader::EndElement && name == "track-list") { break; } } @@ -372,9 +375,9 @@ MusicBrainzClient::Result MusicBrainzClient::ParseTrackFromDisc(QXmlStreamReader while (!reader->atEnd()) { QXmlStreamReader::TokenType type = reader->readNext(); + QString name = reader->name().toString(); if (type == QXmlStreamReader::StartElement) { - QStringRef name = reader->name(); if (name == "position") { result.track_ = reader->readElementText().toInt(); } @@ -386,7 +389,7 @@ MusicBrainzClient::Result MusicBrainzClient::ParseTrackFromDisc(QXmlStreamReader } } - if (type == QXmlStreamReader::EndElement && reader->name() == "track") { + if (type == QXmlStreamReader::EndElement && name == "track") { break; } } @@ -401,9 +404,9 @@ MusicBrainzClient::ResultList MusicBrainzClient::ParseTrack(QXmlStreamReader *re while (!reader->atEnd()) { QXmlStreamReader::TokenType type = reader->readNext(); + QString name = reader->name().toString(); if (type == QXmlStreamReader::StartElement) { - QStringRef name = reader->name(); if (name == "title") { result.title_ = reader->readElementText(); @@ -419,7 +422,7 @@ MusicBrainzClient::ResultList MusicBrainzClient::ParseTrack(QXmlStreamReader *re } } - if (type == QXmlStreamReader::EndElement && reader->name() == "recording") { + if (type == QXmlStreamReader::EndElement && name == "recording") { break; } } @@ -444,16 +447,16 @@ void MusicBrainzClient::ParseArtist(QXmlStreamReader *reader, QString *artist) { while (!reader->atEnd()) { QXmlStreamReader::TokenType type = reader->readNext(); - - if (type == QXmlStreamReader::StartElement && reader->name() == "name-credit") { + QString name = reader->name().toString(); + if (type == QXmlStreamReader::StartElement && name == "name-credit") { join_phrase = reader->attributes().value("joinphrase").toString(); } - if (type == QXmlStreamReader::StartElement && reader->name() == "name") { + if (type == QXmlStreamReader::StartElement && name == "name") { *artist += reader->readElementText() + join_phrase; } - if (type == QXmlStreamReader::EndElement && reader->name() == "artist-credit") { + if (type == QXmlStreamReader::EndElement && name == "artist-credit") { return; } } @@ -465,9 +468,9 @@ MusicBrainzClient::Release MusicBrainzClient::ParseRelease(QXmlStreamReader *rea while (!reader->atEnd()) { QXmlStreamReader::TokenType type = reader->readNext(); + QString name = reader->name().toString(); if (type == QXmlStreamReader::StartElement) { - QStringRef name = reader->name(); if (name == "title") { ret.album_ = reader->readElementText(); } @@ -487,7 +490,7 @@ MusicBrainzClient::Release MusicBrainzClient::ParseRelease(QXmlStreamReader *rea } } - if (type == QXmlStreamReader::EndElement && reader->name() == "release") { + if (type == QXmlStreamReader::EndElement && name == "release") { break; } } diff --git a/src/playlistparsers/wplparser.cpp b/src/playlistparsers/wplparser.cpp index b2dd5067d..887fa5abb 100644 --- a/src/playlistparsers/wplparser.cpp +++ b/src/playlistparsers/wplparser.cpp @@ -63,24 +63,25 @@ void WplParser::ParseSeq(const QDir &dir, QXmlStreamReader *reader, SongList *so while (!reader->atEnd()) { QXmlStreamReader::TokenType type = reader->readNext(); + QString name = reader->name().toString(); switch (type) { case QXmlStreamReader::StartElement: { - QStringRef name = reader->name(); if (name == "media") { - QStringRef src = reader->attributes().value("src"); + QString src = reader->attributes().value("src").toString(); if (!src.isEmpty()) { - Song song = LoadSong(src.toString(), 0, dir); + Song song = LoadSong(src, 0, dir); if (song.is_valid()) { songs->append(song); } } - } else { + } + else { Utilities::ConsumeCurrentElement(reader); } break; } case QXmlStreamReader::EndElement: { - if (reader->name() == "seq") { + if (name == "seq") { return; } break; diff --git a/src/playlistparsers/xspfparser.cpp b/src/playlistparsers/xspfparser.cpp index de59592f5..435fb53b8 100644 --- a/src/playlistparsers/xspfparser.cpp +++ b/src/playlistparsers/xspfparser.cpp @@ -71,9 +71,9 @@ Song XSPFParser::ParseTrack(QXmlStreamReader *reader, const QDir &dir) const { while (!reader->atEnd()) { QXmlStreamReader::TokenType type = reader->readNext(); + QString name = reader->name().toString(); switch (type) { case QXmlStreamReader::StartElement: { - QStringRef name = reader->name(); if (name == "location") { location = reader->readElementText(); } @@ -111,7 +111,7 @@ Song XSPFParser::ParseTrack(QXmlStreamReader *reader, const QDir &dir) const { break; } case QXmlStreamReader::EndElement: { - if (reader->name() == "track") { + if (name == "track") { goto return_song; } }