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

Replace QLatin1String with operator _L1

Browse Source
This commit is contained in:
Jonas Kvinge
2024-09-07 04:24:14 +02:00
parent e3e6a22172
commit 4270b12cd1
185 changed files with 2429 additions and 2139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/subsonic/subsonicbaserequest.cpp
View File

@@ -45,6 +45,8 @@
#include "settings/subsonicsettingspage.h"
using namespace Qt::StringLiterals;
SubsonicBaseRequest::SubsonicBaseRequest(SubsonicService *service, QObject *parent)
: QObject(parent),
service_(service),
@@ -81,11 +83,11 @@ QUrl SubsonicBaseRequest::CreateUrl(const QUrl &server_url, const SubsonicSettin
QUrl url(server_url);
if (!url.path().isEmpty() && url.path().right(1) == QLatin1Char('/')) {
url.setPath(url.path() + QLatin1String("rest/") + ressource_name + QLatin1String(".view"));
if (!url.path().isEmpty() && url.path().right(1) == u'/') {
url.setPath(url.path() + "rest/"_L1 + ressource_name + ".view"_L1);
}
else {
url.setPath(url.path() + QLatin1String("/rest/") + ressource_name + QLatin1String(".view"));
url.setPath(url.path() + "/rest/"_L1 + ressource_name + ".view"_L1);
}
url.setQuery(url_query);
@@ -99,7 +101,7 @@ QNetworkReply *SubsonicBaseRequest::CreateGetRequest(const QString &ressource_na
QUrl url = CreateUrl(server_url(), auth_method(), username(), password(), ressource_name, params_provided);
QNetworkRequest req(url);
if (url.scheme() == QLatin1String("https") && !verify_certificate()) {
if (url.scheme() == "https"_L1 && !verify_certificate()) {
QSslConfiguration sslconfig = QSslConfiguration::defaultConfiguration();
sslconfig.setPeerVerifyMode(QSslSocket::VerifyNone);
req.setSslConfiguration(sslconfig);
@@ -147,13 +149,13 @@ QByteArray SubsonicBaseRequest::GetReplyData(QNetworkReply *reply) {
QJsonDocument json_doc = QJsonDocument::fromJson(data, &parse_error);
if (parse_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) {
QJsonObject json_obj = json_doc.object();
if (!json_obj.isEmpty() && json_obj.contains(QLatin1String("error"))) {
QJsonValue json_error = json_obj[QLatin1String("error")];
if (!json_obj.isEmpty() && json_obj.contains("error"_L1)) {
QJsonValue json_error = json_obj["error"_L1];
if (json_error.isObject()) {
json_obj = json_error.toObject();
if (!json_obj.isEmpty() && json_obj.contains(QLatin1String("code")) && json_obj.contains(QLatin1String("message"))) {
int code = json_obj[QLatin1String("code")].toInt();
QString message = json_obj[QLatin1String("message")].toString();
if (!json_obj.isEmpty() && json_obj.contains("code"_L1) && json_obj.contains("message"_L1)) {
int code = json_obj["code"_L1].toInt();
QString message = json_obj["message"_L1].toString();
error = QStringLiteral("%1 (%2)").arg(message).arg(code);
}
}
@@ -201,12 +203,12 @@ QJsonObject SubsonicBaseRequest::ExtractJsonObj(QByteArray &data) {
return QJsonObject();
}
if (!json_obj.contains(QLatin1String("subsonic-response"))) {
if (!json_obj.contains("subsonic-response"_L1)) {
Error(QStringLiteral("Json reply is missing subsonic-response."), json_obj);
return QJsonObject();
}
QJsonValue json_response = json_obj[QLatin1String("subsonic-response")];
QJsonValue json_response = json_obj["subsonic-response"_L1];
if (!json_response.isObject()) {
Error(QStringLiteral("Json response is not an object."), json_response);
return QJsonObject();
@@ -221,7 +223,7 @@ QString SubsonicBaseRequest::ErrorsToHTML(const QStringList &errors) {
QString error_html;
for (const QString &error : errors) {
error_html += error + QLatin1String("<br />");
error_html += error + "<br />"_L1;
}
return error_html;