whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify the QVariant copy constructor and assignment operator 

Change-Id: Id517dfc220adf06c5852745c92cfbe5e9c2e94a3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Lars Knoll 2020-07-10 13:21:07 +02:00
parent 0daa9dbfc4
commit cb17157b27
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1715,10 +1715,11 @@ QVariant::QVariant(const QVariant &p)
{
if (d.is_shared) {
d.data.shared->ref.ref();
} else if (d.type().isValid()) {
customConstruct(&d, p.constData());
d.is_null = p.d.is_null;
return;
}
QMetaType t = d.type();
if (t.isValid())
t.construct(&d, p.constData());
}
#ifndef QT_NO_DATASTREAM
@ -2200,8 +2201,9 @@ QVariant& QVariant::operator=(const QVariant &variant)
d = variant.d;
} else {
d = variant.d;
customConstruct(&d, reinterpret_cast<const void *>(&variant.d.data));
d.is_null = variant.d.is_null;
QMetaType t = d.type();
if (t.isValid())
t.construct(&d, variant.constData());
}
return *this;