Remove redundant checks in QVariant.
QVariant and QMetaType have aligned type naming implementation. Change-Id: I9eaae1045c492c148e3e9d23f4e04d48272f7ec2 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>bb10
parent
6f0065944d
commit
ab0bcd0792
|
|
@ -1582,9 +1582,6 @@ void QVariant::clear()
|
|||
*/
|
||||
const char *QVariant::typeToName(int typeId)
|
||||
{
|
||||
if (typeId == Invalid)
|
||||
return 0;
|
||||
|
||||
return QMetaType::typeName(typeId);
|
||||
}
|
||||
|
||||
|
|
@ -1598,9 +1595,6 @@ const char *QVariant::typeToName(int typeId)
|
|||
*/
|
||||
QVariant::Type QVariant::nameToType(const char *name)
|
||||
{
|
||||
if (!name || !*name)
|
||||
return Invalid;
|
||||
|
||||
int metaType = QMetaType::type(name);
|
||||
return metaType <= int(UserType) ? QVariant::Type(metaType) : UserType;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue