diff options
Diffstat (limited to 'src/gui/text/qtextlayout.cpp')
| -rw-r--r-- | src/gui/text/qtextlayout.cpp | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index c05d9926d9..ec4270ea9c 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -516,16 +516,6 @@ QString QTextLayout::preeditAreaText() const return d->preeditAreaText(); } -#if QT_DEPRECATED_SINCE(5, 6) -/*! - \obsolete Use setFormats() instead. -*/ -void QTextLayout::setAdditionalFormats(const QList<FormatRange> &formatList) -{ - setFormats(formatList.toVector()); -} -#endif // deprecated since 5.6 - /*! \since 5.6 @@ -542,18 +532,6 @@ void QTextLayout::setFormats(const QList<FormatRange> &formats) QTextDocumentPrivate::get(d->block)->documentChange(d->block.position(), d->block.length()); } -#if QT_DEPRECATED_SINCE(5, 6) -/*! - \obsolete Use formats() instead. - - \sa setAdditionalFormats(), clearAdditionalFormats() -*/ -QList<QTextLayout::FormatRange> QTextLayout::additionalFormats() const -{ - return formats().toList(); -} -#endif // deprecated since 5.6 - /*! \since 5.6 @@ -566,16 +544,6 @@ QList<QTextLayout::FormatRange> QTextLayout::formats() const return d->formats(); } -#if QT_DEPRECATED_SINCE(5, 6) -/*! - \obsolete Use clearFormats() instead. -*/ -void QTextLayout::clearAdditionalFormats() -{ - clearFormats(); -} -#endif // deprecated since 5.6 - /*! \since 5.6 |