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 | |
| 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')
| -rw-r--r-- | src/gui/text/qtextdocumentlayout.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 7 | ||||
| -rw-r--r-- | src/gui/text/qtexttable.cpp | 2 |
3 files changed, 6 insertions, 5 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(); diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index a07c562aca..e4572e77a2 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -58,6 +58,7 @@ #include "qrawfont_p.h" #include <qguiapplication.h> #include <qinputmethod.h> +#include <algorithm> #include <stdlib.h> #include "qfontengine_qpa_p.h" @@ -2552,8 +2553,8 @@ void QTextEngine::setBoundary(int strPos) const if (strPos <= 0 || strPos >= layoutData->string.length()) return; - const QScriptItem* it = qUpperBound(layoutData->items.constBegin(), layoutData->items.constEnd(), - strPos, QScriptItemComparator()); + const QScriptItem* it = std::upper_bound(layoutData->items.constBegin(), layoutData->items.constEnd(), + strPos, QScriptItemComparator()); Q_ASSERT(it > layoutData->items.constBegin()); --it; if (it->position == strPos) { @@ -2743,7 +2744,7 @@ void QTextEngine::resolveAdditionalFormats() const while (startIt != addFormatSortedByStart.end() && specialData->addFormats.at(*startIt).start <= si->position) { - currentFormats.insert(qUpperBound(currentFormats.begin(), currentFormats.end(), *startIt), + currentFormats.insert(std::upper_bound(currentFormats.begin(), currentFormats.end(), *startIt), *startIt); ++startIt; } diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp index 736b6fc9aa..a3157e163c 100644 --- a/src/gui/text/qtexttable.cpp +++ b/src/gui/text/qtexttable.cpp @@ -1212,7 +1212,7 @@ void QTextTable::splitCell(int row, int column, int numRows, int numCols) for (int r = row + 1; r < row + rowSpan; ++r) { // find the cell before which to insert the new cell markers int gridIndex = r * d->nCols + column; - QVector<int>::iterator it = qUpperBound(d->cellIndices.begin(), d->cellIndices.end(), gridIndex); + QVector<int>::iterator it = std::upper_bound(d->cellIndices.begin(), d->cellIndices.end(), gridIndex); int cellIndex = it - d->cellIndices.begin(); int fragment = d->cells.value(cellIndex, d->fragment_end); rowPositions[r - row] = p->fragmentMap().position(fragment); |