diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-04-03 15:33:47 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-18 12:16:20 +0200 |
| commit | 9ecce11261e35686afa736bd31431386c89f59ec (patch) | |
| tree | 8ad14a557c237817ee87a152a0cac31cc24efbbf /src | |
| parent | ab0bcd0792af76a938f8665c9c1082d9b9eb3c3a (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 1207d995b0..53b22958c3 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -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 |