From 1e37d854f71a965ae34c41b7f437683db5e4b6fb Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Tue, 18 Sep 2012 22:41:59 +0100 Subject: Remove qLowerBound usages from qtbase Replace them with std::lower_bound; this allows for deprecation of qLowerBound. Change-Id: I536e7338eb85ea6c7c1a5bf23121292767927e0b Reviewed-by: Marc Mutz Reviewed-by: Robin Burchell --- src/gui/kernel/qshortcutmap.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/gui/kernel') diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index 04a16c57ff..f626d17d82 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -48,6 +48,8 @@ #include "qcoreapplication.h" #include +#include + #ifndef QT_NO_SHORTCUT QT_BEGIN_NAMESPACE @@ -419,7 +421,7 @@ bool QShortcutMap::hasShortcutForKeySequence(const QKeySequence &seq) const Q_D(const QShortcutMap); QShortcutEntry entry(seq); // needed for searching QList::ConstIterator itEnd = d->sequences.constEnd(); - QList::ConstIterator it = qLowerBound(d->sequences.constBegin(), itEnd, entry); + QList::ConstIterator it = std::lower_bound(d->sequences.constBegin(), itEnd, entry); for (;it != itEnd; ++it) { if (matches(entry.keyseq, (*it).keyseq) == QKeySequence::ExactMatch && (*it).correctContext() && (*it).enabled) { @@ -467,7 +469,7 @@ QKeySequence::SequenceMatch QShortcutMap::find(QKeyEvent *e) QShortcutEntry entry(d->newEntries.at(i)); // needed for searching QList::ConstIterator itEnd = d->sequences.constEnd(); QList::ConstIterator it = - qLowerBound(d->sequences.constBegin(), itEnd, entry); + std::lower_bound(d->sequences.constBegin(), itEnd, entry); int oneKSResult = QKeySequence::NoMatch; int tempRes = QKeySequence::NoMatch; -- cgit v1.2.3