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

SQL: Use Qt::SplitBehavior in preference to QString::SplitBehavior

Browse Source 
The Qt version was added in 5.14 "for use as eventual replacement for
QString::SplitBehavior." Move another step closer to that goal.

Change-Id: Ia4c698df60648c85c8e6132641e5ea7bc553129a
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
Edward Welbourne 2020-02-25 17:17:15 +01:00
parent c158f881b3
commit 8c613ed74b
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/sqldrivers/db2/qsql_db2.cpp
View File

@ -1270,7 +1270,7 @@ bool QDB2Driver::open(const QString& db, const QString& user, const QString& pas
QString protocol; QString protocol;
// Set connection attributes // Set connection attributes
const QStringList opts(connOpts.split(QLatin1Char(';'), QString::SkipEmptyParts)); const QStringList opts(connOpts.split(QLatin1Char(';'), Qt::SkipEmptyParts));
for (int i = 0; i < opts.count(); ++i) { for (int i = 0; i < opts.count(); ++i) {
const QString tmp(opts.at(i)); const QString tmp(opts.at(i));
int idx; int idx;

2
src/plugins/sqldrivers/ibase/qsql_ibase.cpp
View File

@ -1477,7 +1477,7 @@ bool QIBaseDriver::open(const QString & db,
if (isOpen()) if (isOpen())
close(); close();
const QStringList opts(connOpts.split(QLatin1Char(';'), QString::SkipEmptyParts)); const QStringList opts(connOpts.split(QLatin1Char(';'), Qt::SkipEmptyParts));
QString encString; QString encString;
QByteArray role; QByteArray role;

2
src/plugins/sqldrivers/mysql/qsql_mysql.cpp
View File

@ -1239,7 +1239,7 @@ bool QMYSQLDriver::open(const QString& db,
stored procedure call will fail. stored procedure call will fail.
*/ */
unsigned int optionFlags = CLIENT_MULTI_STATEMENTS; unsigned int optionFlags = CLIENT_MULTI_STATEMENTS;
const QStringList opts(connOpts.split(QLatin1Char(';'), QString::SkipEmptyParts)); const QStringList opts(connOpts.split(QLatin1Char(';'), Qt::SkipEmptyParts));
QString unixSocket; QString unixSocket;
QString sslCert; QString sslCert;
QString sslCA; QString sslCA;

2
src/plugins/sqldrivers/oci/qsql_oci.cpp
View File

@ -2230,7 +2230,7 @@ bool QOCIDriver::hasFeature(DriverFeature f) const
static void qParseOpts(const QString &options, QOCIDriverPrivate *d) static void qParseOpts(const QString &options, QOCIDriverPrivate *d)
{ {
const QStringList opts(options.split(QLatin1Char(';'), QString::SkipEmptyParts)); const QStringList opts(options.split(QLatin1Char(';'), Qt::SkipEmptyParts));
for (int i = 0; i < opts.count(); ++i) { for (int i = 0; i < opts.count(); ++i) {
const QString tmp(opts.at(i)); const QString tmp(opts.at(i));
int idx; int idx;

2
src/plugins/sqldrivers/odbc/qsql_odbc.cpp
View File

@ -767,7 +767,7 @@ QChar QODBCDriverPrivate::quoteChar()
bool QODBCDriverPrivate::setConnectionOptions(const QString& connOpts) bool QODBCDriverPrivate::setConnectionOptions(const QString& connOpts)
{ {
// Set any connection attributes // Set any connection attributes
const QStringList opts(connOpts.split(QLatin1Char(';'), QString::SkipEmptyParts)); const QStringList opts(connOpts.split(QLatin1Char(';'), Qt::SkipEmptyParts));
SQLRETURN r = SQL_SUCCESS; SQLRETURN r = SQL_SUCCESS;
for (int i = 0; i < opts.count(); ++i) { for (int i = 0; i < opts.count(); ++i) {
const QString tmp(opts.at(i)); const QString tmp(opts.at(i));