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

8
src/radios/radiomodel.cpp
View File

@@ -39,6 +39,8 @@
#include "radiomimedata.h"
#include "radiochannel.h"
using namespace Qt::StringLiterals;
namespace {
constexpr int kTreeIconSize = 22;
}
@@ -179,7 +181,7 @@ void RadioModel::AddChannels(const RadioChannelList &channels) {
RadioItem *item = new RadioItem(RadioItem::Type::Channel, container);
item->source = channel.source;
item->display_text = channel.name;
item->sort_text = SortText(Song::TextForSource(channel.source) + QLatin1String(" - ") + channel.name);
item->sort_text = SortText(Song::TextForSource(channel.source) + " - "_L1 + channel.name);
item->channel = channel;
items_ << item;
endInsertRows();
@@ -251,7 +253,7 @@ QString RadioModel::ChannelIconPixmapCacheKey(const QModelIndex &idx) const {
idx_copy = idx_copy.parent();
}
return path.join(QLatin1Char('/'));
return path.join(u'/');
}
@@ -323,7 +325,7 @@ void RadioModel::AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderResult
QString RadioModel::SortText(QString text) {
if (text.isEmpty()) {
text = QLatin1String(" unknown");
text = " unknown"_L1;
}
else {
text = text.toLower();

24
src/radios/radioparadiseservice.cpp
View File

@@ -32,6 +32,8 @@
#include "radioparadiseservice.h"
#include "radiochannel.h"
using namespace Qt::StringLiterals;
namespace {
constexpr char kApiChannelsUrl[] = "https://api.radioparadise.com/api/list_streams";
}
@@ -80,42 +82,42 @@ void RadioParadiseService::GetChannelsReply(QNetworkReply *reply, const int task
return;
}
if (!object.contains(QLatin1String("channels")) || !object[QLatin1String("channels")].isArray()) {
if (!object.contains("channels"_L1) || !object["channels"_L1].isArray()) {
Error(QStringLiteral("Missing JSON channels array."), object);
app_->task_manager()->SetTaskFinished(task_id);
Q_EMIT NewChannels();
return;
}
const QJsonArray array_channels = object[QLatin1String("channels")].toArray();
const QJsonArray array_channels = object["channels"_L1].toArray();
RadioChannelList channels;
for (const QJsonValue &value_channel : array_channels) {
if (!value_channel.isObject()) continue;
QJsonObject obj_channel = value_channel.toObject();
if (!obj_channel.contains(QLatin1String("chan_name")) || !obj_channel.contains(QLatin1String("streams"))) {
if (!obj_channel.contains("chan_name"_L1) || !obj_channel.contains("streams"_L1)) {
continue;
}
QString name = obj_channel[QLatin1String("chan_name")].toString();
QJsonValue value_streams = obj_channel[QLatin1String("streams")];
QString name = obj_channel["chan_name"_L1].toString();
QJsonValue value_streams = obj_channel["streams"_L1];
if (!value_streams.isArray()) {
continue;
}
const QJsonArray array_streams = obj_channel[QLatin1String("streams")].toArray();
const QJsonArray array_streams = obj_channel["streams"_L1].toArray();
for (const QJsonValue &value_stream : array_streams) {
if (!value_stream.isObject()) continue;
QJsonObject obj_stream = value_stream.toObject();
if (!obj_stream.contains(QLatin1String("label")) || !obj_stream.contains(QLatin1String("url"))) {
if (!obj_stream.contains("label"_L1) || !obj_stream.contains("url"_L1)) {
continue;
}
QString label = obj_stream[QLatin1String("label")].toString();
QString url = obj_stream[QLatin1String("url")].toString();
QString label = obj_stream["label"_L1].toString();
QString url = obj_stream["url"_L1].toString();
static const QRegularExpression regex_url_schema(QStringLiteral("^[0-9a-zA-Z]*:\\/\\/"), QRegularExpression::CaseInsensitiveOption);
if (!url.contains(regex_url_schema)) {
url.prepend(QLatin1String("https://"));
url.prepend("https://"_L1);
}
RadioChannel channel;
channel.source = source_;
channel.name = name + QLatin1String(" - ") + label;
channel.name = name + " - "_L1 + label;
channel.url.setUrl(url);
channels << channel;
}

24
src/radios/somafmservice.cpp
View File

@@ -36,6 +36,8 @@
#include "somafmservice.h"
#include "radiochannel.h"
using namespace Qt::StringLiterals;
namespace {
constexpr char kApiChannelsUrl[] = "https://somafm.com/channels.json";
}
@@ -88,38 +90,38 @@ void SomaFMService::GetChannelsReply(QNetworkReply *reply, const int task_id) {
return;
}
if (!object.contains(QLatin1String("channels")) || !object[QLatin1String("channels")].isArray()) {
if (!object.contains("channels"_L1) || !object["channels"_L1].isArray()) {
Error(QStringLiteral("Missing JSON channels array."), object);
app_->task_manager()->SetTaskFinished(task_id);
Q_EMIT NewChannels();
return;
}
const QJsonArray array_channels = object[QLatin1String("channels")].toArray();
const QJsonArray array_channels = object["channels"_L1].toArray();
RadioChannelList channels;
for (const QJsonValue &value_channel : array_channels) {
if (!value_channel.isObject()) continue;
QJsonObject obj_channel = value_channel.toObject();
if (!obj_channel.contains(QLatin1String("title")) || !obj_channel.contains(QLatin1String("image"))) {
if (!obj_channel.contains("title"_L1) || !obj_channel.contains("image"_L1)) {
continue;
}
QString name = obj_channel[QLatin1String("title")].toString();
QString image = obj_channel[QLatin1String("image")].toString();
const QJsonArray playlists = obj_channel[QLatin1String("playlists")].toArray();
QString name = obj_channel["title"_L1].toString();
QString image = obj_channel["image"_L1].toString();
const QJsonArray playlists = obj_channel["playlists"_L1].toArray();
for (const QJsonValue &playlist : playlists) {
if (!playlist.isObject()) continue;
QJsonObject obj_playlist = playlist.toObject();
if (!obj_playlist.contains(QLatin1String("url")) || !obj_playlist.contains(QLatin1String("quality"))) {
if (!obj_playlist.contains("url"_L1) || !obj_playlist.contains("quality"_L1)) {
continue;
}
RadioChannel channel;
QString quality = obj_playlist[QLatin1String("quality")].toString();
if (quality != QLatin1String("highest")) continue;
QString quality = obj_playlist["quality"_L1].toString();
if (quality != "highest"_L1) continue;
channel.source = source_;
channel.name = name;
channel.url.setUrl(obj_playlist[QLatin1String("url")].toString());
channel.url.setUrl(obj_playlist["url"_L1].toString());
channel.thumbnail_url.setUrl(image);
if (obj_playlist.contains(QLatin1String("format"))) {
if (obj_playlist.contains("format"_L1)) {
channel.name.append(QLatin1Char(' ') + obj_playlist[QLatin1String("format")].toString().toUpper());
}
channels << channel;