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

QVariant: move d.get() into qNumVariantToHelper

Browse Source 
Until we've checked the stored meta type, we don't know what the Private
contains. We only formed a reference to said value, so we should be
safe, but why tempt it?

Change-Id: I6f936da6f6e84d649f70fffd1706095fc6228755
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@gmail.com>
This commit is contained in:
Thiago Macieira 2022-07-28 08:56:59 -07:00
parent d528e96e73
commit 1425ad2cce
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1759,14 +1759,14 @@ QBitArray QVariant::toBitArray() const
} }
template <typename T> template <typename T>
inline T qNumVariantToHelper(const QVariant::Private &d, bool *ok, const T& val) inline T qNumVariantToHelper(const QVariant::Private &d, bool *ok)
{ {
QMetaType t = QMetaType::fromType<T>(); QMetaType t = QMetaType::fromType<T>();
if (ok) if (ok)
*ok = true; *ok = true;
if (d.type() == t) if (d.type() == t)
return val; return d.get<T>();
T ret = 0; T ret = 0;
bool success = QMetaType::convert(d.type(), d.storage(), t, &ret); bool success = QMetaType::convert(d.type(), d.storage(), t, &ret);
@ -1794,7 +1794,7 @@ inline T qNumVariantToHelper(const QVariant::Private &d, bool *ok, const T& val)
*/ */
int QVariant::toInt(bool *ok) const int QVariant::toInt(bool *ok) const
{ {
return qNumVariantToHelper<int>(d, ok, d.get<int>()); return qNumVariantToHelper<int>(d, ok);
} }
/*! /*!
@ -1816,7 +1816,7 @@ int QVariant::toInt(bool *ok) const
*/ */
uint QVariant::toUInt(bool *ok) const uint QVariant::toUInt(bool *ok) const
{ {
return qNumVariantToHelper<uint>(d, ok, d.get<unsigned int>()); return qNumVariantToHelper<uint>(d, ok);
} }
/*! /*!
@ -1833,7 +1833,7 @@ uint QVariant::toUInt(bool *ok) const
*/ */
qlonglong QVariant::toLongLong(bool *ok) const qlonglong QVariant::toLongLong(bool *ok) const
{ {
return qNumVariantToHelper<qlonglong>(d, ok, d.get<qlonglong>()); return qNumVariantToHelper<qlonglong>(d, ok);
} }
/*! /*!
@ -1850,7 +1850,7 @@ qlonglong QVariant::toLongLong(bool *ok) const
*/ */
qulonglong QVariant::toULongLong(bool *ok) const qulonglong QVariant::toULongLong(bool *ok) const
{ {
return qNumVariantToHelper<qulonglong>(d, ok, d.get<qulonglong>()); return qNumVariantToHelper<qulonglong>(d, ok);
} }
/*! /*!
@ -1890,7 +1890,7 @@ bool QVariant::toBool() const
*/ */
double QVariant::toDouble(bool *ok) const double QVariant::toDouble(bool *ok) const
{ {
return qNumVariantToHelper<double>(d, ok, d.get<double>()); return qNumVariantToHelper<double>(d, ok);
} }
/*! /*!
@ -1909,7 +1909,7 @@ double QVariant::toDouble(bool *ok) const
*/ */
float QVariant::toFloat(bool *ok) const float QVariant::toFloat(bool *ok) const
{ {
return qNumVariantToHelper<float>(d, ok, d.get<float>()); return qNumVariantToHelper<float>(d, ok);
} }
/*! /*!
@ -1928,7 +1928,7 @@ float QVariant::toFloat(bool *ok) const
*/ */
qreal QVariant::toReal(bool *ok) const qreal QVariant::toReal(bool *ok) const
{ {
return qNumVariantToHelper<qreal>(d, ok, d.get<qreal>()); return qNumVariantToHelper<qreal>(d, ok);
} }
/*! /*!