From c0ddd5fa12f696838cb1d1de3f721f19a87c8509 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 20 Feb 2014 17:16:29 +0100 Subject: QTextLayout: replace a use of an inefficient QList with QVector The QTextLayout::FormatRange is larger than void* and thus should not be held in QList. Use a QVector instead. Other parts of Qt already hold FormatRanges in QVectors, so this also makes handling FormatRanges more consistent. To avoid ugly names for the getter which doesn't overload on return type alone), rename the set of function to format (from additionalFormats). [ChangeLog][QtGui][QTextLayout] Added QVector-based alternatives setFormat(), format(), and clearFormat() to setAdditionalFormats(), additionalFormats(), and clearAdditionalFormats(), resp. Change-Id: Ie04a561b43c91c3b2befb3cac2981821f84d5f77 Reviewed-by: Konstantin Ritt Reviewed-by: Simon Hausmann --- src/gui/text/qtextengine.cpp | 10 +++++----- src/gui/text/qtextengine_p.h | 8 ++++---- src/gui/text/qtextlayout.cpp | 40 ++++++++++++++++++++++++++++++++++++++-- src/gui/text/qtextlayout.h | 3 +++ 4 files changed, 50 insertions(+), 11 deletions(-) (limited to 'src/gui/text') diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 67a19804a3..187ffa5be7 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -2571,7 +2571,7 @@ void QTextEngine::setPreeditArea(int position, const QString &preeditText) clearLineData(); } -void QTextEngine::setFormats(const QList &formats) +void QTextEngine::setFormats(const QVector &formats) { if (formats.isEmpty()) { if (!specialData) @@ -2946,17 +2946,17 @@ QFixed QTextEngine::calculateTabWidth(int item, QFixed x) const namespace { class FormatRangeComparatorByStart { - const QList &list; + const QVector &list; public: - FormatRangeComparatorByStart(const QList &list) : list(list) { } + FormatRangeComparatorByStart(const QVector &list) : list(list) { } bool operator()(int a, int b) { return list.at(a).start < list.at(b).start; } }; class FormatRangeComparatorByEnd { - const QList &list; + const QVector &list; public: - FormatRangeComparatorByEnd(const QList &list) : list(list) { } + FormatRangeComparatorByEnd(const QVector &list) : list(list) { } bool operator()(int a, int b) { return list.at(a).start + list.at(a).length < list.at(b).start + list.at(b).length; } diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h index 39b9e0cb5a..3590c6da07 100644 --- a/src/gui/text/qtextengine_p.h +++ b/src/gui/text/qtextengine_p.h @@ -570,9 +570,9 @@ public: inline bool hasFormats() const { return block.docHandle() || (specialData && !specialData->formats.isEmpty()); } - inline QList formats() const - { return specialData ? specialData->formats : QList(); } - void setFormats(const QList &formats); + inline QVector formats() const + { return specialData ? specialData->formats : QVector(); } + void setFormats(const QVector &formats); private: static void init(QTextEngine *e); @@ -580,7 +580,7 @@ private: struct SpecialData { int preeditPosition; QString preeditText; - QList formats; + QVector formats; QVector resolvedFormats; // only used when no docHandle is available QScopedPointer formatCollection; diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 7da3e84041..dabe06fa88 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -485,7 +485,6 @@ QString QTextLayout::preeditAreaText() const return d->preeditAreaText(); } - /*! Sets the additional formats supported by the text layout to \a formatList. The formats are applied with preedit area text in place. @@ -494,7 +493,20 @@ QString QTextLayout::preeditAreaText() const */ void QTextLayout::setAdditionalFormats(const QList &formatList) { - d->setFormats(formatList); + setFormats(formatList.toVector()); +} + +/*! + \since 5.6 + + Sets the additional formats supported by the text layout to \a formats. + The formats are applied with preedit area text in place. + + \sa formats(), clearFormats() +*/ +void QTextLayout::setFormats(const QVector &formats) +{ + d->setFormats(formats); if (d->block.docHandle()) d->block.docHandle()->documentChange(d->block.position(), d->block.length()); @@ -506,6 +518,18 @@ void QTextLayout::setAdditionalFormats(const QList &formatList) \sa setAdditionalFormats(), clearAdditionalFormats() */ QList QTextLayout::additionalFormats() const +{ + return formats().toList(); +} + +/*! + \since 5.6 + + Returns the list of additional formats supported by the text layout. + + \sa setFormats(), clearFormats() +*/ +QVector QTextLayout::formats() const { return d->formats(); } @@ -520,6 +544,18 @@ void QTextLayout::clearAdditionalFormats() setAdditionalFormats(QList()); } +/*! + \since 5.6 + + Clears the list of additional formats supported by the text layout. + + \sa formats(), setFormats() +*/ +void QTextLayout::clearFormats() +{ + setFormats(QVector()); +} + /*! Enables caching of the complete layout information if \a enable is true; otherwise disables layout caching. Usually diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h index 47dcd388e2..ce092e0928 100644 --- a/src/gui/text/qtextlayout.h +++ b/src/gui/text/qtextlayout.h @@ -129,6 +129,9 @@ public: void setAdditionalFormats(const QList &overrides); QList additionalFormats() const; void clearAdditionalFormats(); + void setFormats(const QVector &overrides); + QVector formats() const; + void clearFormats(); void setCacheEnabled(bool enable); bool cacheEnabled() const; -- cgit v1.2.3