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:33 +0200 |
| commit | 8e3e34defd0e19d49be090046ba76decc2adb526 (patch) | |
| tree | 800bc71b7a63e3886eca3e2e01734efc92713f44 /src/gui/text/qtextdocumentlayout.cpp | |
| parent | 1e37d854f71a965ae34c41b7f437683db5e4b6fb (diff) | |
Remove qUpperBound usages from qtbase
Replace them with std::upper_bound; this allows for deprecation of
qUpperBound.
Change-Id: Idef01d2228b9a70eee3d52931d7aedb5bb6ba902
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/gui/text/qtextdocumentlayout.cpp')
| -rw-r--r-- | src/gui/text/qtextdocumentlayout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index 4affbede24..32528ebf14 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -1022,7 +1022,7 @@ void QTextDocumentLayoutPrivate::drawFrame(const QPointF &offset, QPainter *pain firstRow = rowIt - td->rowPositions.constBegin(); } - rowIt = qUpperBound(td->rowPositions.constBegin(), td->rowPositions.constEnd(), QFixed::fromReal(context.clip.bottom() - off.y())); + rowIt = std::upper_bound(td->rowPositions.constBegin(), td->rowPositions.constEnd(), QFixed::fromReal(context.clip.bottom() - off.y())); if (rowIt != td->rowPositions.constEnd()) { ++rowIt; lastRow = rowIt - td->rowPositions.constBegin(); |