From 4895ae10c6783f039737f2aff9c2ae8006d303eb Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 27 May 2020 10:52:32 +0200 Subject: Port QtSql from QStringRef to QStringView Task-number: QTBUG-84319 Change-Id: Icc9b955dae1aa13b16c01e26192cb82f828903b1 Reviewed-by: Thiago Macieira --- src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp | 2 +- src/sql/kernel/qsqlrecord.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp index 27e7d02472..e900ccf5ec 100644 --- a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp +++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp @@ -720,7 +720,7 @@ bool QSQLiteDriver::open(const QString & db, const QString &, const QString &, c int regexpCacheSize = 25; #endif - const auto opts = conOpts.splitRef(QLatin1Char(';')); + const auto opts = QStringView{conOpts}.split(QLatin1Char(';')); for (auto option : opts) { option = option.trimmed(); if (option.startsWith(QLatin1String("QSQLITE_BUSY_TIMEOUT"))) { diff --git a/src/sql/kernel/qsqlrecord.cpp b/src/sql/kernel/qsqlrecord.cpp index c4dc5d1adb..1c3e03fecf 100644 --- a/src/sql/kernel/qsqlrecord.cpp +++ b/src/sql/kernel/qsqlrecord.cpp @@ -232,12 +232,12 @@ QString QSqlRecord::fieldName(int index) const int QSqlRecord::indexOf(const QString& name) const { - QStringRef tableName; - QStringRef fieldName(&name); + QStringView tableName; + QStringView fieldName(name); const int idx = name.indexOf(QLatin1Char('.')); if (idx != -1) { - tableName = name.leftRef(idx); - fieldName = name.midRef(idx + 1); + tableName = fieldName.left(idx); + fieldName = fieldName.mid(idx + 1); } const int cnt = count(); for (int i = 0; i < cnt; ++i) { -- cgit v1.2.3