diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-06-15 09:09:08 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-15 10:56:29 +0200 |
| commit | 8929c0a3550ae27cb5c9ed276d4c5a85594ba682 (patch) | |
| tree | 56998feaa3acec13cc575a7f95b12b28e4407c44 /src/plugins/sqldrivers/oci/qsql_oci.cpp | |
| parent | af263b003be2f2e111ddc398bc8918cc006fcbb3 (diff) | |
Remove QVariant(int type, void *data, ...) constructor
It was marked internal anyway. Use the constructor taking a
QMetaType instead.
Change-Id: I15b9cd0911aac063a0f0fe0352fa2c84b7f7c691
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/sqldrivers/oci/qsql_oci.cpp')
| -rw-r--r-- | src/plugins/sqldrivers/oci/qsql_oci.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/sqldrivers/oci/qsql_oci.cpp b/src/plugins/sqldrivers/oci/qsql_oci.cpp index 378e9322e2..4edafd1029 100644 --- a/src/plugins/sqldrivers/oci/qsql_oci.cpp +++ b/src/plugins/sqldrivers/oci/qsql_oci.cpp @@ -561,7 +561,7 @@ void QOCIResultPrivate::outValues(QVariantList &values, IndicatorArray &indicato qOraOutValue(values[i], tmpStorage, env, err); - QVariant::Type typ = values.at(i).type(); + auto typ = values.at(i).metaType(); if (indicators[i] == -1) // NULL values[i] = QVariant(typ); else @@ -1618,8 +1618,7 @@ bool QOCICols::execBatch(QOCIResultPrivate *d, QVariantList &boundValues, bool a if (!d->isOutValue(i)) continue; - QVariant::Type tp = boundValues.at(i).type(); - if (tp != QVariant::List) { + if (auto tp = boundValues.at(i).metaType(); tp.id() != QVariant::List) { qOraOutValue(boundValues[i], tmpStorage, d->env, d->err); if (*columns[i].indicators == -1) boundValues[i] = QVariant(tp); |