diff options
| author | aavit <qt-info@nokia.com> | 2010-09-27 10:16:36 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-09-27 10:16:36 (GMT) |
| commit | 52e36c493d579323a09957028b0fd5ebc4d43021 (patch) | |
| tree | 20e2be544f034222250fa19a4e27e2ee37b958aa /src/corelib/tools/qchar.cpp | |
| parent | c9a5ab5fd506663c5a7cd587d1b963c067d334bf (diff) | |
| parent | ce2a273bab9b9094a1f0f3f60309797e11e59404 (diff) | |
| download | Qt-52e36c493d579323a09957028b0fd5ebc4d43021.zip Qt-52e36c493d579323a09957028b0fd5ebc4d43021.tar.gz Qt-52e36c493d579323a09957028b0fd5ebc4d43021.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/corelib/tools/qchar.cpp')
| -rw-r--r-- | src/corelib/tools/qchar.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp index ed0af4e..bb777cd 100644 --- a/src/corelib/tools/qchar.cpp +++ b/src/corelib/tools/qchar.cpp @@ -1630,21 +1630,4 @@ static void canonicalOrderHelper(QString *str, QChar::UnicodeVersion version, in } } -int QT_FASTCALL QUnicodeTables::script(unsigned int uc) -{ - if (uc > 0xffff) - return Common; - int script = uc_scripts[uc >> 7]; - if (script < ScriptSentinel) - return script; - script = (((script - ScriptSentinel) * UnicodeBlockSize) + UnicodeBlockCount); - script = uc_scripts[script + (uc & 0x7f)]; - return script; -} - -Q_CORE_EXPORT QUnicodeTables::LineBreakClass QT_FASTCALL QUnicodeTables::lineBreakClass(uint ucs4) -{ - return (QUnicodeTables::LineBreakClass) qGetProp(ucs4)->line_break_class; -} - QT_END_NAMESPACE |