diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-05-18 20:00:23 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-03 19:35:25 +0200 |
| commit | cb8424b381e75ce0024ae48b7f844a19ac8da388 (patch) | |
| tree | c1df77a7d7c1f2af8f7a91144f488dcd5f3f3f1c | |
| parent | 1b4ab3764b989958109913ba59b0bc9a95aed6f2 (diff) | |
Use QStringList::join(QChar) overload where applicable [QtSql]
This is an automated change performing the following replacements:
join\("(.)"\) -> join('\1')
join\(QLatin1String\("(.)"\)\) -> join(QLatin1Char('\1'))
join\(QStringLiteral\("(.)"\)\) -> join(QLatin1Char('\1'))
Change-Id: Ie395d82d17710683968d006d22de313ef49dc6e5
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 2 | ||||
| -rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index f874374a61..c902f1c89d 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -2260,7 +2260,7 @@ QStringList QODBCDriver::tables(QSql::TableType type) const if (tableType.isEmpty()) return tl; - QString joinedTableTypeString = tableType.join(QLatin1String(",")); + QString joinedTableTypeString = tableType.join(QLatin1Char(',')); r = SQLTables(hStmt, NULL, diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index f0fa5c735e..e382eef7f1 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -784,7 +784,7 @@ void QSqlDatabasePrivate::init(const QString &type) if (!driver) { qWarning("QSqlDatabase: %s driver not loaded", type.toLatin1().data()); qWarning("QSqlDatabase: available drivers: %s", - QSqlDatabase::drivers().join(QLatin1String(" ")).toLatin1().data()); + QSqlDatabase::drivers().join(QLatin1Char(' ')).toLatin1().data()); if (QCoreApplication::instance() == 0) qWarning("QSqlDatabase: an instance of QCoreApplication is required for loading driver plugins"); driver = shared_null()->driver; diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp index fb2db21743..ce7b4e6f48 100644 --- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp +++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp @@ -431,7 +431,7 @@ void tst_QSqlDatabase::generic_data(const QString& engine) void tst_QSqlDatabase::addDatabase() { QTest::ignoreMessage(QtWarningMsg, "QSqlDatabase: BLAH_FOO_NONEXISTENT_DRIVER driver not loaded"); - QTest::ignoreMessage(QtWarningMsg, qPrintable("QSqlDatabase: available drivers: " + QSqlDatabase::drivers().join(QLatin1String(" ")))); + QTest::ignoreMessage(QtWarningMsg, qPrintable("QSqlDatabase: available drivers: " + QSqlDatabase::drivers().join(QLatin1Char(' ')))); { QSqlDatabase db = QSqlDatabase::addDatabase("BLAH_FOO_NONEXISTENT_DRIVER", "INVALID_CONNECTION"); |