diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-09-26 10:29:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 15:35:52 +0200 |
| commit | abe229291b292e1e5d0d07b23c130991b347ae78 (patch) | |
| tree | aec73ea8efed8312e793c65b204cdc223fcca8d3 /src/scripttools/debugging/qscriptsyntaxhighlighter.cpp | |
| parent | eff4a0f3fca2e22d4be888cdd7953e1c2ab8c918 (diff) | |
| download | qtscript-abe229291b292e1e5d0d07b23c130991b347ae78.tar.gz | |
Remove QtAlgorithms usage from QtScript.
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: If4dc8f69fd75315390a4850be732715064f5fdd8
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/scripttools/debugging/qscriptsyntaxhighlighter.cpp')
| -rw-r--r-- | src/scripttools/debugging/qscriptsyntaxhighlighter.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp b/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp index a8ccd95..112b4a9 100644 --- a/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp +++ b/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp @@ -42,6 +42,8 @@ #include "qscriptsyntaxhighlighter_p.h" #include "private/qfunctions_p.h" +#include <algorithm> + #ifndef QT_NO_SYNTAXHIGHLIGHTER QT_BEGIN_NAMESPACE @@ -143,9 +145,11 @@ static bool isKeyword(const QString &word) { const char * const *start = &keywords[0]; const char * const *end = &keywords[MAX_KEYWORD - 1]; - const char * const *kw = qBinaryFind(start, end, KeywordHelper(word)); - return kw != end; + const KeywordHelper keywordHelper(word); + const char * const *kw = std::lower_bound(start, end, keywordHelper); + + return kw != end && !(keywordHelper < *kw); } QScriptSyntaxHighlighter::QScriptSyntaxHighlighter(QTextDocument *document) |