AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always try to conversions through QMetaType

Browse Source 
Always ask QMetaType to convert first before trying the builtin
code in QVariant. That way we can migrate conversions piece by
piece to QMetaType.

Change-Id: I4fd1bad3ef045d37f84f68e748a6357e0ee0c16c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Lars Knoll 2020-07-13 10:02:40 +02:00
parent 560a419281
commit f44d2ea1cc
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/corelib/kernel/qvariant.cpp
View File

@ -2462,11 +2462,9 @@ inline T qVariantToHelper(const QVariant::Private &d)
return d.get<T>();
T ret;
if (d.typeId() >= QMetaType::LastCoreType || targetType.id() >= QMetaType::LastCoreType) {
const void * const from = d.storage();
if (QMetaType::convert(from, d.typeId(), &ret, targetType.id()))
return ret;
}
const void * const from = d.storage();
if (QMetaType::convert(from, d.typeId(), &ret, targetType.id()))
return ret;
convert(&d, targetType.id(), &ret);
return ret;
@ -2896,8 +2894,7 @@ inline T qNumVariantToHelper(const QVariant::Private &d, bool *ok, const T& val)
return val;
T ret = 0;
if ((d.typeId() >= QMetaType::LastCoreType || t >= QMetaType::LastCoreType)
&& QMetaType::convert(d.storage(), d.typeId(), &ret, t))
if (QMetaType::convert(d.storage(), d.typeId(), &ret, t))
return ret;
bool success = convert(&d, t, &ret);
@ -3003,11 +3000,8 @@ bool QVariant::toBool() const
bool res = false;
if (d.typeId() >= QMetaType::LastCoreType) {
const void * const from = constData();
if (QMetaType::convert(from, d.typeId(), &res, QMetaType::Bool))
return res;
}
if (QMetaType::convert(constData(), d.typeId(), &res, QMetaType::Bool))
return res;
::convert(&d, Bool, &res);
@ -3547,10 +3541,7 @@ bool QVariant::convert(int targetTypeId)
}
bool isOk = false;
if (oldValue.d.typeId() >= QMetaType::LastCoreType || targetTypeId >= QMetaType::LastCoreType) {
const void * const from = oldValue.constData();
isOk = QMetaType::convert(from, oldValue.d.typeId(), data(), targetTypeId);
}
isOk = QMetaType::convert(oldValue.constData(), oldValue.d.typeId(), data(), targetTypeId);
if (!isOk)
isOk = ::convert(&oldValue.d, targetTypeId, data());
@ -3565,11 +3556,8 @@ bool QVariant::convert(int targetTypeId)
*/
bool QVariant::convert(const int type, void *ptr) const
{
if (d.typeId() >= QMetaType::LastCoreType || type >= QMetaType::LastCoreType) {
const void * const from = constData();
if (QMetaType::convert(from, d.typeId(), ptr, type))
return true;
}
if (QMetaType::convert(constData(), d.typeId(), ptr, type))
return true;
return ::convert(&d, type, ptr);
}