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 | 893a9e1cf8863cd7f70c44da303de16e22b2ae93 (patch) | |
tree | 88b7592f5c14b2bbd164dc1ea782e486295fc3a8 /src/widgets | |
parent | bacbf1fcf35afcece74270fda5521d43b039ee48 (diff) |
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 <andreas@hanssen.name>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/dialogs/qfilesystemmodel.cpp | 8 | ||||
-rw-r--r-- | 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<QString, QFileSystemNode*>::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<Pair>::iterator result = qBinaryFind(binList->begin(), binList->end(), pair); - if (result != binList->end()) + QList<Pair>::iterator result = std::lower_bound(binList->begin(), binList->end(), pair); + if ((result != binList->end()) && !(pair < *result)) result->value = value; else { *binList << pair; |