QtGui/Text: mark obsolete functions as deprecated
Mark some long obsolete functions as deprecated so the can be removed with Qt6: - QTextFormat::setAnchorName()/anchorName() - QTextList::isEmpty() Change-Id: Ic1f5317980d116c846def3645d2a6cd61ba8679d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>bb10
parent
4ee8f75572
commit
8f65160c44
|
|
@ -1787,6 +1787,7 @@ void QTextCharFormat::setUnderlineStyle(UnderlineStyle style)
|
|||
*/
|
||||
|
||||
|
||||
#if QT_DEPRECATED_SINCE(5, 13)
|
||||
/*!
|
||||
\fn void QTextCharFormat::setAnchorName(const QString &name)
|
||||
\obsolete
|
||||
|
|
@ -1797,6 +1798,7 @@ void QTextCharFormat::setUnderlineStyle(UnderlineStyle style)
|
|||
hyperlink, the destination must be set with setAnchorHref() and
|
||||
the anchor must be enabled with setAnchor().
|
||||
*/
|
||||
#endif
|
||||
|
||||
/*!
|
||||
\fn void QTextCharFormat::setAnchorNames(const QStringList &names)
|
||||
|
|
@ -1807,6 +1809,7 @@ void QTextCharFormat::setUnderlineStyle(UnderlineStyle style)
|
|||
the anchor must be enabled with setAnchor().
|
||||
*/
|
||||
|
||||
#if QT_DEPRECATED_SINCE(5, 13)
|
||||
/*!
|
||||
\fn QString QTextCharFormat::anchorName() const
|
||||
\obsolete
|
||||
|
|
@ -1826,6 +1829,7 @@ QString QTextCharFormat::anchorName() const
|
|||
return QString();
|
||||
return prop.toString();
|
||||
}
|
||||
#endif
|
||||
|
||||
/*!
|
||||
\fn QStringList QTextCharFormat::anchorNames() const
|
||||
|
|
|
|||
|
|
@ -552,9 +552,13 @@ public:
|
|||
inline QString anchorHref() const
|
||||
{ return stringProperty(AnchorHref); }
|
||||
|
||||
#if QT_DEPRECATED_SINCE(5, 13)
|
||||
QT_DEPRECATED_X("Use setAnchorNames() instead")
|
||||
inline void setAnchorName(const QString &name)
|
||||
{ setAnchorNames(QStringList(name)); }
|
||||
QT_DEPRECATED_X("Use anchorNames() instead")
|
||||
QString anchorName() const;
|
||||
#endif
|
||||
|
||||
inline void setAnchorNames(const QStringList &names)
|
||||
{ setProperty(AnchorName, names); }
|
||||
|
|
|
|||
|
|
@ -1544,7 +1544,7 @@ void QTextHtmlParser::applyAttributes(const QStringList &attributes)
|
|||
if (key == QLatin1String("href"))
|
||||
node->charFormat.setAnchorHref(value);
|
||||
else if (key == QLatin1String("name"))
|
||||
node->charFormat.setAnchorName(value);
|
||||
node->charFormat.setAnchorNames({value});
|
||||
break;
|
||||
case Html_img:
|
||||
if (key == QLatin1String("src") || key == QLatin1String("source")) {
|
||||
|
|
@ -1684,7 +1684,7 @@ void QTextHtmlParser::applyAttributes(const QStringList &attributes)
|
|||
node->charFormat.setToolTip(value);
|
||||
} else if (key == QLatin1String("id")) {
|
||||
node->charFormat.setAnchor(true);
|
||||
node->charFormat.setAnchorName(value);
|
||||
node->charFormat.setAnchorNames({value});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -100,6 +100,7 @@ public:
|
|||
\sa QTextBlock, QTextListFormat, QTextCursor
|
||||
*/
|
||||
|
||||
#if QT_DEPRECATED_SINCE(5, 13)
|
||||
/*!
|
||||
\fn bool QTextList::isEmpty() const
|
||||
\obsolete
|
||||
|
|
@ -111,6 +112,7 @@ public:
|
|||
|
||||
\sa count()
|
||||
*/
|
||||
#endif
|
||||
|
||||
/*! \internal
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -59,8 +59,11 @@ public:
|
|||
|
||||
int count() const;
|
||||
|
||||
#if QT_DEPRECATED_SINCE(5, 13)
|
||||
QT_DEPRECATED_X("Use count() instead")
|
||||
inline bool isEmpty() const
|
||||
{ return count() == 0; }
|
||||
#endif
|
||||
|
||||
QTextBlock item(int i) const;
|
||||
|
||||
|
|
|
|||
|
|
@ -1128,7 +1128,7 @@ void tst_QTextDocument::toHtml_data()
|
|||
|
||||
QTextCharFormat fmt;
|
||||
fmt.setAnchor(true);
|
||||
fmt.setAnchorName("blub");
|
||||
fmt.setAnchorNames({"blub"});
|
||||
cursor.insertText("Blah", fmt);
|
||||
|
||||
QTest::newRow("named anchor") << QTextDocumentFragment(&doc)
|
||||
|
|
|
|||
Loading…
Reference in New Issue