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/qtexthtmlparser.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/gui/text/qtexthtmlparser.cpp') diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp index e99ba49107..c177fa0810 100644 --- a/src/gui/text/qtexthtmlparser.cpp +++ b/src/gui/text/qtexthtmlparser.cpp @@ -55,6 +55,8 @@ #include "qfont_p.h" #include "private/qfunctions_p.h" +#include + #ifndef QT_NO_TEXTHTMLPARSER QT_BEGIN_NAMESPACE @@ -336,8 +338,8 @@ static QChar resolveEntity(const QString &entity) { const QTextHtmlEntity *start = &entities[0]; const QTextHtmlEntity *end = &entities[MAX_ENTITY]; - const QTextHtmlEntity *e = qBinaryFind(start, end, entity); - if (e == end) + const QTextHtmlEntity *e = std::lower_bound(start, end, entity); + if (e == end || (entity < *e)) return QChar(); return e->code; } @@ -456,8 +458,8 @@ static const QTextHtmlElement *lookupElementHelper(const QString &element) { const QTextHtmlElement *start = &elements[0]; const QTextHtmlElement *end = &elements[Html_NumElements]; - const QTextHtmlElement *e = qBinaryFind(start, end, element); - if (e == end) + const QTextHtmlElement *e = std::lower_bound(start, end, element); + if ((e == end) || (element < *e)) return 0; return e; } -- cgit v1.2.3