diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-19 15:51:34 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-19 16:06:36 +0200 |
commit | 0b6d4a2d65536670423778f53269026b12552017 (patch) | |
tree | 6b2ea4683824e4d09d44b77cdfd2a03ee67d53be /src | |
parent | 6c4aa14ecc6a1be7ea27dadda9e289c27c37f9b9 (diff) |
Metatype: Silence MSVC warnings about unused variables.
Turn around if's.
Change-Id: Ica6f7f54098a567816ce3918f6fe5d8d2c072e01
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/kernel/qmetatype.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 660807c698..156c52bce2 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -152,24 +152,24 @@ void qMetaTypeDeleteHelper(T *t) template <typename T> void *qMetaTypeCreateHelper(const T *t) { - if (!t) - return new T(); - return new T(*static_cast<const T*>(t)); + if (t) + return new T(*static_cast<const T*>(t)); + return new T(); } template <typename T> void qMetaTypeDestructHelper(T *t) { + Q_UNUSED(t) // Silence MSVC that warns for POD types. t->~T(); } template <typename T> void *qMetaTypeConstructHelper(void *where, const T *t) { - if (!t) - return new (where) T; - else + if (t) return new (where) T(*static_cast<const T*>(t)); + return new (where) T; } #ifndef QT_NO_DATASTREAM |