dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace use of QStringRef

Browse Source
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
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()) { while (!reader.atEnd()) {
QXmlStreamReader::TokenType type = reader.readNext(); QXmlStreamReader::TokenType type = reader.readNext();
QStringRef name = reader.name(); QString name = reader.name().toString();
if (type == QXmlStreamReader::StartElement) { if (type == QXmlStreamReader::StartElement) {
if (name == "GetLyricResult") { if (name == "GetLyricResult") {
result = LyricsSearchResult(); result = LyricsSearchResult();

2
src/lyrics/lololyricsprovider.cpp
View File

@@ -115,7 +115,7 @@ void LoloLyricsProvider::HandleSearchReply(QNetworkReply *reply, const quint64 i
QString status; QString status;
while (!reader.atEnd()) { while (!reader.atEnd()) {
QXmlStreamReader::TokenType type = reader.readNext(); QXmlStreamReader::TokenType type = reader.readNext();
QStringRef name = reader.name(); QString name = reader.name().toString();
if (type == QXmlStreamReader::StartElement) { if (type == QXmlStreamReader::StartElement) {
if (name == "result") { if (name == "result") {
status.clear(); 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); QXmlStreamReader reader(data);
ResultList res; ResultList res;
while (!reader.atEnd()) { while (!reader.atEnd()) {
if (reader.readNext() == QXmlStreamReader::StartElement && reader.name() == "recording") { if (reader.readNext() == QXmlStreamReader::StartElement && reader.name().toString() == "recording") {
ResultList tracks = ParseTrack(&reader); ResultList tracks = ParseTrack(&reader);
for (const Result &track : tracks) { for (const Result &track : tracks) {
if (!track.title_.isEmpty()) { if (!track.title_.isEmpty()) {
@@ -274,7 +274,7 @@ void MusicBrainzClient::DiscIdRequestFinished(const QString &discid, QNetworkRep
while (!reader.atEnd()) { while (!reader.atEnd()) {
QXmlStreamReader::TokenType type = reader.readNext(); QXmlStreamReader::TokenType type = reader.readNext();
if (type == QXmlStreamReader::StartElement) { if (type == QXmlStreamReader::StartElement) {
QStringRef name = reader.name(); QString name = reader.name().toString();
if (name == "title") { if (name == "title") {
album = reader.readElementText(); album = reader.readElementText();
} }
@@ -296,7 +296,8 @@ void MusicBrainzClient::DiscIdRequestFinished(const QString &discid, QNetworkRep
while (!reader.atEnd()) { while (!reader.atEnd()) {
QXmlStreamReader::TokenType token = reader.readNext(); 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. // Get the medium with a matching discid.
if (MediumHasDiscid(discid, &reader)) { if (MediumHasDiscid(discid, &reader)) {
ResultList tracks = ParseMedium(&reader); ResultList tracks = ParseMedium(&reader);
@@ -310,7 +311,7 @@ void MusicBrainzClient::DiscIdRequestFinished(const QString &discid, QNetworkRep
Utilities::ConsumeCurrentElement(&reader); Utilities::ConsumeCurrentElement(&reader);
} }
} }
else if (token == QXmlStreamReader::EndElement && reader.name() == "medium-list") { else if (token == QXmlStreamReader::EndElement && name == "medium-list") {
break; break;
} }
} }
@@ -330,11 +331,12 @@ bool MusicBrainzClient::MediumHasDiscid(const QString &discid, QXmlStreamReader
while (!reader->atEnd()) { while (!reader->atEnd()) {
QXmlStreamReader::TokenType type = reader->readNext(); 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; return true;
} }
else if (type == QXmlStreamReader::EndElement && reader->name() == "disc-list") { else if (type == QXmlStreamReader::EndElement && name == "disc-list") {
return false; return false;
} }
} }
@@ -348,16 +350,17 @@ MusicBrainzClient::ResultList MusicBrainzClient::ParseMedium(QXmlStreamReader *r
ResultList ret; ResultList ret;
while (!reader->atEnd()) { while (!reader->atEnd()) {
QXmlStreamReader::TokenType type = reader->readNext(); QXmlStreamReader::TokenType type = reader->readNext();
QString name = reader->name().toString();
if (type == QXmlStreamReader::StartElement) { if (type == QXmlStreamReader::StartElement) {
if (reader->name() == "track") { if (name == "track") {
Result result; Result result;
result = ParseTrackFromDisc(reader); result = ParseTrackFromDisc(reader);
ret << result; ret << result;
} }
} }
if (type == QXmlStreamReader::EndElement && reader->name() == "track-list") { if (type == QXmlStreamReader::EndElement && name == "track-list") {
break; break;
} }
} }
@@ -372,9 +375,9 @@ MusicBrainzClient::Result MusicBrainzClient::ParseTrackFromDisc(QXmlStreamReader
while (!reader->atEnd()) { while (!reader->atEnd()) {
QXmlStreamReader::TokenType type = reader->readNext(); QXmlStreamReader::TokenType type = reader->readNext();
QString name = reader->name().toString();
if (type == QXmlStreamReader::StartElement) { if (type == QXmlStreamReader::StartElement) {
QStringRef name = reader->name();
if (name == "position") { if (name == "position") {
result.track_ = reader->readElementText().toInt(); 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; break;
} }
} }
@@ -401,9 +404,9 @@ MusicBrainzClient::ResultList MusicBrainzClient::ParseTrack(QXmlStreamReader *re
while (!reader->atEnd()) { while (!reader->atEnd()) {
QXmlStreamReader::TokenType type = reader->readNext(); QXmlStreamReader::TokenType type = reader->readNext();
QString name = reader->name().toString();
if (type == QXmlStreamReader::StartElement) { if (type == QXmlStreamReader::StartElement) {
QStringRef name = reader->name();
if (name == "title") { if (name == "title") {
result.title_ = reader->readElementText(); 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; break;
} }
} }
@@ -444,16 +447,16 @@ void MusicBrainzClient::ParseArtist(QXmlStreamReader *reader, QString *artist) {
while (!reader->atEnd()) { while (!reader->atEnd()) {
QXmlStreamReader::TokenType type = reader->readNext(); QXmlStreamReader::TokenType type = reader->readNext();
QString name = reader->name().toString();
if (type == QXmlStreamReader::StartElement && reader->name() == "name-credit") { if (type == QXmlStreamReader::StartElement && name == "name-credit") {
join_phrase = reader->attributes().value("joinphrase").toString(); 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; *artist += reader->readElementText() + join_phrase;
} }
if (type == QXmlStreamReader::EndElement && reader->name() == "artist-credit") { if (type == QXmlStreamReader::EndElement && name == "artist-credit") {
return; return;
} }
} }
@@ -465,9 +468,9 @@ MusicBrainzClient::Release MusicBrainzClient::ParseRelease(QXmlStreamReader *rea
while (!reader->atEnd()) { while (!reader->atEnd()) {
QXmlStreamReader::TokenType type = reader->readNext(); QXmlStreamReader::TokenType type = reader->readNext();
QString name = reader->name().toString();
if (type == QXmlStreamReader::StartElement) { if (type == QXmlStreamReader::StartElement) {
QStringRef name = reader->name();
if (name == "title") { if (name == "title") {
ret.album_ = reader->readElementText(); 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; 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()) { while (!reader->atEnd()) {
QXmlStreamReader::TokenType type = reader->readNext(); QXmlStreamReader::TokenType type = reader->readNext();
QString name = reader->name().toString();
switch (type) { switch (type) {
case QXmlStreamReader::StartElement: { case QXmlStreamReader::StartElement: {
QStringRef name = reader->name();
if (name == "media") { if (name == "media") {
QStringRef src = reader->attributes().value("src"); QString src = reader->attributes().value("src").toString();
if (!src.isEmpty()) { if (!src.isEmpty()) {
Song song = LoadSong(src.toString(), 0, dir); Song song = LoadSong(src, 0, dir);
if (song.is_valid()) { if (song.is_valid()) {
songs->append(song); songs->append(song);
} }
} }
} else { }
else {
Utilities::ConsumeCurrentElement(reader); Utilities::ConsumeCurrentElement(reader);
} }
break; break;
} }
case QXmlStreamReader::EndElement: { case QXmlStreamReader::EndElement: {
if (reader->name() == "seq") { if (name == "seq") {
return; return;
} }
break; break;

4
src/playlistparsers/xspfparser.cpp
View File

@@ -71,9 +71,9 @@ Song XSPFParser::ParseTrack(QXmlStreamReader *reader, const QDir &dir) const {
while (!reader->atEnd()) { while (!reader->atEnd()) {
QXmlStreamReader::TokenType type = reader->readNext(); QXmlStreamReader::TokenType type = reader->readNext();
QString name = reader->name().toString();
switch (type) { switch (type) {
case QXmlStreamReader::StartElement: { case QXmlStreamReader::StartElement: {
QStringRef name = reader->name();
if (name == "location") { if (name == "location") {
location = reader->readElementText(); location = reader->readElementText();
} }
@@ -111,7 +111,7 @@ Song XSPFParser::ParseTrack(QXmlStreamReader *reader, const QDir &dir) const {
break; break;
} }
case QXmlStreamReader::EndElement: { case QXmlStreamReader::EndElement: {
if (reader->name() == "track") { if (name == "track") {
goto return_song; goto return_song;
} }
} }