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-23 21:20:47 +0200 |
| commit | bacbf1fcf35afcece74270fda5521d43b039ee48 (patch) | |
| tree | ced3c76a8275c976a54847e9df542077996c68f5 /src/gui/text/qtexthtmlparser.cpp | |
| parent | cc778e1d2108806ef5d14b87eddd3ce8999c27ee (diff) | |
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 <gunnar.sletta@digia.com>
Diffstat (limited to 'src/gui/text/qtexthtmlparser.cpp')
| -rw-r--r-- | src/gui/text/qtexthtmlparser.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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 <algorithm> + #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; } |