From 0c0676ada2cc3943d09f8eb1e75491b80f08f27b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 8 Jul 2011 15:49:26 +0200 Subject: Remove #ifdef for platforms where QChar was packed -- there aren't any On ARM OABI, sizeof(QChar) was 4, so we used to pack it so QChar[] was isomorphic to ushort[]. We don't support the OABI anymore and the EABI does the right thing. Change-Id: I181dd2f169f6868450302e269ef9ad5d643f306f Merge-request: 13 Reviewed-by: Olivier Goffart Reviewed-on: http://codereview.qt.nokia.com/1386 Reviewed-by: Qt Sanity Bot --- src/corelib/tools/qchar.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/corelib/tools/qchar.h') diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index cd30dace09..d6db72d5ac 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -228,11 +228,7 @@ public: char toAscii() const; inline char toLatin1() const; inline ushort unicode() const { return ucs; } -#ifdef Q_NO_PACKED_REFERENCE - inline ushort &unicode() { return const_cast(ucs); } -#else inline ushort &unicode() { return ucs; } -#endif static QChar fromAscii(char c); static QChar fromLatin1(char c); -- cgit v1.2.3