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

Use QStringLiteral

Browse Source
This commit is contained in:
Jonas Kvinge
2024-04-09 23:20:26 +02:00
parent 3cfffa5fbb
commit 58944993b8
233 changed files with 3885 additions and 3885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/musicbrainz/acoustidclient.cpp
View File

@@ -129,10 +129,10 @@ void AcoustidClient::RequestFinished(QNetworkReply *reply, const int request_id)
if (reply->error() != QNetworkReply::NoError || reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) {
if (reply->error() != QNetworkReply::NoError) {
qLog(Error) << QString("Acoustid: %1 (%2)").arg(reply->errorString()).arg(reply->error());
qLog(Error) << QStringLiteral("Acoustid: %1 (%2)").arg(reply->errorString()).arg(reply->error());
}
else {
qLog(Error) << QString("Acoustid: Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt());
qLog(Error) << QStringLiteral("Acoustid: Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt());
}
emit Finished(request_id, QStringList());
return;
@@ -148,7 +148,7 @@ void AcoustidClient::RequestFinished(QNetworkReply *reply, const int request_id)
QJsonObject json_object = json_document.object();
QString status = json_object["status"].toString();
QString status = json_object[QStringLiteral("status")].toString();
if (status != "ok") {
emit Finished(request_id, QStringList(), status);
return;
@@ -159,19 +159,19 @@ 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["results"].toArray();
QJsonArray json_results = json_object[QStringLiteral("results")].toArray();
// List of <id, nb of sources> pairs
QList<IdSource> id_source_list;
for (const QJsonValueRef v : json_results) {
QJsonObject r = v.toObject();
if (!r["recordings"].isUndefined()) {
QJsonArray json_recordings = r["recordings"].toArray();
if (!r[QStringLiteral("recordings")].isUndefined()) {
QJsonArray json_recordings = r[QStringLiteral("recordings")].toArray();
for (const QJsonValueRef recording : json_recordings) {
QJsonObject o = recording.toObject();
if (!o["id"].isUndefined()) {
id_source_list << IdSource(o["id"].toString(), o["sources"].toInt());
if (!o[QStringLiteral("id")].isUndefined()) {
id_source_list << IdSource(o[QStringLiteral("id")].toString(), o[QStringLiteral("sources")].toInt());
}
}
}

10
src/musicbrainz/musicbrainzclient.cpp
View File

@@ -84,7 +84,7 @@ QByteArray MusicBrainzClient::GetReplyData(QNetworkReply *reply, QString &error)
else {
if (reply->error() != QNetworkReply::NoError && reply->error() < 200) {
// This is a network error, there is nothing more to do.
Error(QString("%1 (%2)").arg(reply->errorString()).arg(reply->error()));
Error(QStringLiteral("%1 (%2)").arg(reply->errorString()).arg(reply->error()));
}
else {
// See if there is Json data containing "error" - then use that instead.
@@ -93,16 +93,16 @@ QByteArray MusicBrainzClient::GetReplyData(QNetworkReply *reply, QString &error)
QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error);
if (json_error.error == QJsonParseError::NoError && json_doc.isObject()) {
QJsonObject json_obj = json_doc.object();
if (!json_obj.isEmpty() && json_obj.contains("error")) {
error = json_obj["error"].toString();
if (!json_obj.isEmpty() && json_obj.contains(QStringLiteral("error"))) {
error = json_obj[QStringLiteral("error")].toString();
}
}
if (error.isEmpty()) {
if (reply->error() != QNetworkReply::NoError) {
error = QString("%1 (%2)").arg(reply->errorString()).arg(reply->error());
error = QStringLiteral("%1 (%2)").arg(reply->errorString()).arg(reply->error());
}
else {
error = QString("Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt());
error = QStringLiteral("Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt());
}
Error(error, data);
}

8
src/musicbrainz/musicbrainzclient.h
View File

@@ -152,16 +152,16 @@ class MusicBrainzClient : public QObject {
}
void SetStatusFromString(const QString &s) {
if (s.compare("Official", Qt::CaseInsensitive) == 0) {
if (s.compare(QLatin1String("Official"), Qt::CaseInsensitive) == 0) {
status_ = Status::Official;
}
else if (s.compare("Promotion", Qt::CaseInsensitive) == 0) {
else if (s.compare(QLatin1String("Promotion"), Qt::CaseInsensitive) == 0) {
status_ = Status::Promotional;
}
else if (s.compare("Bootleg", Qt::CaseInsensitive) == 0) {
else if (s.compare(QLatin1String("Bootleg"), Qt::CaseInsensitive) == 0) {
status_ = Status::Bootleg;
}
else if (s.compare("Pseudo-release", Qt::CaseInsensitive) == 0) {
else if (s.compare(QLatin1String("Pseudo-release"), Qt::CaseInsensitive) == 0) {
status_ = Status::PseudoRelease;
}
else {