1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QStringList::join(QChar) overload where applicable [QtSql]

Browse Source 
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>
This commit is contained in:
Marc Mutz 2012-05-18 20:00:23 +02:00 committed by Qt by Nokia
parent 1b4ab3764b
commit cb8424b381
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/drivers/odbc/qsql_odbc.cpp
View File

@ -2260,7 +2260,7 @@ QStringList QODBCDriver::tables(QSql::TableType type) const
if (tableType.isEmpty()) if (tableType.isEmpty())
return tl; return tl;
QString joinedTableTypeString = tableType.join(QLatin1String(",")); QString joinedTableTypeString = tableType.join(QLatin1Char(','));
r = SQLTables(hStmt, r = SQLTables(hStmt,
NULL, NULL,

2
src/sql/kernel/qsqldatabase.cpp
View File

@ -784,7 +784,7 @@ void QSqlDatabasePrivate::init(const QString &type)
if (!driver) { if (!driver) {
qWarning("QSqlDatabase: %s driver not loaded", type.toLatin1().data()); qWarning("QSqlDatabase: %s driver not loaded", type.toLatin1().data());
qWarning("QSqlDatabase: available drivers: %s", qWarning("QSqlDatabase: available drivers: %s",
QSqlDatabase::drivers().join(QLatin1String(" ")).toLatin1().data()); QSqlDatabase::drivers().join(QLatin1Char(' ')).toLatin1().data());
if (QCoreApplication::instance() == 0) if (QCoreApplication::instance() == 0)
qWarning("QSqlDatabase: an instance of QCoreApplication is required for loading driver plugins"); qWarning("QSqlDatabase: an instance of QCoreApplication is required for loading driver plugins");
driver = shared_null()->driver; driver = shared_null()->driver;

2
tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
View File

@ -431,7 +431,7 @@ void tst_QSqlDatabase::generic_data(const QString& engine)
void tst_QSqlDatabase::addDatabase() void tst_QSqlDatabase::addDatabase()
{ {
QTest::ignoreMessage(QtWarningMsg, "QSqlDatabase: BLAH_FOO_NONEXISTENT_DRIVER driver not loaded"); 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", QSqlDatabase db = QSqlDatabase::addDatabase("BLAH_FOO_NONEXISTENT_DRIVER",
"INVALID_CONNECTION"); "INVALID_CONNECTION");