diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-06-28 23:19:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-06-29 15:10:14 +0200 |
| commit | 7b46ec16017d5b467b2b04e9d7e27ce1cee8659e (patch) | |
| tree | a4a26bff1329deac642fcd8234d15ffea0519d8e /src/corelib/tools/qchar.h | |
| parent | 28cf5c5356e0591e3d9f31b5df1f69ce9f514ad3 (diff) | |
remove QT3_SUPPORT from corelib/tools
Change-Id: Ie224cf992be675c7d405d4be05e4acd4157e590e
Reviewed-on: http://codereview.qt.nokia.com/863
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Diffstat (limited to 'src/corelib/tools/qchar.h')
| -rw-r--r-- | src/corelib/tools/qchar.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index 3ec53bd18e..b7793403bd 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -89,13 +89,6 @@ public: ObjectReplacementCharacter = 0xfffc, ByteOrderMark = 0xfeff, ByteOrderSwapped = 0xfffe, -#ifdef QT3_SUPPORT - null = Null, - replacement = ReplacementCharacter, - byteOrderMark = ByteOrderMark, - byteOrderSwapped = ByteOrderSwapped, - nbsp = Nbsp, -#endif ParagraphSeparator = 0x2029, LineSeparator = 0x2028 }; @@ -173,10 +166,6 @@ public: Square, Compat, Fraction - -#ifdef QT3_SUPPORT - , Single = NoDecomposition -#endif }; enum Joining @@ -338,22 +327,6 @@ public: static QString QT_FASTCALL decomposition(uint ucs4); -#ifdef QT3_SUPPORT - inline QT3_SUPPORT bool mirrored() const { return hasMirrored(); } - inline QT3_SUPPORT QChar lower() const { return toLower(); } - inline QT3_SUPPORT QChar upper() const { return toUpper(); } - static inline QT3_SUPPORT bool networkOrdered() { - return QSysInfo::ByteOrder == QSysInfo::BigEndian; - } -#ifdef Q_COMPILER_MANGLES_RETURN_TYPE - inline QT3_SUPPORT const char latin1() const { return toLatin1(); } - inline QT3_SUPPORT const char ascii() const { return toAscii(); } -#else - inline QT3_SUPPORT char latin1() const { return toLatin1(); } - inline QT3_SUPPORT char ascii() const { return toAscii(); } -#endif -#endif - private: #ifdef QT_NO_CAST_FROM_ASCII QChar(char c); |