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

sqlite: Replace NULL by nullptr

Browse Source 
Change-Id: I8e845ae093a68d2d7ecf0e358a2316a54d0f2144
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Friedemann Kleint 2020-12-18 17:36:01 +01:00
parent 7f02071503
commit 4a6a45ac38
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
View File

@ -382,7 +382,7 @@ bool QSQLiteResult::prepare(const QString &query)
setSelect(false); setSelect(false);
const void *pzTail = NULL; const void *pzTail = nullptr;
const auto size = int((query.size() + 1) * sizeof(QChar)); const auto size = int((query.size() + 1) * sizeof(QChar));
#if (SQLITE_VERSION_NUMBER >= 3003011) #if (SQLITE_VERSION_NUMBER >= 3003011)
@ -770,7 +770,7 @@ bool QSQLiteDriver::open(const QString & db, const QString &, const QString &, c
openMode |= SQLITE_OPEN_NOMUTEX; openMode |= SQLITE_OPEN_NOMUTEX;
const int res = sqlite3_open_v2(db.toUtf8().constData(), &d->access, openMode, NULL); const int res = sqlite3_open_v2(db.toUtf8().constData(), &d->access, openMode, nullptr);
if (res == SQLITE_OK) { if (res == SQLITE_OK) {
sqlite3_busy_timeout(d->access, timeOut); sqlite3_busy_timeout(d->access, timeOut);
@ -779,8 +779,9 @@ bool QSQLiteDriver::open(const QString & db, const QString &, const QString &, c
#if QT_CONFIG(regularexpression) #if QT_CONFIG(regularexpression)
if (defineRegexp) { if (defineRegexp) {
auto cache = new QCache<QString, QRegularExpression>(regexpCacheSize); auto cache = new QCache<QString, QRegularExpression>(regexpCacheSize);
sqlite3_create_function_v2(d->access, "regexp", 2, SQLITE_UTF8, cache, &_q_regexp, NULL, sqlite3_create_function_v2(d->access, "regexp", 2, SQLITE_UTF8, cache,
NULL, &_q_regexp_cleanup); &_q_regexp, nullptr,
nullptr, &_q_regexp_cleanup);
} }
#endif #endif
return true; return true;
@ -807,7 +808,7 @@ void QSQLiteDriver::close()
if (d->access && (d->notificationid.count() > 0)) { if (d->access && (d->notificationid.count() > 0)) {
d->notificationid.clear(); d->notificationid.clear();
sqlite3_update_hook(d->access, NULL, NULL); sqlite3_update_hook(d->access, nullptr, nullptr);
} }
const int res = sqlite3_close(d->access); const int res = sqlite3_close(d->access);
@ -1027,7 +1028,7 @@ bool QSQLiteDriver::unsubscribeFromNotification(const QString &name)
d->notificationid.removeAll(name); d->notificationid.removeAll(name);
if (d->notificationid.isEmpty()) if (d->notificationid.isEmpty())
sqlite3_update_hook(d->access, NULL, NULL); sqlite3_update_hook(d->access, nullptr, nullptr);
return true; return true;
} }