diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2012-09-18 22:41:59 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-19 16:12:30 +0200 |
| commit | 1e37d854f71a965ae34c41b7f437683db5e4b6fb (patch) | |
| tree | 6cea974ef251d4d584ec5487bcca4c83b5080d18 /src/gui/text/qtexttable.cpp | |
| parent | 21d344524355af7baf9f140bd05d3b5e6bdd154d (diff) | |
Remove qLowerBound usages from qtbase
Replace them with std::lower_bound; this allows for deprecation of
qLowerBound.
Change-Id: I536e7338eb85ea6c7c1a5bf23121292767927e0b
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/gui/text/qtexttable.cpp')
| -rw-r--r-- | src/gui/text/qtexttable.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp index 983578a9e1..736b6fc9aa 100644 --- a/src/gui/text/qtexttable.cpp +++ b/src/gui/text/qtexttable.cpp @@ -47,6 +47,7 @@ #include "qvarlengtharray.h" #include "private/qfunctions_p.h" +#include <algorithm> #include <stdlib.h> QT_BEGIN_NAMESPACE @@ -407,7 +408,7 @@ void QTextTablePrivate::fragmentAdded(QChar type, uint fragment) Q_ASSERT(cells.indexOf(fragment) == -1); const uint pos = pieceTable->fragmentMap().position(fragment); QFragmentFindHelper helper(pos, pieceTable->fragmentMap()); - QList<int>::Iterator it = qLowerBound(cells.begin(), cells.end(), helper); + QList<int>::Iterator it = std::lower_bound(cells.begin(), cells.end(), helper); cells.insert(it, fragment); if (!fragment_start || pos < pieceTable->fragmentMap().position(fragment_start)) fragment_start = fragment; @@ -617,7 +618,7 @@ QTextTableCell QTextTable::cellAt(int position) const return QTextTableCell(); QFragmentFindHelper helper(position, map); - QList<int>::ConstIterator it = qLowerBound(d->cells.begin(), d->cells.end(), helper); + QList<int>::ConstIterator it = std::lower_bound(d->cells.begin(), d->cells.end(), helper); if (it != d->cells.begin()) --it; |