summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2022-04-14 13:43:37 +0200
committerSona Kurazyan <sona.kurazyan@qt.io>2022-04-19 19:40:04 +0200
commitfbbad06751c93002754d4de26a73d43f139b82a0 (patch)
tree46d2d65746d7604bf700b61b6bf1b429eac87bc4 /src/plugins
parent128785d0fa0dc05dbe5ef2d5c8c3ba09b7c48546 (diff)
Sql: replace remaining uses of QLatin1String with QLatin1StringView
Task-number: QTBUG-98434 Change-Id: Ia621f9d937649dda41a7b0d13a61e6f1397f6dde Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/sqldrivers/ibase/qsql_ibase.cpp4
-rw-r--r--src/plugins/sqldrivers/mysql/qsql_mysql.cpp4
-rw-r--r--src/plugins/sqldrivers/oci/qsql_oci.cpp4
-rw-r--r--src/plugins/sqldrivers/psql/qsql_psql.cpp4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
index fda95c283b..cb7a604060 100644
--- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
+++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
@@ -802,7 +802,7 @@ bool QIBaseResultPrivate::writeArray(int column, const QList<QVariant> &list)
if (list.size() > arraySize) {
error = "Array size mismatch: size of %1 is %2, size of provided list is %3"_L1;
- error = error.arg(QLatin1String(sqlname)).arg(arraySize).arg(list.size());
+ error = error.arg(QLatin1StringView(sqlname)).arg(arraySize).arg(list.size());
q->setLastError(QSqlError(error, ""_L1, QSqlError::StatementError));
return false;
}
@@ -810,7 +810,7 @@ bool QIBaseResultPrivate::writeArray(int column, const QList<QVariant> &list)
if (!createArrayBuffer(ba.data(), list,
qIBaseTypeName(desc.array_desc_dtype, inda->sqlvar[column].sqlscale < 0),
0, &desc, error)) {
- q->setLastError(QSqlError(error.arg(QLatin1String(sqlname)), ""_L1,
+ q->setLastError(QSqlError(error.arg(QLatin1StringView(sqlname)), ""_L1,
QSqlError::StatementError));
return false;
}
diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
index b8dd32790f..efca8806da 100644
--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
@@ -1376,14 +1376,14 @@ QStringList QMYSQLDriver::tables(QSql::TableType type) const
QStringList tl;
QSqlQuery q(createResult());
if (type & QSql::Tables) {
- QString sql = "select table_name from information_schema.tables where table_schema = '"_L1 + QLatin1String(d->mysql->db) + "' and table_type = 'BASE TABLE'"_L1;
+ QString sql = "select table_name from information_schema.tables where table_schema = '"_L1 + QLatin1StringView(d->mysql->db) + "' and table_type = 'BASE TABLE'"_L1;
q.exec(sql);
while (q.next())
tl.append(q.value(0).toString());
}
if (type & QSql::Views) {
- QString sql = "select table_name from information_schema.tables where table_schema = '"_L1 + QLatin1String(d->mysql->db) + "' and table_type = 'VIEW'"_L1;
+ QString sql = "select table_name from information_schema.tables where table_schema = '"_L1 + QLatin1StringView(d->mysql->db) + "' and table_type = 'VIEW'"_L1;
q.exec(sql);
while (q.next())
diff --git a/src/plugins/sqldrivers/oci/qsql_oci.cpp b/src/plugins/sqldrivers/oci/qsql_oci.cpp
index 8638a070cc..6028eef882 100644
--- a/src/plugins/sqldrivers/oci/qsql_oci.cpp
+++ b/src/plugins/sqldrivers/oci/qsql_oci.cpp
@@ -2470,14 +2470,14 @@ static QString make_where_clause(const QString &user, Expression e)
static const char joinC[][4] = { "or" , "and" };
static constexpr QLatin1Char bang[] = { u' ', u'!' };
- const QLatin1String join(joinC[e]);
+ const QLatin1StringView join(joinC[e]);
QString result;
result.reserve(sizeof sysUsers / sizeof *sysUsers *
// max-sizeof(owner != <sysuser> and )
(9 + sizeof *sysUsers + 5));
for (const auto &sysUser : sysUsers) {
- const QLatin1String l1(sysUser);
+ const QLatin1StringView l1(sysUser);
if (l1 != user)
result += "owner "_L1 + bang[e] + "= '"_L1 + l1 + "' "_L1 + join + u' ';
}
diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp
index 722a75ee56..1c63cb7f32 100644
--- a/src/plugins/sqldrivers/psql/qsql_psql.cpp
+++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp
@@ -1521,7 +1521,7 @@ QString QPSQLDriver::formatValue(const QSqlField &field, bool trimStrings) const
unsigned char *data = PQescapeBytea((const unsigned char*)ba.constData(), ba.size(), &len);
#endif
r += u'\'';
- r += QLatin1String((const char*)data);
+ r += QLatin1StringView((const char*)data);
r += u'\'';
qPQfreemem(data);
break;
@@ -1658,7 +1658,7 @@ void QPSQLDriver::_q_handleNotification()
PGnotify *notify = nullptr;
while ((notify = PQnotifies(d->connection)) != nullptr) {
- QString name(QLatin1String(notify->relname));
+ QString name(QLatin1StringView(notify->relname));
if (d->seid.contains(name)) {
QString payload;
#if defined PG_VERSION_NUM && PG_VERSION_NUM-0 >= 70400