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

Replace uses of _qba with _ba

Browse Source 
Task-number: QTBUG-101408
Change-Id: I5175428c2be934b09f45bd06b0b47643003e25c7
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Sona Kurazyan 2022-03-18 13:32:41 +01:00
parent a885f28933
commit 80363889fe
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/testlib/qtestblacklist.cpp
View File

@ -52,6 +52,8 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
using namespace Qt::StringLiterals;
/* /*
The BLACKLIST file format is a grouped listing of keywords. The BLACKLIST file format is a grouped listing of keywords.
@ -320,7 +322,7 @@ void checkBlackLists(const char *slot, const char *data, const char *global)
} }
if (!ignore && global) { if (!ignore && global) {
s = slot + ":"_qba + global; s = slot + ":"_ba + global;
ignore = ignoredTests->find(s) != ignoredTests->end(); ignore = ignoredTests->find(s) != ignoredTests->end();
if (!ignore && data) { if (!ignore && data) {
s = (s + ':') + data; s = (s + ':') + data;

4
tests/auto/network/access/http2/tst_http2.cpp
View File

@ -62,6 +62,8 @@ Q_DECLARE_METATYPE(QNetworkRequest::Attribute)
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
using namespace Qt::StringLiterals;
QHttp2Configuration qt_defaultH2Configuration() QHttp2Configuration qt_defaultH2Configuration()
{ {
QHttp2Configuration config; QHttp2Configuration config;
@ -1245,7 +1247,7 @@ void tst_Http2::redirect()
QFETCH(const int, maxRedirects); QFETCH(const int, maxRedirects);
QFETCH(const int, redirectCount); QFETCH(const int, redirectCount);
QFETCH(const bool, success); QFETCH(const bool, success);
const QByteArray redirectUrl = "/b.html"_qba; const QByteArray redirectUrl = "/b.html"_ba;
clearHTTP2State(); clearHTTP2State();
serverPort = 0; serverPort = 0;

6
tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
View File

@ -814,7 +814,7 @@ void tst_QSqlQuery::oraClob()
.arg(clobby))); .arg(clobby)));
q.addBindValue(1); q.addBindValue(1);
q.addBindValue("bubu"); q.addBindValue("bubu");
q.addBindValue("bubu"_qba); q.addBindValue("bubu"_ba);
QVERIFY_SQL(q, exec()); QVERIFY_SQL(q, exec());
QVERIFY_SQL(q, exec(QLatin1String("select bl, cl from %1 where id = 1").arg(clobby))); QVERIFY_SQL(q, exec(QLatin1String("select bl, cl from %1 where id = 1").arg(clobby)));
@ -827,7 +827,7 @@ void tst_QSqlQuery::oraClob()
.arg(clobby))); .arg(clobby)));
q.addBindValue(2); q.addBindValue(2);
q.addBindValue(u"lala"_s, QSql::Binary); q.addBindValue(u"lala"_s, QSql::Binary);
q.addBindValue("lala"_qba, QSql::Binary); q.addBindValue("lala"_ba, QSql::Binary);
QVERIFY_SQL(q, exec()); QVERIFY_SQL(q, exec());
QVERIFY_SQL(q, exec(QLatin1String("select bl, cl from %1 where id = 2").arg(clobby))); QVERIFY_SQL(q, exec(QLatin1String("select bl, cl from %1 where id = 2").arg(clobby)));
@ -1817,7 +1817,7 @@ void tst_QSqlQuery::writeNull()
// QUuid. // QUuid.
QMultiHash<QString, QVariant> nullableTypes = { QMultiHash<QString, QVariant> nullableTypes = {
{"varchar(20)", u"not null"_s}, {"varchar(20)", u"not null"_s},
{"varchar(20)", "not null"_qba}, {"varchar(20)", "not null"_ba},
{"date", QDateTime::currentDateTime()}, {"date", QDateTime::currentDateTime()},
{"date", QDate::currentDate()}, {"date", QDate::currentDate()},
{"date", QTime::currentTime()}, {"date", QTime::currentTime()},