Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace use of QStringRef

This commit is contained in:
Jonas Kvinge 2020-08-21 22:39:01 +02:00
parent f645099a39
commit 1291dadbd6
5 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lyrics/chartlyricsprovider.cpp
View File

@ -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();

2
src/lyrics/lololyricsprovider.cpp
View File

@ -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();

39
src/musicbrainz/musicbrainzclient.cpp
View File

@ -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;
}
}

11
src/playlistparsers/wplparser.cpp
View File

@ -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;

4
src/playlistparsers/xspfparser.cpp
View File

@ -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;
}
}