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

Replace QStringLiteral with QLatin1String

Browse Source
This commit is contained in:
Jonas Kvinge
2024-06-12 02:13:27 +02:00
parent 597a8cd6c8
commit b89c200076
73 changed files with 1215 additions and 1215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/radios/radioparadiseservice.cpp
View File

@@ -80,35 +80,35 @@ void RadioParadiseService::GetChannelsReply(QNetworkReply *reply, const int task
return;
}
if (!object.contains(QStringLiteral("channels")) || !object[QStringLiteral("channels")].isArray()) {
if (!object.contains(QLatin1String("channels")) || !object[QLatin1String("channels")].isArray()) {
Error(QStringLiteral("Missing JSON channels array."), object);
app_->task_manager()->SetTaskFinished(task_id);
emit NewChannels();
return;
}
QJsonArray array_channels = object[QStringLiteral("channels")].toArray();
QJsonArray array_channels = object[QLatin1String("channels")].toArray();
RadioChannelList channels;
for (const QJsonValueRef value_channel : array_channels) {
if (!value_channel.isObject()) continue;
QJsonObject obj_channel = value_channel.toObject();
if (!obj_channel.contains(QStringLiteral("chan_name")) || !obj_channel.contains(QStringLiteral("streams"))) {
if (!obj_channel.contains(QLatin1String("chan_name")) || !obj_channel.contains(QLatin1String("streams"))) {
continue;
}
QString name = obj_channel[QStringLiteral("chan_name")].toString();
QJsonValue value_streams = obj_channel[QStringLiteral("streams")];
QString name = obj_channel[QLatin1String("chan_name")].toString();
QJsonValue value_streams = obj_channel[QLatin1String("streams")];
if (!value_streams.isArray()) {
continue;
}
QJsonArray array_streams = obj_channel[QStringLiteral("streams")].toArray();
QJsonArray array_streams = obj_channel[QLatin1String("streams")].toArray();
for (const QJsonValueRef value_stream : array_streams) {
if (!value_stream.isObject()) continue;
QJsonObject obj_stream = value_stream.toObject();
if (!obj_stream.contains(QStringLiteral("label")) || !obj_stream.contains(QStringLiteral("url"))) {
if (!obj_stream.contains(QLatin1String("label")) || !obj_stream.contains(QLatin1String("url"))) {
continue;
}
QString label = obj_stream[QStringLiteral("label")].toString();
QString url = obj_stream[QStringLiteral("url")].toString();
QString label = obj_stream[QLatin1String("label")].toString();
QString url = obj_stream[QLatin1String("url")].toString();
if (!url.contains(QRegularExpression(QStringLiteral("^[0-9a-zA-Z]*:\\/\\/"), QRegularExpression::CaseInsensitiveOption))) {
url.prepend(QStringLiteral("https://"));
}

22
src/radios/somafmservice.cpp
View File

@@ -86,39 +86,39 @@ void SomaFMService::GetChannelsReply(QNetworkReply *reply, const int task_id) {
return;
}
if (!object.contains(QStringLiteral("channels")) || !object[QStringLiteral("channels")].isArray()) {
if (!object.contains(QLatin1String("channels")) || !object[QLatin1String("channels")].isArray()) {
Error(QStringLiteral("Missing JSON channels array."), object);
app_->task_manager()->SetTaskFinished(task_id);
emit NewChannels();
return;
}
QJsonArray array_channels = object[QStringLiteral("channels")].toArray();
QJsonArray array_channels = object[QLatin1String("channels")].toArray();
RadioChannelList channels;
for (const QJsonValueRef value_channel : array_channels) {
if (!value_channel.isObject()) continue;
QJsonObject obj_channel = value_channel.toObject();
if (!obj_channel.contains(QStringLiteral("title")) || !obj_channel.contains(QStringLiteral("image"))) {
if (!obj_channel.contains(QLatin1String("title")) || !obj_channel.contains(QLatin1String("image"))) {
continue;
}
QString name = obj_channel[QStringLiteral("title")].toString();
QString image = obj_channel[QStringLiteral("image")].toString();
QJsonArray playlists = obj_channel[QStringLiteral("playlists")].toArray();
QString name = obj_channel[QLatin1String("title")].toString();
QString image = obj_channel[QLatin1String("image")].toString();
QJsonArray playlists = obj_channel[QLatin1String("playlists")].toArray();
for (const QJsonValueRef playlist : playlists) {
if (!playlist.isObject()) continue;
QJsonObject obj_playlist = playlist.toObject();
if (!obj_playlist.contains(QStringLiteral("url")) || !obj_playlist.contains(QStringLiteral("quality"))) {
if (!obj_playlist.contains(QLatin1String("url")) || !obj_playlist.contains(QLatin1String("quality"))) {
continue;
}
RadioChannel channel;
QString quality = obj_playlist[QStringLiteral("quality")].toString();
QString quality = obj_playlist[QLatin1String("quality")].toString();
if (quality != QStringLiteral("highest")) continue;
channel.source = source_;
channel.name = name;
channel.url.setUrl(obj_playlist[QStringLiteral("url")].toString());
channel.url.setUrl(obj_playlist[QLatin1String("url")].toString());
channel.thumbnail_url.setUrl(image);
if (obj_playlist.contains(QStringLiteral("format"))) {
channel.name.append(QLatin1Char(' ') + obj_playlist[QStringLiteral("format")].toString().toUpper());
if (obj_playlist.contains(QLatin1String("format"))) {
channel.name.append(QLatin1Char(' ') + obj_playlist[QLatin1String("format")].toString().toUpper());
}
channels << channel;
}