diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-20 16:22:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 23:45:35 +0200 |
| commit | 73637b7d1a01ca7db5fabe9a6fd5107bafd3c4c6 (patch) | |
| tree | 8ed5edeac8d56ec0a8741f8824c9d8948a9757db /src/corelib/tools/qchar.cpp | |
| parent | 6a12da7fb3b78335ee4c39949381380b5a3325f9 (diff) | |
Remove qBinaryFind usages from bootstrapped files
This is done per the mailing list discussion at
http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I492b49553bc889892f5ca0c47aa13c75e11518e2
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/tools/qchar.cpp')
| -rw-r--r-- | src/corelib/tools/qchar.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp index dbd8a81b92..5de06d8c4a 100644 --- a/src/corelib/tools/qchar.cpp +++ b/src/corelib/tools/qchar.cpp @@ -54,6 +54,8 @@ #include "qunicodetables_p.h" #include "qunicodetables.cpp" +#include <algorithm> + QT_BEGIN_NAMESPACE #define FLAG(x) (1 << (x)) @@ -1719,13 +1721,13 @@ static uint inline ligatureHelper(uint u1, uint u2) ushort length = *ligatures++; if (QChar::requiresSurrogates(u1)) { const UCS2SurrogatePair *data = reinterpret_cast<const UCS2SurrogatePair *>(ligatures); - const UCS2SurrogatePair *r = qBinaryFind(data, data + length, u1); - if (r != data + length) + const UCS2SurrogatePair *r = std::lower_bound(data, data + length, u1); + if (r != data + length && QChar::surrogateToUcs4(r->p1.u1, r->p1.u2) == u1) return QChar::surrogateToUcs4(r->p2.u1, r->p2.u2); } else { const UCS2Pair *data = reinterpret_cast<const UCS2Pair *>(ligatures); - const UCS2Pair *r = qBinaryFind(data, data + length, ushort(u1)); - if (r != data + length) + const UCS2Pair *r = std::lower_bound(data, data + length, ushort(u1)); + if (r != data + length && r->u1 == ushort(u1)) return r->u2; } |