whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QTextLayout: Remove deprecated methods 

Change-Id: I7991428fb3526e48c0ceda0dcc46ea8a0918cb95
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
bb10
Marcel Krems 2020-08-24 20:49:07 +02:00
parent c7f7279969
commit 311d7a609c
2 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/gui/text/qtextlayout.cpp
View File

@ -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

5
src/gui/text/qtextlayout.h
View File

@ -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();