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 20:30:36 +02:00
parent 20595a11bc
commit 5451c110b1
64 changed files with 367 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/smartplaylists/smartplaylistsearch.cpp
View File

@@ -62,7 +62,7 @@ QString SmartPlaylistSearch::ToSql(const QString &songs_table) const {
}
if (!terms_.isEmpty() && search_type_ != SearchType::All) {
QString boolean_op = search_type_ == SearchType::And ? QStringLiteral(" AND ") : QStringLiteral(" OR ");
QString boolean_op = search_type_ == SearchType::And ? QLatin1String(" AND ") : QLatin1String(" OR ");
where_clauses << QStringLiteral("(") + term_where_clauses.join(boolean_op) + QStringLiteral(")");
}
@@ -80,7 +80,7 @@ QString SmartPlaylistSearch::ToSql(const QString &songs_table) const {
where_clauses << QStringLiteral("unavailable = 0");
if (!where_clauses.isEmpty()) {
sql += QStringLiteral(" WHERE ") + where_clauses.join(QLatin1String(" AND "));
sql += QLatin1String(" WHERE ") + where_clauses.join(QLatin1String(" AND "));
}
// Add sort by
@@ -88,7 +88,7 @@ QString SmartPlaylistSearch::ToSql(const QString &songs_table) const {
sql += QLatin1String(" ORDER BY random()");
}
else {
sql += QStringLiteral(" ORDER BY ") + SmartPlaylistSearchTerm::FieldColumnName(sort_field_) + (sort_type_ == SortType::FieldAsc ? QStringLiteral(" ASC") : QStringLiteral(" DESC"));
sql += QLatin1String(" ORDER BY ") + SmartPlaylistSearchTerm::FieldColumnName(sort_field_) + (sort_type_ == SortType::FieldAsc ? QLatin1String(" ASC") : QLatin1String(" DESC"));
}
// Add limit
@@ -96,7 +96,7 @@ QString SmartPlaylistSearch::ToSql(const QString &songs_table) const {
sql += QStringLiteral(" LIMIT %1 OFFSET %2").arg(limit_).arg(first_item_);
}
else if (limit_ != -1) {
sql += QStringLiteral(" LIMIT ") + QString::number(limit_);
sql += QLatin1String(" LIMIT ") + QString::number(limit_);
}
//qLog(Debug) << sql;

52
src/smartplaylists/smartplaylistsearchterm.cpp
View File

@@ -62,12 +62,12 @@ QString SmartPlaylistSearchTerm::ToSql() const {
if (TypeOf(field_) == Type::Date) {
if (special_date_query) {
// We have a numeric date, consider also the time for more precision
col = QStringLiteral("DATETIME(") + col + QStringLiteral(", 'unixepoch', 'localtime')");
col = QLatin1String("DATETIME(") + col + QLatin1String(", 'unixepoch', 'localtime')");
second_value = second_value_.toString();
second_value.replace(QLatin1Char('\''), QLatin1String("''"));
if (date == QStringLiteral("weeks")) {
if (date == QLatin1String("weeks")) {
// Sqlite doesn't know weeks, transform them to days
date = QStringLiteral("days");
date = QLatin1String("days");
value = QString::number(value_.toInt() * 7);
second_value = QString::number(second_value_.toInt() * 7);
}
@@ -76,13 +76,13 @@ QString SmartPlaylistSearchTerm::ToSql() const {
// We have the exact date
// The calendar widget specifies no time so ditch the possible time part
// from integers representing the dates.
col = QStringLiteral("DATE(") + col + QStringLiteral(", 'unixepoch', 'localtime')");
value = QStringLiteral("DATE(") + value + QStringLiteral(", 'unixepoch', 'localtime')");
col = QLatin1String("DATE(") + col + QLatin1String(", 'unixepoch', 'localtime')");
value = QLatin1String("DATE(") + value + QLatin1String(", 'unixepoch', 'localtime')");
}
}
else if (TypeOf(field_) == Type::Time) {
// Convert seconds to nanoseconds
value = QStringLiteral("CAST (") + value + QStringLiteral(" *1000000000 AS INTEGER)");
value = QLatin1String("CAST (") + value + QLatin1String(" *1000000000 AS INTEGER)");
}
// File paths need some extra processing since they are stored as encoded urls in the database.
@@ -95,61 +95,61 @@ QString SmartPlaylistSearchTerm::ToSql() const {
}
}
else if (TypeOf(field_) == Type::Rating) {
col = QStringLiteral("CAST ((replace(") + col + QStringLiteral(", -1, 0) + 0.05) * 10 AS INTEGER)");
value = QStringLiteral("CAST ((") + value + QStringLiteral(" + 0.05) * 10 AS INTEGER)");
col = QLatin1String("CAST ((replace(") + col + QLatin1String(", -1, 0) + 0.05) * 10 AS INTEGER)");
value = QLatin1String("CAST ((") + value + QLatin1String(" + 0.05) * 10 AS INTEGER)");
}
switch (operator_) {
case Operator::Contains:
return col + QStringLiteral(" LIKE '%") + value + QStringLiteral("%'");
return col + QLatin1String(" LIKE '%") + value + QLatin1String("%'");
case Operator::NotContains:
return col + QStringLiteral(" NOT LIKE '%") + value + QStringLiteral("%'");
return col + QLatin1String(" NOT LIKE '%") + value + QLatin1String("%'");
case Operator::StartsWith:
return col + QStringLiteral(" LIKE '") + value + QStringLiteral("%'");
return col + QLatin1String(" LIKE '") + value + QLatin1String("%'");
case Operator::EndsWith:
return col + QStringLiteral(" LIKE '%") + value + QLatin1Char('\'');
return col + QLatin1String(" LIKE '%") + value + QLatin1Char('\'');
case Operator::Equals:
if (TypeOf(field_) == Type::Text) {
return col + QStringLiteral(" LIKE '") + value + QLatin1Char('\'');
return col + QLatin1String(" LIKE '") + value + QLatin1Char('\'');
}
else if (TypeOf(field_) == Type::Date || TypeOf(field_) == Type::Time || TypeOf(field_) == Type::Rating) {
return col + QStringLiteral(" = ") + value;
return col + QLatin1String(" = ") + value;
}
else {
return col + QStringLiteral(" = '") + value + QLatin1Char('\'');
return col + QLatin1String(" = '") + value + QLatin1Char('\'');
}
case Operator::GreaterThan:
if (TypeOf(field_) == Type::Date || TypeOf(field_) == Type::Time || TypeOf(field_) == Type::Rating) {
return col + QStringLiteral(" > ") + value;
return col + QLatin1String(" > ") + value;
}
else {
return col + QStringLiteral(" > '") + value + QLatin1Char('\'');
return col + QLatin1String(" > '") + value + QLatin1Char('\'');
}
case Operator::LessThan:
if (TypeOf(field_) == Type::Date || TypeOf(field_) == Type::Time || TypeOf(field_) == Type::Rating) {
return col + QStringLiteral(" < ") + value;
return col + QLatin1String(" < ") + value;
}
else {
return col + QStringLiteral(" < '") + value + QLatin1Char('\'');
return col + QLatin1String(" < '") + value + QLatin1Char('\'');
}
case Operator::NumericDate:
return col + QStringLiteral(" > ") + QStringLiteral("DATETIME('now', '-") + value + QLatin1Char(' ') + date + QStringLiteral("', 'localtime')");
return col + QLatin1String(" > ") + QLatin1String("DATETIME('now', '-") + value + QLatin1Char(' ') + date + QLatin1String("', 'localtime')");
case Operator::NumericDateNot:
return col + QStringLiteral(" < ") + QStringLiteral("DATETIME('now', '-") + value + QLatin1Char(' ') + date + QStringLiteral("', 'localtime')");
return col + QLatin1String(" < ") + QLatin1String("DATETIME('now', '-") + value + QLatin1Char(' ') + date + QLatin1String("', 'localtime')");
case Operator::RelativeDate:
// Consider the time range before the first date but after the second one
return QStringLiteral("(") + col + QStringLiteral(" < ") + QStringLiteral("DATETIME('now', '-") + value + QLatin1Char(' ') + date + QStringLiteral("', 'localtime') AND ") + col + QStringLiteral(" > ") + QStringLiteral("DATETIME('now', '-") + second_value + QLatin1Char(' ') + date + QStringLiteral("', 'localtime'))");
return QLatin1String("(") + col + QLatin1String(" < ") + QLatin1String("DATETIME('now', '-") + value + QLatin1Char(' ') + date + QLatin1String("', 'localtime') AND ") + col + QLatin1String(" > ") + QLatin1String("DATETIME('now', '-") + second_value + QLatin1Char(' ') + date + QLatin1String("', 'localtime'))");
case Operator::NotEquals:
if (TypeOf(field_) == Type::Text) {
return col + QStringLiteral(" <> '") + value + QLatin1Char('\'');
return col + QLatin1String(" <> '") + value + QLatin1Char('\'');
}
else {
return col + QStringLiteral(" <> ") + value;
return col + QLatin1String(" <> ") + value;
}
case Operator::Empty:
return col + QStringLiteral(" = ''");
return col + QLatin1String(" = ''");
case Operator::NotEmpty:
return col + QStringLiteral(" <> ''");
return col + QLatin1String(" <> ''");
}
return QString();