diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2014-02-21 15:15:29 +0100 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-05-30 10:56:24 +0000 |
| commit | 87d57d19941fba4a921020480ca5761f23536c93 (patch) | |
| tree | 9157982715d32e8a9c014fbdc104d9721aac525f /src/gui/text/qtextlayout.cpp | |
| parent | 9eff0dd19d6507ec400f036dd27efe960e4e5f78 (diff) | |
Fix users of QTextLayout::additionalFormats to use the new API
QTextLayout::additionalFormats setters and getters using QList<FormatRange> have
been deprecated; port to the QVector versions.
Moved op== definition for FormatRange needed in tst_qsyntaxhighlighter.cpp
to a friend declaration in FormatRange itself, because MSVC 2008 doesn't find
it otherwise.
Change-Id: Ibab6589df057f02377d895079b56395859e3401e
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/gui/text/qtextlayout.cpp')
| -rw-r--r-- | src/gui/text/qtextlayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index dabe06fa88..c42054c07c 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE for a specified area in the text layout's content. \inmodule QtGui - \sa QTextLayout::setAdditionalFormats(), QTextLayout::draw() + \sa QTextLayout::setFormats(), QTextLayout::draw() */ /*! @@ -541,7 +541,7 @@ QVector<QTextLayout::FormatRange> QTextLayout::formats() const */ void QTextLayout::clearAdditionalFormats() { - setAdditionalFormats(QList<FormatRange>()); + clearFormats(); } /*! |