From 311d7a609c99a499a27f66c8242744990bfceb92 Mon Sep 17 00:00:00 2001
From: Marcel Krems <m.krems@software-vision.eu>
Date: Mon, 24 Aug 2020 20:49:07 +0200
Subject: [PATCH] QTextLayout: Remove deprecated methods

Change-Id: I7991428fb3526e48c0ceda0dcc46ea8a0918cb95
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
---
 src/gui/text/qtextlayout.cpp | 32 --------------------------------
 src/gui/text/qtextlayout.h   |  5 -----
 2 files changed, 37 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
 
diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h
index 0fc41802de..cf3b4bb869 100644
--- a/src/gui/text/qtextlayout.h
+++ b/src/gui/text/qtextlayout.h
@@ -151,11 +151,6 @@ public:
         friend bool operator!=(const FormatRange &lhs, const FormatRange &rhs)
         { return !operator==(lhs, rhs); }
     };
-#if QT_DEPRECATED_SINCE(5, 6)
-    QT_DEPRECATED_X("Use setFormats()") void setAdditionalFormats(const QList<FormatRange> &overrides);
-    QT_DEPRECATED_X("Use formats()") QList<FormatRange> additionalFormats() const;
-    QT_DEPRECATED_X("Use clearFormats()") void clearAdditionalFormats();
-#endif
     void setFormats(const QList<FormatRange> &overrides);
     QList<FormatRange> formats() const;
     void clearFormats();