Fix tst_Moc::oldStyleCasts
authorOlivier Goffart <ogoffart@woboq.com>
Wed, 16 Nov 2011 08:07:24 +0000 (09:07 +0100)
committerQt by Nokia <qt-info@nokia.com>
Thu, 17 Nov 2011 15:13:49 +0000 (16:13 +0100)
This tests that the moc generated file produces no warnings with very
pedentic compilation flags.
In that case, there was a warning because of the use of the C casts

Change-Id: Ie79c6d053ff35c55276a07212c5d60f759f693ee
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
src/corelib/tools/qstring.h

index 0688b98..4e1e67b 100644 (file)
@@ -782,8 +782,8 @@ inline int QString::toWCharArray(wchar_t *array) const
 }
 inline QString QString::fromWCharArray(const wchar_t *string, int size)
 {
-    return sizeof(wchar_t) == sizeof(QChar) ? fromUtf16((const ushort *)string, size)
-                                            : fromUcs4((uint *)string, size);
+    return sizeof(wchar_t) == sizeof(QChar) ? fromUtf16(reinterpret_cast<const ushort *>(string), size)
+                                            : fromUcs4(reinterpret_cast<const uint *>(string), size);
 }