Skip to content

Commit abf70ea

Browse files
MKleusbergMKleusberg
committed
Use nullptr instead of NULL
1 parent 817de2d commit abf70ea

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎src/ExportDataDialog.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ bool ExportDataDialog::exportQueryCsv(const QString& sQuery, const QString& sFil
116116
QByteArray utf8Query = sQuery.toUtf8();
117117
sqlite3_stmt *stmt;
118118

119-
int status = sqlite3_prepare_v2(pdb._db, utf8Query.data(), utf8Query.size(), &stmt, NULL);
119+
int status = sqlite3_prepare_v2(pdb._db, utf8Query.data(), utf8Query.size(), &stmt, nullptr);
120120
if(SQLITE_OK == status)
121121
{
122122
if(ui->checkHeader->isChecked())
@@ -198,7 +198,7 @@ bool ExportDataDialog::exportQueryJson(const QString& sQuery, const QString& sFi
198198
{
199199
QByteArray utf8Query = sQuery.toUtf8();
200200
sqlite3_stmt *stmt;
201-
int status = sqlite3_prepare_v2(pdb._db, utf8Query.data(), utf8Query.size(), &stmt, NULL);
201+
int status = sqlite3_prepare_v2(pdb._db, utf8Query.data(), utf8Query.size(), &stmt, nullptr);
202202

203203
QJsonArray json_table;
204204

‎src/RemoteDatabase.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ void RemoteDatabase::localAssureOpened()
535535

536536
// Open file
537537
QString database_file = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/remotedbs.db";
538-
if(sqlite3_open_v2(database_file.toUtf8(), &m_dbLocal, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL) != SQLITE_OK)
538+
if(sqlite3_open_v2(database_file.toUtf8(), &m_dbLocal, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, nullptr) != SQLITE_OK)
539539
{
540540
QMessageBox::warning(nullptr, qApp->applicationName(), tr("Error opening local databases list.\n%1").arg(QString::fromUtf8(sqlite3_errmsg(m_dbLocal))));
541541
return;
@@ -553,7 +553,7 @@ void RemoteDatabase::localAssureOpened()
553553
"\"modified\" INTEGER DEFAULT 0,"
554554
"\"branch\" TEXT NOT NULL DEFAULT \"master\""
555555
")");
556-
if(sqlite3_exec(m_dbLocal, statement.toUtf8(), NULL, NULL, &errmsg) != SQLITE_OK)
556+
if(sqlite3_exec(m_dbLocal, statement.toUtf8(), nullptr, nullptr, &errmsg) != SQLITE_OK)
557557
{
558558
QMessageBox::warning(nullptr, qApp->applicationName(), tr("Error creating local databases list.\n%1").arg(QString::fromUtf8(errmsg)));
559559
sqlite3_free(errmsg);
@@ -819,7 +819,7 @@ QString RemoteDatabase::localLastCommitId(QString identity, const QUrl& url)
819819
// Query commit id for that file name
820820
QString sql = QString("SELECT commit_id FROM local WHERE identity=? AND url=?");
821821
sqlite3_stmt* stmt;
822-
if(sqlite3_prepare_v2(m_dbLocal, sql.toUtf8(), -1, &stmt, NULL) != SQLITE_OK)
822+
if(sqlite3_prepare_v2(m_dbLocal, sql.toUtf8(), -1, &stmt, nullptr) != SQLITE_OK)
823823
return QString();
824824

825825
QFileInfo f(identity); // Remove the path

‎src/sqlitedb.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ bool DBBrowserDB::open(const QString& db, bool readOnly)
108108
return false;
109109

110110
// Open database file
111-
if(sqlite3_open_v2(db.toUtf8(), &_db, readOnly ? SQLITE_OPEN_READONLY : SQLITE_OPEN_READWRITE, NULL) != SQLITE_OK)
111+
if(sqlite3_open_v2(db.toUtf8(), &_db, readOnly ? SQLITE_OPEN_READONLY : SQLITE_OPEN_READWRITE, nullptr) != SQLITE_OK)
112112
{
113113
lastErrorMessage = QString::fromUtf8((const char*)sqlite3_errmsg(_db));
114114
return false;
@@ -135,7 +135,7 @@ bool DBBrowserDB::open(const QString& db, bool readOnly)
135135
// register collation callback
136136
Callback<void(void*, sqlite3*, int, const char*)>::func = std::bind(&DBBrowserDB::collationNeeded, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4);
137137
void (*c_callback)(void*, sqlite3*, int, const char*) = static_cast<decltype(c_callback)>(Callback<void(void*, sqlite3*, int, const char*)>::callback);
138-
sqlite3_collation_needed(_db, NULL, c_callback);
138+
sqlite3_collation_needed(_db, nullptr, c_callback);
139139

140140
// Set foreign key settings as requested in the preferences
141141
bool foreignkeys = Settings::getValue("db", "foreignkeys").toBool();
@@ -146,7 +146,7 @@ bool DBBrowserDB::open(const QString& db, bool readOnly)
146146

147147
// Register REGEXP function
148148
if(Settings::getValue("extensions", "disableregex").toBool() == false)
149-
sqlite3_create_function(_db, "REGEXP", 2, SQLITE_UTF8, NULL, regexp, NULL, NULL);
149+
sqlite3_create_function(_db, "REGEXP", 2, SQLITE_UTF8, nullptr, regexp, nullptr, nullptr);
150150

151151
// Check if file is read only
152152
QFileInfo fi(db);
@@ -177,7 +177,7 @@ bool DBBrowserDB::attach(const QString& filename, QString attach_as)
177177
QString sql = "PRAGMA database_list;";
178178
logSQL(sql, kLogMsg_App);
179179
sqlite3_stmt* db_vm;
180-
if(sqlite3_prepare_v2(_db, sql.toUtf8(), sql.toUtf8().length(), &db_vm, NULL) == SQLITE_OK)
180+
if(sqlite3_prepare_v2(_db, sql.toUtf8(), sql.toUtf8().length(), &db_vm, nullptr) == SQLITE_OK)
181181
{
182182
// Loop through all the databases
183183
QFileInfo fi(filename);
@@ -249,7 +249,7 @@ bool DBBrowserDB::tryEncryptionSettings(const QString& filename, bool* encrypted
249249

250250
// Open database file
251251
sqlite3* dbHandle;
252-
if(sqlite3_open_v2(filename.toUtf8(), &dbHandle, SQLITE_OPEN_READONLY, NULL) != SQLITE_OK)
252+
if(sqlite3_open_v2(filename.toUtf8(), &dbHandle, SQLITE_OPEN_READONLY, nullptr) != SQLITE_OK)
253253
return false;
254254

255255
// Try reading from database
@@ -426,7 +426,7 @@ bool DBBrowserDB::create ( const QString & db)
426426

427427
// Register REGEXP function
428428
if(Settings::getValue("extensions", "disableregex").toBool() == false)
429-
sqlite3_create_function(_db, "REGEXP", 2, SQLITE_UTF8, NULL, regexp, NULL, NULL);
429+
sqlite3_create_function(_db, "REGEXP", 2, SQLITE_UTF8, nullptr, regexp, nullptr, nullptr);
430430

431431
// force sqlite3 do write proper file header
432432
// if we don't create and drop the table we might end up
@@ -564,7 +564,7 @@ bool DBBrowserDB::dump(const QString& filename,
564564
sqlite3_stmt *stmt;
565565
QString lineSep(QString(")%1\n").arg(insertNewSyntx?',':';'));
566566

567-
int status = sqlite3_prepare_v2(this->_db, utf8Query.data(), utf8Query.size(), &stmt, NULL);
567+
int status = sqlite3_prepare_v2(this->_db, utf8Query.data(), utf8Query.size(), &stmt, nullptr);
568568
if(SQLITE_OK == status)
569569
{
570570
int columns = sqlite3_column_count(stmt);
@@ -698,7 +698,7 @@ bool DBBrowserDB::executeSQL(QString statement, bool dirtyDB, bool logsql)
698698
if (dirtyDB) setSavepoint();
699699

700700
char* errmsg;
701-
if (SQLITE_OK == sqlite3_exec(_db, statement.toUtf8(), NULL, NULL, &errmsg))
701+
if (SQLITE_OK == sqlite3_exec(_db, statement.toUtf8(), nullptr, nullptr, &errmsg))
702702
{
703703
// Update DB structure after executing an SQL statement. But try to avoid doing unnecessary updates.
704704
if(!dontCheckForStructureUpdates && (statement.startsWith("ALTER", Qt::CaseInsensitive) ||
@@ -839,7 +839,7 @@ bool DBBrowserDB::getRow(const sqlb::ObjectIdentifier& table, const QString& row
839839
QByteArray utf8Query = sQuery.toUtf8();
840840
sqlite3_stmt *stmt;
841841
bool ret = false;
842-
if(sqlite3_prepare_v2(_db, utf8Query, utf8Query.size(), &stmt, NULL) == SQLITE_OK)
842+
if(sqlite3_prepare_v2(_db, utf8Query, utf8Query.size(), &stmt, nullptr) == SQLITE_OK)
843843
{
844844
// even this is a while loop, the statement should always only return 1 row
845845
while(sqlite3_step(stmt) == SQLITE_ROW)
@@ -872,7 +872,7 @@ QString DBBrowserDB::max(const sqlb::ObjectIdentifier& tableName, sqlb::FieldPtr
872872
sqlite3_stmt *stmt;
873873
QString ret = "0";
874874

875-
if(sqlite3_prepare_v2(_db, utf8Query, utf8Query.size(), &stmt, NULL) == SQLITE_OK)
875+
if(sqlite3_prepare_v2(_db, utf8Query, utf8Query.size(), &stmt, nullptr) == SQLITE_OK)
876876
{
877877
// even this is a while loop, the statement should always only return 1 row
878878
while(sqlite3_step(stmt) == SQLITE_ROW)
@@ -1031,7 +1031,7 @@ bool DBBrowserDB::updateRecord(const sqlb::ObjectIdentifier& table, const QStrin
10311031

10321032
// If we get a NULL QByteArray we insert a NULL value, and for that
10331033
// we can pass NULL to sqlite3_bind_text() so that it behaves like sqlite3_bind_null()
1034-
const char *rawValue = value.isNull() ? NULL : value.constData();
1034+
const char *rawValue = value.isNull() ? nullptr : value.constData();
10351035

10361036
sqlite3_stmt* stmt;
10371037
int success = 1;
@@ -1396,7 +1396,7 @@ void DBBrowserDB::updateSchema()
13961396
QByteArray db_utf8Statement = db_statement.toUtf8();
13971397
logSQL(db_statement, kLogMsg_App);
13981398
sqlite3_stmt* db_vm;
1399-
if(sqlite3_prepare_v2(_db, db_utf8Statement, db_utf8Statement.length(), &db_vm, NULL) == SQLITE_OK)
1399+
if(sqlite3_prepare_v2(_db, db_utf8Statement, db_utf8Statement.length(), &db_vm, nullptr) == SQLITE_OK)
14001400
{
14011401
// Loop through all the databases
14021402
while(sqlite3_step(db_vm) == SQLITE_ROW)
@@ -1418,7 +1418,7 @@ void DBBrowserDB::updateSchema()
14181418
logSQL(statement, kLogMsg_App);
14191419

14201420
sqlite3_stmt* vm;
1421-
int err = sqlite3_prepare_v2(_db, utf8Statement, utf8Statement.length(), &vm, NULL);
1421+
int err = sqlite3_prepare_v2(_db, utf8Statement, utf8Statement.length(), &vm, nullptr);
14221422
if(err == SQLITE_OK)
14231423
{
14241424
while(sqlite3_step(vm) == SQLITE_ROW)

‎src/sqlitetablemodel.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ int SqliteTableModel::getQueryRowCount()
164164
// So just execute the statement as it is and fetch all results counting the rows
165165
sqlite3_stmt* stmt;
166166
QByteArray utf8Query = m_sQuery.toUtf8();
167-
if(sqlite3_prepare_v2(m_db._db, utf8Query, utf8Query.size(), &stmt, NULL) == SQLITE_OK)
167+
if(sqlite3_prepare_v2(m_db._db, utf8Query, utf8Query.size(), &stmt, nullptr) == SQLITE_OK)
168168
{
169169
retval = 0;
170170
while(sqlite3_step(stmt) == SQLITE_ROW)
@@ -183,7 +183,7 @@ int SqliteTableModel::getQueryRowCount()
183183
QByteArray utf8Query = sCountQuery.toUtf8();
184184

185185
sqlite3_stmt* stmt;
186-
int status = sqlite3_prepare_v2(m_db._db, utf8Query, utf8Query.size(), &stmt, NULL);
186+
int status = sqlite3_prepare_v2(m_db._db, utf8Query, utf8Query.size(), &stmt, nullptr);
187187
if(status == SQLITE_OK)
188188
{
189189
status = sqlite3_step(stmt);
@@ -560,7 +560,7 @@ void SqliteTableModel::fetchData(unsigned int from, unsigned to)
560560
m_db.logSQL(sLimitQuery, kLogMsg_App);
561561
QByteArray utf8Query = sLimitQuery.toUtf8();
562562
sqlite3_stmt *stmt;
563-
int status = sqlite3_prepare_v2(m_db._db, utf8Query, utf8Query.size(), &stmt, NULL);
563+
int status = sqlite3_prepare_v2(m_db._db, utf8Query, utf8Query.size(), &stmt, nullptr);
564564

565565
if(SQLITE_OK == status)
566566
{
@@ -722,7 +722,7 @@ QStringList SqliteTableModel::getColumns(const QString& sQuery, QVector<int>& fi
722722
{
723723
sqlite3_stmt* stmt;
724724
QByteArray utf8Query = sQuery.toUtf8();
725-
int status = sqlite3_prepare_v2(m_db._db, utf8Query, utf8Query.size(), &stmt, NULL);
725+
int status = sqlite3_prepare_v2(m_db._db, utf8Query, utf8Query.size(), &stmt, nullptr);
726726
QStringList listColumns;
727727
if(SQLITE_OK == status)
728728
{

0 commit comments

Comments
 (0)