From bacbf1fcf35afcece74270fda5521d43b039ee48 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Fri, 20 Sep 2013 16:22:12 +0200 Subject: Remove some qBinaryFind usages from QtGui This is done per the mailing list discussion at http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: Iecb921cd778571d24680254566e9aa8fc8d5edff Reviewed-by: Gunnar Sletta --- src/gui/text/qfontsubset.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/text/qfontsubset.cpp') diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp index 01ae5888e2..152e15a54d 100644 --- a/src/gui/text/qfontsubset.cpp +++ b/src/gui/text/qfontsubset.cpp @@ -101,8 +101,8 @@ QByteArray QFontSubset::glyphName(unsigned short unicode, bool symbol) // map from latin1 to symbol unicode = symbol_map[unicode]; - const AGLEntry *r = qBinaryFind(unicode_to_agl_map, unicode_to_agl_map + unicode_to_agl_map_size, unicode); - if (r != unicode_to_agl_map + unicode_to_agl_map_size) + const AGLEntry *r = std::lower_bound(unicode_to_agl_map, unicode_to_agl_map + unicode_to_agl_map_size, unicode); + if ((r != unicode_to_agl_map + unicode_to_agl_map_size) && !(unicode < *r)) return glyph_names + r->index; char buffer[8]; -- cgit v1.2.3