From 11bad6109606794091adc3b8a14070ac09707f45 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 10 Sep 2020 17:05:10 +0200 Subject: Deprecate QVariant::Type It's been obsolete for a long time already. Make sure the compiler now warns about it and remove all remaining uses in qtbase. Change-Id: I0ff80311184dba52d2ba5f4e2fabe0d47fdc59d7 Reviewed-by: Fabian Kosmale --- src/plugins/sqldrivers/ibase/qsql_ibase.cpp | 92 ++++++++++++++--------------- 1 file changed, 46 insertions(+), 46 deletions(-) (limited to 'src/plugins/sqldrivers/ibase') diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp index 7be2df6dd9..b61c41735b 100644 --- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp +++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp @@ -158,7 +158,7 @@ static void delDA(XSQLDA *&sqlda) sqlda = 0; } -static QVariant::Type qIBaseTypeName(int iType, bool hasScale) +static int qIBaseTypeName(int iType, bool hasScale) { switch (iType) { case blr_varying: @@ -166,60 +166,60 @@ static QVariant::Type qIBaseTypeName(int iType, bool hasScale) case blr_text: case blr_cstring: case blr_cstring2: - return QVariant::String; + return QMetaType::QString; case blr_sql_time: - return QVariant::Time; + return QMetaType::QTime; case blr_sql_date: - return QVariant::Date; + return QMetaType::QDate; case blr_timestamp: - return QVariant::DateTime; + return QMetaType::QDateTime; case blr_blob: - return QVariant::ByteArray; + return QMetaType::QByteArray; case blr_quad: case blr_short: case blr_long: - return (hasScale ? QVariant::Double : QVariant::Int); + return (hasScale ? QMetaType::Double : QMetaType::Int); case blr_int64: - return (hasScale ? QVariant::Double : QVariant::LongLong); + return (hasScale ? QMetaType::Double : QMetaType::LongLong); case blr_float: case blr_d_float: case blr_double: - return QVariant::Double; + return QMetaType::Double; case blr_boolean_dtype: - return QVariant::Bool; + return QMetaType::Bool; } qWarning("qIBaseTypeName: unknown datatype: %d", iType); - return QVariant::Invalid; + return QMetaType::UnknownType; } -static QVariant::Type qIBaseTypeName2(int iType, bool hasScale) +static int qIBaseTypeName2(int iType, bool hasScale) { switch(iType & ~1) { case SQL_VARYING: case SQL_TEXT: - return QVariant::String; + return QMetaType::QString; case SQL_LONG: case SQL_SHORT: - return (hasScale ? QVariant::Double : QVariant::Int); + return (hasScale ? QMetaType::Double : QMetaType::Int); case SQL_INT64: - return (hasScale ? QVariant::Double : QVariant::LongLong); + return (hasScale ? QMetaType::Double : QMetaType::LongLong); case SQL_FLOAT: case SQL_DOUBLE: - return QVariant::Double; + return QMetaType::Double; case SQL_TIMESTAMP: - return QVariant::DateTime; + return QMetaType::QDateTime; case SQL_TYPE_TIME: - return QVariant::Time; + return QMetaType::QTime; case SQL_TYPE_DATE: - return QVariant::Date; + return QMetaType::QDate; case SQL_ARRAY: - return QVariant::List; + return QMetaType::QVariantList; case SQL_BLOB: - return QVariant::ByteArray; + return QMetaType::QByteArray; case SQL_BOOLEAN: - return QVariant::Bool; + return QMetaType::Bool; default: - return QVariant::Invalid; + return QMetaType::UnknownType; } } @@ -674,7 +674,7 @@ static char* qFillBufferWithString(char *buffer, const QString& string, } static char* createArrayBuffer(char *buffer, const QList &list, - QVariant::Type type, short curDim, ISC_ARRAY_DESC *arrayDesc, + int type, short curDim, ISC_ARRAY_DESC *arrayDesc, QString& error) { int i; @@ -694,7 +694,7 @@ static char* createArrayBuffer(char *buffer, const QList &list, if (curDim != dim) { for(i = 0; i < list.size(); ++i) { - if (list.at(i).userType() != QVariant::List) { // dimensions mismatch + if (list.at(i).typeId() != QMetaType::QVariantList) { // dimensions mismatch error = QLatin1String("Array dimensons mismatch. Fieldname: %1"); return 0; } @@ -706,52 +706,52 @@ static char* createArrayBuffer(char *buffer, const QList &list, } } else { switch(type) { - case QVariant::Int: - case QVariant::UInt: + case QMetaType::Int: + case QMetaType::UInt: if (arrayDesc->array_desc_dtype == blr_short) buffer = fillList(buffer, list); else buffer = fillList(buffer, list); break; - case QVariant::Double: + case QMetaType::Double: if (arrayDesc->array_desc_dtype == blr_float) buffer = fillList(buffer, list, static_cast(0)); else buffer = fillList(buffer, list); break; - case QVariant::LongLong: + case QMetaType::LongLong: buffer = fillList(buffer, list); break; - case QVariant::ULongLong: + case QMetaType::ULongLong: buffer = fillList(buffer, list); break; - case QVariant::String: + case QMetaType::QString: for (i = 0; i < list.size(); ++i) buffer = qFillBufferWithString(buffer, list.at(i).toString(), arrayDesc->array_desc_length, arrayDesc->array_desc_dtype == blr_varying, true); break; - case QVariant::Date: + case QMetaType::QDate: for (i = 0; i < list.size(); ++i) { *((ISC_DATE*)buffer) = toDate(list.at(i).toDate()); buffer += sizeof(ISC_DATE); } break; - case QVariant::Time: + case QMetaType::QTime: for (i = 0; i < list.size(); ++i) { *((ISC_TIME*)buffer) = toTime(list.at(i).toTime()); buffer += sizeof(ISC_TIME); } break; - case QVariant::DateTime: + case QMetaType::QDateTime: for (i = 0; i < list.size(); ++i) { *((ISC_TIMESTAMP*)buffer) = toTimeStamp(list.at(i).toDateTime()); buffer += sizeof(ISC_TIMESTAMP); } break; - case QVariant::Bool: + case QMetaType::Bool: buffer = fillList(buffer, list); break; default: @@ -1132,16 +1132,16 @@ bool QIBaseResult::gotoNext(QSqlCachedResult::ValueCache& row, int rowIdx) // null value QVariant v; v.convert(qIBaseTypeName2(d->sqlda->sqlvar[i].sqltype, d->sqlda->sqlvar[i].sqlscale < 0)); - if (v.userType() == QVariant::Double) { + if (v.userType() == QMetaType::Double) { switch(numericalPrecisionPolicy()) { case QSql::LowPrecisionInt32: - v.convert(QVariant::Int); + v.convert(QMetaType::Int); break; case QSql::LowPrecisionInt64: - v.convert(QVariant::LongLong); + v.convert(QMetaType::LongLong); break; case QSql::HighPrecision: - v.convert(QVariant::String); + v.convert(QMetaType::QString); break; case QSql::LowPrecisionDouble: // no conversion @@ -1214,19 +1214,19 @@ bool QIBaseResult::gotoNext(QSqlCachedResult::ValueCache& row, int rowIdx) QVariant v = row[idx]; switch(numericalPrecisionPolicy()) { case QSql::LowPrecisionInt32: - if(v.convert(QVariant::Int)) + if (v.convert(QMetaType::Int)) row[idx]=v; break; case QSql::LowPrecisionInt64: - if(v.convert(QVariant::LongLong)) + if (v.convert(QMetaType::LongLong)) row[idx]=v; break; case QSql::LowPrecisionDouble: - if(v.convert(QVariant::Double)) + if (v.convert(QMetaType::Double)) row[idx]=v; break; case QSql::HighPrecision: - if(v.convert(QVariant::String)) + if (v.convert(QMetaType::QString)) row[idx]=v; break; } @@ -1695,7 +1695,7 @@ QSqlIndex QIBaseDriver::primaryIndex(const QString &table) const QString QIBaseDriver::formatValue(const QSqlField &field, bool trimStrings) const { switch (field.type()) { - case QVariant::DateTime: { + case QMetaType::QDateTime: { QDateTime datetime = field.value().toDateTime(); if (datetime.isValid()) return QLatin1Char('\'') + QString::number(datetime.date().year()) + QLatin1Char('-') + @@ -1709,7 +1709,7 @@ QString QIBaseDriver::formatValue(const QSqlField &field, bool trimStrings) cons else return QLatin1String("NULL"); } - case QVariant::Time: { + case QMetaType::QTime: { QTime time = field.value().toTime(); if (time.isValid()) return QLatin1Char('\'') + QString::number(time.hour()) + QLatin1Char(':') + @@ -1720,7 +1720,7 @@ QString QIBaseDriver::formatValue(const QSqlField &field, bool trimStrings) cons else return QLatin1String("NULL"); } - case QVariant::Date: { + case QMetaType::QDate: { QDate date = field.value().toDate(); if (date.isValid()) return QLatin1Char('\'') + QString::number(date.year()) + QLatin1Char('-') + -- cgit v1.2.3