diff options
Diffstat (limited to 'src/sql/kernel')
-rw-r--r-- | src/sql/kernel/qsqldatabase.h | 8 | ||||
-rw-r--r-- | src/sql/kernel/qsqlnulldriver_p.h | 4 | ||||
-rw-r--r-- | src/sql/kernel/qsqlquery.cpp | 10 |
3 files changed, 12 insertions, 10 deletions
diff --git a/src/sql/kernel/qsqldatabase.h b/src/sql/kernel/qsqldatabase.h index f233c72c19..75f4aba20e 100644 --- a/src/sql/kernel/qsqldatabase.h +++ b/src/sql/kernel/qsqldatabase.h @@ -114,15 +114,15 @@ public: static const char *defaultConnection; static QSqlDatabase addDatabase(const QString& type, - const QString& connectionName = QLatin1String(defaultConnection)); + const QString& connectionName = QLatin1StringView(defaultConnection)); static QSqlDatabase addDatabase(QSqlDriver* driver, - const QString& connectionName = QLatin1String(defaultConnection)); + const QString& connectionName = QLatin1StringView(defaultConnection)); static QSqlDatabase cloneDatabase(const QSqlDatabase &other, const QString& connectionName); static QSqlDatabase cloneDatabase(const QString &other, const QString& connectionName); - static QSqlDatabase database(const QString& connectionName = QLatin1String(defaultConnection), + static QSqlDatabase database(const QString& connectionName = QLatin1StringView(defaultConnection), bool open = true); static void removeDatabase(const QString& connectionName); - static bool contains(const QString& connectionName = QLatin1String(defaultConnection)); + static bool contains(const QString& connectionName = QLatin1StringView(defaultConnection)); static QStringList drivers(); static QStringList connectionNames(); static void registerSqlDriver(const QString &name, QSqlDriverCreatorBase *creator); diff --git a/src/sql/kernel/qsqlnulldriver_p.h b/src/sql/kernel/qsqlnulldriver_p.h index 7a40199d71..2d954cffcf 100644 --- a/src/sql/kernel/qsqlnulldriver_p.h +++ b/src/sql/kernel/qsqlnulldriver_p.h @@ -64,7 +64,7 @@ class QSqlNullResult : public QSqlResult public: inline explicit QSqlNullResult(const QSqlDriver* d): QSqlResult(d) { QSqlResult::setLastError( - QSqlError(QLatin1String("Driver not loaded"), QLatin1String("Driver not loaded"), QSqlError::ConnectionError)); } + QSqlError(QLatin1StringView("Driver not loaded"), QLatin1StringView("Driver not loaded"), QSqlError::ConnectionError)); } protected: inline QVariant data(int) override { return QVariant(); } inline bool reset (const QString&) override { return false; } @@ -94,7 +94,7 @@ class QSqlNullDriver : public QSqlDriver public: inline QSqlNullDriver(): QSqlDriver() { QSqlDriver::setLastError( - QSqlError(QLatin1String("Driver not loaded"), QLatin1String("Driver not loaded"), QSqlError::ConnectionError)); } + QSqlError(QLatin1StringView("Driver not loaded"), QLatin1StringView("Driver not loaded"), QSqlError::ConnectionError)); } inline bool hasFeature(DriverFeature) const override { return false; } inline bool open(const QString &, const QString &, const QString &, const QString &, int, const QString&) override { return false; } diff --git a/src/sql/kernel/qsqlquery.cpp b/src/sql/kernel/qsqlquery.cpp index afa4882b1b..f7932a6378 100644 --- a/src/sql/kernel/qsqlquery.cpp +++ b/src/sql/kernel/qsqlquery.cpp @@ -304,11 +304,13 @@ QSqlQuery& QSqlQuery::operator=(const QSqlQuery& other) static void qInit(QSqlQuery *q, const QString& query, const QSqlDatabase &db) { QSqlDatabase database = db; - if (!database.isValid()) - database = QSqlDatabase::database(QLatin1String(QSqlDatabase::defaultConnection), false); - if (database.isValid()) { - *q = QSqlQuery(database.driver()->createResult()); + if (!database.isValid()) { + database = + QSqlDatabase::database(QLatin1StringView(QSqlDatabase::defaultConnection), false); } + if (database.isValid()) + *q = QSqlQuery(database.driver()->createResult()); + if (!query.isEmpty()) q->exec(query); } |