QTextLayout optimization: avoid calling [] when at() will do
The 'lines' and 'items' containers are both declared mutable, so [] detaches even in const functions. Change-Id: I29ac74302af2fab390b3cf3f9d05ea2cace6840b Reviewed-by: Marc Mutz <marc.mutz@kdab.com>bb10
David Faure
parent
4a67066f14
commit
411398aab4
|
|
@ -167,7 +167,7 @@ QRectF QTextInlineObject::rect() const
|
|||
*/
|
||||
qreal QTextInlineObject::width() const
|
||||
{
|
||||
return eng->layoutData->items[itm].width.toReal();
|
||||
return eng->layoutData->items.at(itm).width.toReal();
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
@ -177,7 +177,7 @@ qreal QTextInlineObject::width() const
|
|||
*/
|
||||
qreal QTextInlineObject::ascent() const
|
||||
{
|
||||
return eng->layoutData->items[itm].ascent.toReal();
|
||||
return eng->layoutData->items.at(itm).ascent.toReal();
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
@ -187,7 +187,7 @@ qreal QTextInlineObject::ascent() const
|
|||
*/
|
||||
qreal QTextInlineObject::descent() const
|
||||
{
|
||||
return eng->layoutData->items[itm].descent.toReal();
|
||||
return eng->layoutData->items.at(itm).descent.toReal();
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
@ -198,7 +198,7 @@ qreal QTextInlineObject::descent() const
|
|||
*/
|
||||
qreal QTextInlineObject::height() const
|
||||
{
|
||||
return eng->layoutData->items[itm].height().toReal();
|
||||
return eng->layoutData->items.at(itm).height().toReal();
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
@ -918,7 +918,7 @@ QRectF QTextLayout::boundingRect() const
|
|||
QFixed ymin = d->lines.at(0).y;
|
||||
|
||||
for (int i = 0; i < d->lines.size(); ++i) {
|
||||
const QScriptLine &si = d->lines[i];
|
||||
const QScriptLine &si = d->lines.at(i);
|
||||
xmin = qMin(xmin, si.x);
|
||||
ymin = qMin(ymin, si.y);
|
||||
QFixed lineWidth = si.width < QFIXED_MAX ? qMax(si.width, si.textWidth) : si.textWidth;
|
||||
|
|
@ -1046,9 +1046,9 @@ QList<QGlyphRun> QTextLayout::glyphRuns(int from, int length) const
|
|||
|
||||
QHash<QPair<QFontEngine *, int>, QGlyphRun> glyphRunHash;
|
||||
for (int i=0; i<d->lines.size(); ++i) {
|
||||
if (d->lines[i].from > from + length)
|
||||
if (d->lines.at(i).from > from + length)
|
||||
break;
|
||||
else if (d->lines[i].from + d->lines[i].length >= from) {
|
||||
else if (d->lines.at(i).from + d->lines[i].length >= from) {
|
||||
QList<QGlyphRun> glyphRuns = QTextLine(i, d).glyphRuns(from, length);
|
||||
|
||||
for (int j = 0; j < glyphRuns.size(); j++) {
|
||||
|
|
@ -1109,7 +1109,7 @@ void QTextLayout::draw(QPainter *p, const QPointF &pos, const QVector<FormatRang
|
|||
int lastLine = d->lines.size();
|
||||
for (int i = 0; i < d->lines.size(); ++i) {
|
||||
QTextLine l(i, d);
|
||||
const QScriptLine &sl = d->lines[i];
|
||||
const QScriptLine &sl = d->lines.at(i);
|
||||
|
||||
if (sl.y > clipe) {
|
||||
lastLine = i;
|
||||
|
|
@ -1131,7 +1131,7 @@ void QTextLayout::draw(QPainter *p, const QPointF &pos, const QVector<FormatRang
|
|||
region.setFillRule(Qt::WindingFill);
|
||||
|
||||
for (int line = firstLine; line < lastLine; ++line) {
|
||||
const QScriptLine &sl = d->lines[line];
|
||||
const QScriptLine &sl = d->lines.at(line);
|
||||
QTextLine tl(line, d);
|
||||
|
||||
QRectF lineRect(tl.naturalTextRect());
|
||||
|
|
@ -1296,7 +1296,7 @@ void QTextLayout::drawCursor(QPainter *p, const QPointF &pos, int cursorPosition
|
|||
return;
|
||||
|
||||
QTextLine l(line, d);
|
||||
const QScriptLine &sl = d->lines[line];
|
||||
const QScriptLine &sl = d->lines.at(line);
|
||||
|
||||
qreal x = position.x() + l.cursorToX(cursorPosition);
|
||||
|
||||
|
|
@ -1409,7 +1409,7 @@ void QTextLayout::drawCursor(QPainter *p, const QPointF &pos, int cursorPosition
|
|||
*/
|
||||
QRectF QTextLine::rect() const
|
||||
{
|
||||
const QScriptLine& sl = eng->lines[index];
|
||||
const QScriptLine& sl = eng->lines.at(index);
|
||||
return QRectF(sl.x.toReal(), sl.y.toReal(), sl.width.toReal(), sl.height().toReal());
|
||||
}
|
||||
|
||||
|
|
@ -1418,7 +1418,7 @@ QRectF QTextLine::rect() const
|
|||
*/
|
||||
QRectF QTextLine::naturalTextRect() const
|
||||
{
|
||||
const QScriptLine& sl = eng->lines[index];
|
||||
const QScriptLine& sl = eng->lines.at(index);
|
||||
QFixed x = sl.x + eng->alignLine(sl);
|
||||
|
||||
QFixed width = sl.textWidth;
|
||||
|
|
@ -1435,7 +1435,7 @@ QRectF QTextLine::naturalTextRect() const
|
|||
*/
|
||||
qreal QTextLine::x() const
|
||||
{
|
||||
return eng->lines[index].x.toReal();
|
||||
return eng->lines.at(index).x.toReal();
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
@ -1445,7 +1445,7 @@ qreal QTextLine::x() const
|
|||
*/
|
||||
qreal QTextLine::y() const
|
||||
{
|
||||
return eng->lines[index].y.toReal();
|
||||
return eng->lines.at(index).y.toReal();
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
@ -1455,7 +1455,7 @@ qreal QTextLine::y() const
|
|||
*/
|
||||
qreal QTextLine::width() const
|
||||
{
|
||||
return eng->lines[index].width.toReal();
|
||||
return eng->lines.at(index).width.toReal();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1466,7 +1466,7 @@ qreal QTextLine::width() const
|
|||
*/
|
||||
qreal QTextLine::ascent() const
|
||||
{
|
||||
return eng->lines[index].ascent.toReal();
|
||||
return eng->lines.at(index).ascent.toReal();
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
@ -1476,7 +1476,7 @@ qreal QTextLine::ascent() const
|
|||
*/
|
||||
qreal QTextLine::descent() const
|
||||
{
|
||||
return eng->lines[index].descent.toReal();
|
||||
return eng->lines.at(index).descent.toReal();
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
@ -1488,7 +1488,7 @@ qreal QTextLine::descent() const
|
|||
*/
|
||||
qreal QTextLine::height() const
|
||||
{
|
||||
return eng->lines[index].height().ceil().toReal();
|
||||
return eng->lines.at(index).height().ceil().toReal();
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
@ -1500,7 +1500,7 @@ qreal QTextLine::height() const
|
|||
*/
|
||||
qreal QTextLine::leading() const
|
||||
{
|
||||
return eng->lines[index].leading.toReal();
|
||||
return eng->lines.at(index).leading.toReal();
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
@ -1535,7 +1535,7 @@ void QTextLine::setLeadingIncluded(bool included)
|
|||
*/
|
||||
bool QTextLine::leadingIncluded() const
|
||||
{
|
||||
return eng->lines[index].leadingIncluded;
|
||||
return eng->lines.at(index).leadingIncluded;
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
@ -1545,7 +1545,7 @@ bool QTextLine::leadingIncluded() const
|
|||
*/
|
||||
qreal QTextLine::naturalTextWidth() const
|
||||
{
|
||||
return eng->lines[index].textWidth.toReal();
|
||||
return eng->lines.at(index).textWidth.toReal();
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
@ -1560,7 +1560,7 @@ qreal QTextLine::naturalTextWidth() const
|
|||
*/
|
||||
qreal QTextLine::horizontalAdvance() const
|
||||
{
|
||||
return eng->lines[index].textAdvance.toReal();
|
||||
return eng->lines.at(index).textAdvance.toReal();
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
@ -1826,7 +1826,7 @@ void QTextLine::layout_helper(int maxGlyphs)
|
|||
lbh.softHyphenWidth = 0;
|
||||
if (newItem != item) {
|
||||
item = newItem;
|
||||
const QScriptItem ¤t = eng->layoutData->items[item];
|
||||
const QScriptItem ¤t = eng->layoutData->items.at(item);
|
||||
if (!current.num_glyphs) {
|
||||
eng->shape(item);
|
||||
attributes = eng->attributes();
|
||||
|
|
@ -1844,7 +1844,7 @@ void QTextLine::layout_helper(int maxGlyphs)
|
|||
QFixed::fromReal(fontEngine->minRightBearing()));
|
||||
}
|
||||
}
|
||||
const QScriptItem ¤t = eng->layoutData->items[item];
|
||||
const QScriptItem ¤t = eng->layoutData->items.at(item);
|
||||
|
||||
lbh.tmpData.leading = qMax(lbh.tmpData.leading + lbh.tmpData.ascent,
|
||||
current.leading + current.ascent) - qMax(lbh.tmpData.ascent,
|
||||
|
|
@ -2087,7 +2087,7 @@ void QTextLine::setPosition(const QPointF &pos)
|
|||
*/
|
||||
QPointF QTextLine::position() const
|
||||
{
|
||||
return QPointF(eng->lines[index].x.toReal(), eng->lines[index].y.toReal());
|
||||
return QPointF(eng->lines.at(index).x.toReal(), eng->lines.at(index).y.toReal());
|
||||
}
|
||||
|
||||
// ### DOC: I have no idea what this means/does.
|
||||
|
|
@ -2103,7 +2103,7 @@ QPointF QTextLine::position() const
|
|||
*/
|
||||
int QTextLine::textStart() const
|
||||
{
|
||||
return eng->lines[index].from;
|
||||
return eng->lines.at(index).from;
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
@ -2115,9 +2115,9 @@ int QTextLine::textLength() const
|
|||
{
|
||||
if (eng->option.flags() & QTextOption::ShowLineAndParagraphSeparators
|
||||
&& eng->block.isValid() && index == eng->lines.count()-1) {
|
||||
return eng->lines[index].length - 1;
|
||||
return eng->lines.at(index).length - 1;
|
||||
}
|
||||
return eng->lines[index].length + eng->lines[index].trailingSpaces;
|
||||
return eng->lines.at(index).length + eng->lines.at(index).trailingSpaces;
|
||||
}
|
||||
|
||||
static void setPenAndDrawBackground(QPainter *p, const QPen &defaultPen, const QTextCharFormat &chf, const QRectF &r)
|
||||
|
|
@ -2241,7 +2241,7 @@ static QGlyphRun glyphRunWithInfo(QFontEngine *fontEngine,
|
|||
*/
|
||||
QList<QGlyphRun> QTextLine::glyphRuns(int from, int length) const
|
||||
{
|
||||
const QScriptLine &line = eng->lines[index];
|
||||
const QScriptLine &line = eng->lines.at(index);
|
||||
|
||||
if (line.length == 0)
|
||||
return QList<QGlyphRun>();
|
||||
|
|
|
|||
Loading…
Reference in New Issue