Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

reduce the size of private QVariant data

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2020-12-30 20:59:30 +02:00
parent 52fc3ad42d
commit 6456c01da4
4 changed files with 24 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/core/kernel/qvariant.cpp
View file

@ -166,13 +166,13 @@ static void construct(QVariant::Private *x, const void *copy)
break;
#endif
case QVariant::Int:
x->data.i = copy ? *static_cast<const int *>(copy) : 0;
x->data.ll = copy ? *static_cast<const int *>(copy) : 0;
break;
case QVariant::UInt:
x->data.u = copy ? *static_cast<const uint *>(copy) : 0u;
x->data.ull = copy ? *static_cast<const uint *>(copy) : 0u;
break;
case QVariant::Bool:
x->data.b = copy ? *static_cast<const bool *>(copy) : false;
x->data.ull = copy ? *static_cast<const bool *>(copy) : false;
break;
case QVariant::Double:
x->data.d = copy ? *static_cast<const double*>(copy) : 0.0;
@ -459,15 +459,15 @@ static bool compare(const QVariant::Private *a, const QVariant::Private *b)
return *v_cast<QRegExp>(a) == *v_cast<QRegExp>(b);
#endif
case QVariant::Int:
return a->data.i == b->data.i;
case QVariant::UInt:
return a->data.u == b->data.u;
return int(a->data.ll) == int(b->data.ll);
case QVariant::LongLong:
return a->data.ll == b->data.ll;
case QVariant::UInt:
return uint(a->data.ull) == uint(b->data.ull);
case QVariant::ULongLong:
return a->data.ull == b->data.ull;
case QVariant::Bool:
return a->data.b == b->data.b;
return bool(a->data.ull) == bool(b->data.ull);
case QVariant::Double:
return a->data.d == b->data.d;
case QVariant::Float:
@ -540,7 +540,7 @@ static qlonglong qMetaTypeNumber(const QVariant::Private *d)
{
switch (d->type) {
case QMetaType::Int:
return d->data.i;
return qlonglong(int(d->data.ll));
case QMetaType::LongLong:
return d->data.ll;
case QMetaType::Char:
@ -566,7 +566,7 @@ static qulonglong qMetaTypeUNumber(const QVariant::Private *d)
{
switch (d->type) {
case QVariant::UInt:
return d->data.u;
return qulonglong(uint(d->data.ull));
case QVariant::ULongLong:
return d->data.ull;
case QMetaType::UChar:
@ -592,7 +592,7 @@ static qlonglong qConvertToNumber(const QVariant::Private *d, bool *ok)
case QVariant::ByteArray:
return v_cast<QByteArray>(d)->toLongLong(ok);
case QVariant::Bool:
return qlonglong(d->data.b);
return qlonglong(d->data.ull);
#ifndef QT_BOOTSTRAPPED
case QVariant::JsonValue:
if (!v_cast<QJsonValue>(d)->isDouble())
@ -631,7 +631,7 @@ static qulonglong qConvertToUnsignedNumber(const QVariant::Private *d, bool *ok)
case QVariant::ByteArray:
return v_cast<QByteArray>(d)->toULongLong(ok);
case QVariant::Bool:
return qulonglong(d->data.b);
return qulonglong(bool(d->data.ull));
#ifndef QT_BOOTSTRAPPED
case QVariant::JsonValue:
if (!v_cast<QJsonValue>(d)->isDouble())
@ -730,7 +730,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result,
return true;
#endif
case QVariant::Bool:
*str = QLatin1String(d->data.b ? "true" : "false");
*str = QLatin1String(bool(d->data.ull) ? "true" : "false");
return true;
case QVariant::ByteArray:
*str = QString::fromAscii(v_cast<QByteArray>(d)->constData());
@ -905,7 +905,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result,
*static_cast<QByteArray *>(result) = QByteArray::number(qMetaTypeUNumber(d));
return true;
case QVariant::Bool:
*static_cast<QByteArray *>(result) = QByteArray(d->data.b ? "true" : "false");
*static_cast<QByteArray *>(result) = QByteArray(bool(d->data.ull) ? "true" : "false");
return true;
default:
return false;
@ -989,7 +989,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result,
*static_cast<double *>(result) = v_cast<QByteArray>(d)->toDouble(ok);
return *ok;
case QVariant::Bool:
*static_cast<double *>(result) = double(d->data.b);
*static_cast<double *>(result) = double(bool(d->data.ull));
return true;
case QVariant::Float:
*static_cast<double *>(result) = double(d->data.f);
@ -1029,7 +1029,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result,
*static_cast<float *>(result) = v_cast<QByteArray>(d)->toFloat(ok);
return *ok;
case QVariant::Bool:
*static_cast<float *>(result) = float(d->data.b);
*static_cast<float *>(result) = float(bool(d->data.ull));
return true;
case QVariant::Double:
*static_cast<float *>(result) = float(d->data.d);
@ -1799,15 +1799,15 @@ QVariant::QVariant(int typeOrUserType, const void *copy, uint flags)
}
QVariant::QVariant(int val)
{ d.is_null = false; d.type = Int; d.data.i = val; }
{ d.is_null = false; d.type = Int; d.data.ll = val; }
QVariant::QVariant(uint val)
{ d.is_null = false; d.type = UInt; d.data.u = val; }
{ d.is_null = false; d.type = UInt; d.data.ull = val; }
QVariant::QVariant(qlonglong val)
{ d.is_null = false; d.type = LongLong; d.data.ll = val; }
QVariant::QVariant(qulonglong val)
{ d.is_null = false; d.type = ULongLong; d.data.ull = val; }
QVariant::QVariant(bool val)
{ d.is_null = false; d.type = Bool; d.data.b = val; }
{ d.is_null = false; d.type = Bool; d.data.ull = val; }
QVariant::QVariant(double val)
{ d.is_null = false; d.type = Double; d.data.d = val; }
QVariant::QVariant(float val)
@ -2546,7 +2546,7 @@ inline T qNumVariantToHelper(const QVariant::Private &d,
*/
int QVariant::toInt(bool *ok) const
{
return qNumVariantToHelper<int>(d, handler, ok, d.data.i);
return qNumVariantToHelper<int>(d, handler, ok, int(d.data.ll));
}
/*!
@ -2566,7 +2566,7 @@ int QVariant::toInt(bool *ok) const
*/
uint QVariant::toUInt(bool *ok) const
{
return qNumVariantToHelper<uint>(d, handler, ok, d.data.u);
return qNumVariantToHelper<uint>(d, handler, ok, uint(d.data.ull));
}
/*!
@ -2614,7 +2614,7 @@ qulonglong QVariant::toULongLong(bool *ok) const
bool QVariant::toBool() const
{
if (d.type == Bool)
return d.data.b;
return bool(d.data.ull);
bool res = false;
handler->convert(&d, Bool, &res, 0);

4
src/core/kernel/qvariant.h
View file

@ -320,10 +320,6 @@ class Q_CORE_EXPORT QVariant
{}
union Data
{
char c;
int i;
uint u;
bool b;
double d;
float f;
qreal real;

4
src/core/kernel/qvariant_p.h
View file

@ -57,7 +57,7 @@ inline const T *v_cast(const QVariant::Private *d)
{
return ((sizeof(T) > sizeof(QVariant::Private::Data))
? static_cast<const T *>(d->data.shared->ptr)
: static_cast<const T *>(static_cast<const void *>(&d->data.c)));
: static_cast<const T *>(static_cast<const void *>(&d->data.ptr)));
}
template <typename T>
@ -65,7 +65,7 @@ inline T *v_cast(QVariant::Private *d)
{
return ((sizeof(T) > sizeof(QVariant::Private::Data))
? static_cast<T *>(d->data.shared->ptr)
: static_cast<T *>(static_cast<void *>(&d->data.c)));
: static_cast<T *>(static_cast<void *>(&d->data.ptr)));
}
//a simple template that avoids to allocate 2 memory chunks when creating a QVariant

2
src/gui/kernel/qguivariant.cpp
View file

@ -494,7 +494,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t,
*seq = QKeySequence(*v_cast<QString>(d));
return true;
case QVariant::Int:
*seq = QKeySequence(d->data.i);
*seq = QKeySequence(int(d->data.ll));
return true;
default:
break;