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

Port to QStringLiteral operator

Browse Source
This commit is contained in:
Jonas Kvinge
2024-10-20 06:38:55 +02:00
parent 722035913e
commit ef9ef63f02
202 changed files with 2036 additions and 1889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/playlistparsers/asxparser.cpp
View File

@@ -50,13 +50,13 @@ SongList ASXParser::Load(QIODevice *device, const QString &playlist_path, const
QByteArray data = device->readAll();
// Some playlists have unescaped & characters in URLs :(
static const QRegularExpression ex(QStringLiteral("(href\\s*=\\s*\")([^\"]+)\""), QRegularExpression::CaseInsensitiveOption);
static const QRegularExpression ex(u"(href\\s*=\\s*\")([^\"]+)\""_s, QRegularExpression::CaseInsensitiveOption);
qint64 index = 0;
for (QRegularExpressionMatch re_match = ex.match(QString::fromUtf8(data), index); re_match.hasMatch(); re_match = ex.match(QString::fromUtf8(data), index)) {
index = re_match.capturedStart();
QString url = re_match.captured(2);
static const QRegularExpression regex_html_enities(QStringLiteral("&(?!amp;|quot;|apos;|lt;|gt;)"));
url.replace(regex_html_enities, QStringLiteral("&"));
static const QRegularExpression regex_html_enities(u"&(?!amp;|quot;|apos;|lt;|gt;)"_s);
url.replace(regex_html_enities, u"&"_s);
QByteArray replacement = QStringLiteral("%1%2\"").arg(re_match.captured(1), url).toLocal8Bit();
data.replace(re_match.captured(0).toLocal8Bit(), replacement);
@@ -67,13 +67,13 @@ SongList ASXParser::Load(QIODevice *device, const QString &playlist_path, const
if (!buffer.open(QIODevice::ReadOnly)) return SongList();
QXmlStreamReader reader(&buffer);
if (!Utilities::ParseUntilElementCI(&reader, QStringLiteral("asx"))) {
if (!Utilities::ParseUntilElementCI(&reader, u"asx"_s)) {
buffer.close();
return SongList();
}
SongList ret;
while (!reader.atEnd() && Utilities::ParseUntilElementCI(&reader, QStringLiteral("entry"))) {
while (!reader.atEnd() && Utilities::ParseUntilElementCI(&reader, u"entry"_s)) {
Song song = ParseTrack(&reader, dir, collection_lookup);
if (song.is_valid()) {
ret << song;
@@ -143,13 +143,13 @@ void ASXParser::Save(const SongList &songs, QIODevice *device, const QDir &dir,
writer.setAutoFormattingIndent(2);
writer.writeStartDocument();
{
StreamElement asx(QStringLiteral("asx"), &writer);
StreamElement asx(u"asx"_s, &writer);
writer.writeAttribute("version"_L1, "3.0"_L1);
for (const Song &song : songs) {
StreamElement entry(QStringLiteral("entry"), &writer);
StreamElement entry(u"entry"_s, &writer);
writer.writeTextElement("title"_L1, song.title());
{
StreamElement ref(QStringLiteral("ref"), &writer);
StreamElement ref(u"ref"_s, &writer);
writer.writeAttribute("href"_L1, song.url().toString());
}
if (!song.artist().isEmpty()) {