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/qcssparser.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/qcssparser.cpp')
| -rw-r--r-- | src/gui/text/qcssparser.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp index b486ec05fa..7a96fbe88b 100644 --- a/src/gui/text/qcssparser.cpp +++ b/src/gui/text/qcssparser.cpp @@ -51,6 +51,8 @@ #include <qimagereader.h> #include "private/qfunctions_p.h" +#include <algorithm> + #ifndef QT_NO_CSSPARSER QT_BEGIN_NAMESPACE @@ -358,8 +360,8 @@ Q_STATIC_GLOBAL_OPERATOR bool operator<(const QCssKnownValue &prop, const QStrin static quint64 findKnownValue(const QString &name, const QCssKnownValue *start, int numValues) { const QCssKnownValue *end = &start[numValues - 1]; - const QCssKnownValue *prop = qBinaryFind(start, end, name); - if (prop == end) + const QCssKnownValue *prop = std::lower_bound(start, end, name); + if ((prop == end) || (name < *prop)) return 0; return prop->id; } |