Remove redundant check in QMetaType::typeInfo
The check was introduced when void was not a fully defined type. Change-Id: I4df8607999436f8db92be77fc8fd203fc66c2816 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
parent
ab0bcd0792
commit
9ecce11261
@ -1623,7 +1623,6 @@ public:
|
||||
}
|
||||
template<typename T>
|
||||
void delegate(const T*) { TypeInfoImpl<T>(m_type, info); }
|
||||
void delegate(const void*) {}
|
||||
void delegate(const QMetaTypeSwitcher::UnknownType*) {}
|
||||
void delegate(const QMetaTypeSwitcher::NotBuiltinType*) { customTypeInfo(m_type); }
|
||||
private:
|
||||
@ -1645,7 +1644,7 @@ QMetaType QMetaType::typeInfo(const int type)
|
||||
{
|
||||
TypeInfo typeInfo(type);
|
||||
QMetaTypeSwitcher::switcher<void>(typeInfo, type, 0);
|
||||
return typeInfo.info.creator || type == Void ? QMetaType(QMetaType::NoExtensionFlags
|
||||
return typeInfo.info.creator ? QMetaType(QMetaType::NoExtensionFlags
|
||||
, static_cast<const QMetaTypeInterface *>(0) // typeInfo::info is a temporary variable, we can't return address of it.
|
||||
, typeInfo.info.creator
|
||||
, typeInfo.info.deleter
|
||||
|
Loading…
Reference in New Issue
Block a user