summaryrefslogtreecommitdiffstats
path: root/src/plugins/sqldrivers
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-07 13:05:48 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-07 23:02:47 +0200
commit564b59d903683b14c75b72a3e93367717f201def (patch)
tree03ffe749d83dce84429a7db484bf92795047036f /src/plugins/sqldrivers
parentb5fc1e4e2643e73d3b44c483d159529f8deb8af1 (diff)
Another round of replacing 0 with nullptr
This time based on grepping to also include documentation, tests and examples previously missed by the automatic tool. Change-Id: Ied1703f4bcc470fbc275f759ed5b7c588a5c4e9f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/plugins/sqldrivers')
-rw-r--r--src/plugins/sqldrivers/db2/qsql_db2.cpp2
-rw-r--r--src/plugins/sqldrivers/db2/qsql_db2_p.h4
-rw-r--r--src/plugins/sqldrivers/ibase/qsql_ibase.cpp4
-rw-r--r--src/plugins/sqldrivers/ibase/qsql_ibase_p.h4
-rw-r--r--src/plugins/sqldrivers/oci/qsql_oci.cpp8
-rw-r--r--src/plugins/sqldrivers/oci/qsql_oci_p.h4
-rw-r--r--src/plugins/sqldrivers/odbc/qsql_odbc.cpp8
7 files changed, 17 insertions, 17 deletions
diff --git a/src/plugins/sqldrivers/db2/qsql_db2.cpp b/src/plugins/sqldrivers/db2/qsql_db2.cpp
index e644a556e6..e3cfa0ae15 100644
--- a/src/plugins/sqldrivers/db2/qsql_db2.cpp
+++ b/src/plugins/sqldrivers/db2/qsql_db2.cpp
@@ -1052,7 +1052,7 @@ QVariant QDB2Result::data(int field)
return *d->valueCache[field];
- QVariant* v = 0;
+ QVariant *v = nullptr;
switch (info.metaType().id()) {
case QVariant::LongLong:
v = new QVariant((qint64) qGetBigIntData(d->hStmt, field, isNull));
diff --git a/src/plugins/sqldrivers/db2/qsql_db2_p.h b/src/plugins/sqldrivers/db2/qsql_db2_p.h
index 79ae54ab2d..abe65c4208 100644
--- a/src/plugins/sqldrivers/db2/qsql_db2_p.h
+++ b/src/plugins/sqldrivers/db2/qsql_db2_p.h
@@ -72,8 +72,8 @@ class Q_EXPORT_SQLDRIVER_DB2 QDB2Driver : public QSqlDriver
friend class QDB2ResultPrivate;
public:
- explicit QDB2Driver(QObject* parent = 0);
- QDB2Driver(Qt::HANDLE env, Qt::HANDLE con, QObject* parent = 0);
+ explicit QDB2Driver(QObject *parent = nullptr);
+ QDB2Driver(Qt::HANDLE env, Qt::HANDLE con, QObject *parent = nullptr);
~QDB2Driver();
bool hasFeature(DriverFeature) const override;
void close() override;
diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
index 6b7ee8f133..7be2df6dd9 100644
--- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
+++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
@@ -487,7 +487,7 @@ QVariant QIBaseResultPrivate::fetchBlob(ISC_QUAD *bId)
}
template<typename T>
-static QList<QVariant> toList(char** buf, int count, T* = 0)
+static QList<QVariant> toList(char** buf, int count, T* = nullptr)
{
QList<QVariant> res;
for (int i = 0; i < count; ++i) {
@@ -624,7 +624,7 @@ QVariant QIBaseResultPrivate::fetchArray(int pos, ISC_QUAD *arr)
}
template<typename T>
-static char* fillList(char *buffer, const QList<QVariant> &list, T* = 0)
+static char* fillList(char *buffer, const QList<QVariant> &list, T* = nullptr)
{
for (int i = 0; i < list.size(); ++i) {
T val;
diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
index e7c908cf2b..9109c2b40f 100644
--- a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
+++ b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
@@ -73,8 +73,8 @@ class Q_EXPORT_SQLDRIVER_IBASE QIBaseDriver : public QSqlDriver
Q_DECLARE_PRIVATE(QIBaseDriver)
Q_OBJECT
public:
- explicit QIBaseDriver(QObject *parent = 0);
- explicit QIBaseDriver(isc_db_handle connection, QObject *parent = 0);
+ explicit QIBaseDriver(QObject *parent = nullptr);
+ explicit QIBaseDriver(isc_db_handle connection, QObject *parent = nullptr);
virtual ~QIBaseDriver();
bool hasFeature(DriverFeature f) const override;
bool open(const QString &db,
diff --git a/src/plugins/sqldrivers/oci/qsql_oci.cpp b/src/plugins/sqldrivers/oci/qsql_oci.cpp
index 4edafd1029..5bf9400180 100644
--- a/src/plugins/sqldrivers/oci/qsql_oci.cpp
+++ b/src/plugins/sqldrivers/oci/qsql_oci.cpp
@@ -511,7 +511,7 @@ int QOCIResultPrivate::bindValues(QVariantList &values, IndicatorArray &indicato
values[i].detach();
const QVariant &val = values.at(i);
- OCIBind * hbnd = 0; // Oracle handles these automatically
+ OCIBind * hbnd = nullptr; // Oracle handles these automatically
sb2 *indPtr = &indicators[i];
*indPtr = val.isNull() ? -1 : 0;
@@ -897,10 +897,10 @@ QOCICols::QOCICols(int size, QOCIResultPrivate* dp)
: fieldInf(size), d(dp)
{
ub4 dataSize = 0;
- OCIDefine* dfn = 0;
+ OCIDefine *dfn = nullptr;
int r;
- OCIParam* param = 0;
+ OCIParam *param = nullptr;
sb4 parmStatus = 0;
ub4 count = 1;
int idx = 0;
@@ -1184,7 +1184,7 @@ OraFieldInfo QOCICols::qMakeOraField(const QOCIResultPrivate* p, OCIParam* param
{
OraFieldInfo ofi;
ub2 colType(0);
- text *colName = 0;
+ text *colName = nullptr;
ub4 colNameLen(0);
sb1 colScale(0);
ub2 colLength(0);
diff --git a/src/plugins/sqldrivers/oci/qsql_oci_p.h b/src/plugins/sqldrivers/oci/qsql_oci_p.h
index 295c131f1a..a3366abb77 100644
--- a/src/plugins/sqldrivers/oci/qsql_oci_p.h
+++ b/src/plugins/sqldrivers/oci/qsql_oci_p.h
@@ -75,8 +75,8 @@ class Q_EXPORT_SQLDRIVER_OCI QOCIDriver : public QSqlDriver
friend class QOCIResultPrivate;
public:
- explicit QOCIDriver(QObject* parent = 0);
- QOCIDriver(OCIEnv* env, OCISvcCtx* ctx, QObject* parent = 0);
+ explicit QOCIDriver(QObject *parent = nullptr);
+ QOCIDriver(OCIEnv *env, OCISvcCtx *ctx, QObject *parent = nullptr);
~QOCIDriver();
bool hasFeature(DriverFeature f) const;
bool open(const QString &db,
diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
index a58c782b60..5a00a000f7 100644
--- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
+++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
@@ -227,7 +227,7 @@ void QODBCResultPrivate::updateStmtHandleState()
disconnectCount = drv_d_func() ? drv_d_func()->disconnectCount : 0;
}
-static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode = 0)
+static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode = nullptr)
{
SQLINTEGER nativeCode_ = 0;
SQLSMALLINT msgLen = 0;
@@ -275,7 +275,7 @@ static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode
}
static QString qODBCWarn(const SQLHANDLE hStmt, const SQLHANDLE envHandle = 0,
- const SQLHANDLE pDbC = 0, int *nativeCode = 0)
+ const SQLHANDLE pDbC = 0, int *nativeCode = nullptr)
{
QString result;
if (envHandle)
@@ -299,12 +299,12 @@ static QString qODBCWarn(const SQLHANDLE hStmt, const SQLHANDLE envHandle = 0,
return result;
}
-static QString qODBCWarn(const QODBCResultPrivate* odbc, int *nativeCode = 0)
+static QString qODBCWarn(const QODBCResultPrivate* odbc, int *nativeCode = nullptr)
{
return qODBCWarn(odbc->hStmt, odbc->dpEnv(), odbc->dpDbc(), nativeCode);
}
-static QString qODBCWarn(const QODBCDriverPrivate* odbc, int *nativeCode = 0)
+static QString qODBCWarn(const QODBCDriverPrivate* odbc, int *nativeCode = nullptr)
{
return qODBCWarn(0, odbc->hEnv, odbc->hDbc, nativeCode);
}