From 893a9e1cf8863cd7f70c44da303de16e22b2ae93 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Fri, 20 Sep 2013 16:22:12 +0200 Subject: [PATCH] Remove some qBinaryFind usages from QtWidgets This is done per the mailing list discussion at http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I7e4a5a4010b0ded59dbe2cacc6afe23ae4121bfe Reviewed-by: Andreas Aardal Hanssen --- src/widgets/dialogs/qfilesystemmodel.cpp | 8 +++----- src/widgets/graphicsview/qgraphicsitemanimation.cpp | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp index 53dd01319f..c86c7ff931 100644 --- a/src/widgets/dialogs/qfilesystemmodel.cpp +++ b/src/widgets/dialogs/qfilesystemmodel.cpp @@ -1689,12 +1689,10 @@ void QFileSystemModelPrivate::_q_directoryChanged(const QString &directory, cons std::sort(newFiles.begin(), newFiles.end()); QHash::const_iterator i = parentNode->children.constBegin(); while (i != parentNode->children.constEnd()) { - QStringList::iterator iterator; - iterator = qBinaryFind(newFiles.begin(), newFiles.end(), - i.value()->fileName); - if (iterator == newFiles.end()) { + QStringList::iterator iterator = std::lower_bound(newFiles.begin(), newFiles.end(), i.value()->fileName); + if ((iterator == newFiles.end()) || (i.value()->fileName < *iterator)) toRemove.append(i.value()->fileName); - } + ++i; } for (int i = 0 ; i < toRemove.count() ; ++i ) diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.cpp b/src/widgets/graphicsview/qgraphicsitemanimation.cpp index 55d7ee6d1b..5dc3e1159e 100644 --- a/src/widgets/graphicsview/qgraphicsitemanimation.cpp +++ b/src/widgets/graphicsview/qgraphicsitemanimation.cpp @@ -176,8 +176,8 @@ void QGraphicsItemAnimationPrivate::insertUniquePair(qreal step, qreal value, QL Pair pair(step, value); - QList::iterator result = qBinaryFind(binList->begin(), binList->end(), pair); - if (result != binList->end()) + QList::iterator result = std::lower_bound(binList->begin(), binList->end(), pair); + if ((result != binList->end()) && !(pair < *result)) result->value = value; else { *binList << pair;