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

16
src/collection/collectionquery.cpp
View File

@@ -38,6 +38,8 @@
#include "collectionquery.h"
#include "collectionfilteroptions.h"
using namespace Qt::StringLiterals;
CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_table, const CollectionFilterOptions &filter_options)
: SqlQuery(db),
songs_table_(songs_table),
@@ -63,7 +65,7 @@ CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_ta
void CollectionQuery::AddWhere(const QString &column, const QVariant &value, const QString &op) {
// Ignore 'literal' for IN
if (op.compare(QLatin1String("IN"), Qt::CaseInsensitive) == 0) {
if (op.compare("IN"_L1, Qt::CaseInsensitive) == 0) {
const QStringList values = value.toStringList();
QStringList final_values;
final_values.reserve(values.count());
@@ -72,7 +74,7 @@ void CollectionQuery::AddWhere(const QString &column, const QVariant &value, con
bound_values_ << single_value;
}
where_clauses_ << QStringLiteral("%1 IN (%2)").arg(column, final_values.join(QLatin1Char(',')));
where_clauses_ << QStringLiteral("%1 IN (%2)").arg(column, final_values.join(u','));
}
else {
// Do integers inline - sqlite seems to get confused when you pass integers to bound parameters
@@ -81,7 +83,7 @@ void CollectionQuery::AddWhere(const QString &column, const QVariant &value, con
}
else if (value.metaType().id() == QMetaType::QString && value.toString().isNull()) {
where_clauses_ << QStringLiteral("%1 %2 ?").arg(column, op);
bound_values_ << QLatin1String("");
bound_values_ << ""_L1;
}
else {
where_clauses_ << QStringLiteral("%1 %2 ?").arg(column, op);
@@ -115,13 +117,13 @@ bool CollectionQuery::Exec() {
where_clauses << QStringLiteral("unavailable = 0");
}
if (!where_clauses.isEmpty()) sql += QLatin1String(" WHERE ") + where_clauses.join(QLatin1String(" AND "));
if (!where_clauses.isEmpty()) sql += " WHERE "_L1 + where_clauses.join(" AND "_L1);
if (!order_by_.isEmpty()) sql += QLatin1String(" ORDER BY ") + order_by_;
if (!order_by_.isEmpty()) sql += " ORDER BY "_L1 + order_by_;
if (limit_ != -1) sql += QLatin1String(" LIMIT ") + QString::number(limit_);
if (limit_ != -1) sql += " LIMIT "_L1 + QString::number(limit_);
sql.replace(QLatin1String("%songs_table"), songs_table_);
sql.replace("%songs_table"_L1, songs_table_);
if (!QSqlQuery::prepare(sql)) return false;