diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-06 11:55:39 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-07 20:35:05 +0200 |
commit | 471e4fcb226c4523efe93b1bdaf0db026495da94 (patch) | |
tree | bb963937b2446eb32d7632568433083a386f2c68 /src/gui/text/qtextdocumentlayout.cpp | |
parent | 7f400522c39f6a1abf083dc1af49ea3109635cc8 (diff) |
Use QList instead of QVector in gui implementation
Task-number: QTBUG-84469
Change-Id: I366e845249203d80d640355a7780ac2f91a762f1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/gui/text/qtextdocumentlayout.cpp')
-rw-r--r-- | src/gui/text/qtextdocumentlayout.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index fc61ee50bb..d6e2441862 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -107,7 +107,7 @@ public: bool layoutDirty; bool fullLayoutCompleted; - QVector<QPointer<QTextFrame> > floats; + QList<QPointer<QTextFrame>> floats; }; QTextFrameData::QTextFrameData() @@ -205,14 +205,14 @@ class QTextTableData : public QTextFrameData public: QFixed cellSpacing, cellPadding; qreal deviceScale; - QVector<QFixed> minWidths; - QVector<QFixed> maxWidths; - QVector<QFixed> widths; - QVector<QFixed> heights; - QVector<QFixed> columnPositions; - QVector<QFixed> rowPositions; + QList<QFixed> minWidths; + QList<QFixed> maxWidths; + QList<QFixed> widths; + QList<QFixed> heights; + QList<QFixed> columnPositions; + QList<QFixed> rowPositions; - QVector<QFixed> cellVerticalOffsets; + QList<QFixed> cellVerticalOffsets; // without borderCollapse, those equal QTextFrameData::border; // otherwise the widest outermost cell edge will be used @@ -585,7 +585,7 @@ public: void floatMargins(const QFixed &y, const QTextLayoutStruct *layoutStruct, QFixed *left, QFixed *right) const; QFixed findY(QFixed yFrom, const QTextLayoutStruct *layoutStruct, QFixed requiredWidth) const; - QVector<QCheckPoint> checkPoints; + QList<QCheckPoint> checkPoints; QTextFrame::Iterator frameIteratorForYPosition(QFixed y) const; QTextFrame::Iterator frameIteratorForTextPosition(int position) const; @@ -623,7 +623,7 @@ QTextFrame::Iterator QTextDocumentLayoutPrivate::frameIteratorForYPosition(QFixe || y < 0 || y > data(rootFrame)->size.height) return rootFrame->begin(); - QVector<QCheckPoint>::ConstIterator checkPoint = std::lower_bound(checkPoints.begin(), checkPoints.end(), y); + auto checkPoint = std::lower_bound(checkPoints.begin(), checkPoints.end(), y); if (checkPoint == checkPoints.end()) return rootFrame->begin(); @@ -792,14 +792,14 @@ QTextDocumentLayoutPrivate::hitTest(QTextTable *table, const QFixedPoint &point, { QTextTableData *td = static_cast<QTextTableData *>(data(table)); - QVector<QFixed>::ConstIterator rowIt = std::lower_bound(td->rowPositions.constBegin(), td->rowPositions.constEnd(), point.y); + auto rowIt = std::lower_bound(td->rowPositions.constBegin(), td->rowPositions.constEnd(), point.y); if (rowIt == td->rowPositions.constEnd()) { rowIt = td->rowPositions.constEnd() - 1; } else if (rowIt != td->rowPositions.constBegin()) { --rowIt; } - QVector<QFixed>::ConstIterator colIt = std::lower_bound(td->columnPositions.constBegin(), td->columnPositions.constEnd(), point.x); + auto colIt = std::lower_bound(td->columnPositions.constBegin(), td->columnPositions.constEnd(), point.x); if (colIt == td->columnPositions.constEnd()) { colIt = td->columnPositions.constEnd() - 1; } else if (colIt != td->columnPositions.constBegin()) { @@ -1169,7 +1169,7 @@ void QTextDocumentLayoutPrivate::drawFrame(const QPointF &offset, QPainter *pain int lastRow = rows; if (context.clip.isValid()) { - QVector<QFixed>::ConstIterator rowIt = std::lower_bound(td->rowPositions.constBegin(), td->rowPositions.constEnd(), QFixed::fromReal(context.clip.top() - off.y())); + auto rowIt = std::lower_bound(td->rowPositions.constBegin(), td->rowPositions.constEnd(), QFixed::fromReal(context.clip.top() - off.y())); if (rowIt != td->rowPositions.constEnd() && rowIt != td->rowPositions.constBegin()) { --rowIt; firstRow = rowIt - td->rowPositions.constBegin(); @@ -1949,7 +1949,7 @@ void QTextDocumentLayoutPrivate::drawFlow(const QPointF &offset, QPainter *paint Q_Q(const QTextDocumentLayout); const bool inRootFrame = (!it.atEnd() && it.parentFrame() && it.parentFrame()->parentFrame() == nullptr); - QVector<QCheckPoint>::ConstIterator lastVisibleCheckPoint = checkPoints.end(); + auto lastVisibleCheckPoint = checkPoints.end(); if (inRootFrame && context.clip.isValid()) { lastVisibleCheckPoint = std::lower_bound(checkPoints.begin(), checkPoints.end(), QFixed::fromReal(context.clip.bottom())); } @@ -2048,7 +2048,7 @@ void QTextDocumentLayoutPrivate::drawBlock(const QPointF &offset, QPainter *pain fillBackground(painter, rect, bg, r.topLeft()); } - QVector<QTextLayout::FormatRange> selections; + QList<QTextLayout::FormatRange> selections; int blpos = bl.position(); int bllen = bl.length(); const QTextCharFormat *selFormat = nullptr; @@ -2402,7 +2402,7 @@ QRectF QTextDocumentLayoutPrivate::layoutTable(QTextTable *table, int layoutFrom } } - QVector<QTextLength> columnWidthConstraints = fmt.columnWidthConstraints(); + QList<QTextLength> columnWidthConstraints = fmt.columnWidthConstraints(); if (columnWidthConstraints.size() != columns) columnWidthConstraints.resize(columns); Q_ASSERT(columnWidthConstraints.count() == columns); @@ -2666,14 +2666,14 @@ recalc_minmax_widths: bool haveRowSpannedCells = false; // need to keep track of cell heights for vertical alignment - QVector<QFixed> cellHeights; + QList<QFixed> cellHeights; cellHeights.reserve(rows * columns); QFixed pageHeight = QFixed::fromReal(document->pageSize().height()); if (pageHeight <= 0) pageHeight = QFIXED_MAX; - QVector<QFixed> heightToDistribute; + QList<QFixed> heightToDistribute; heightToDistribute.resize(columns); td->headerHeight = 0; @@ -3093,7 +3093,7 @@ void QTextDocumentLayoutPrivate::layoutFlow(QTextFrame::Iterator it, QTextLayout bool redoCheckPoints = layoutStruct->fullLayout || checkPoints.isEmpty(); if (!redoCheckPoints) { - QVector<QCheckPoint>::Iterator checkPoint = std::lower_bound(checkPoints.begin(), checkPoints.end(), layoutFrom); + auto checkPoint = std::lower_bound(checkPoints.begin(), checkPoints.end(), layoutFrom); if (checkPoint != checkPoints.end()) { if (checkPoint != checkPoints.begin()) --checkPoint; |